use more byteSwap

Signed-off-by: Rosen Penev <[email protected]>

Author: neheb

src/types.cpp

@@ -6,6 +6,7 @@
 #include "enforce.hpp"
 #include "futils.hpp"
 #include "i18n.h"  // for _exvGettext
+#include "image.hpp"
 #include "utils.hpp"
 
 // + standard includes
@@ -333,44 +334,21 @@ double getDouble(const byte* buf, ByteOrder byteOrder) {
 }
 
 size_t us2Data(byte* buf, uint16_t s, ByteOrder byteOrder) {
-  if (byteOrder == littleEndian) {
-    buf[0] = static_cast<byte>(s & 0x00ffU);
-    buf[1] = static_cast<byte>((s & 0xff00U) >> 8);
-  } else {
-    buf[0] = static_cast<byte>((s & 0xff00U) >> 8);
-    buf[1] = static_cast<byte>(s & 0x00ffU);
-  }
-  return 2;
+  s = Image::byteSwap(s, byteOrder == bigEndian);
+  std::memcpy(buf, &s, sizeof(s));
+  return sizeof(s);
 }
 
 size_t ul2Data(byte* buf, uint32_t l, ByteOrder byteOrder) {
-  if (byteOrder == littleEndian) {
-    buf[0] = static_cast<byte>(l & 0x000000ffU);
-    buf[1] = static_cast<byte>((l & 0x0000ff00U) >> 8);
-    buf[2] = static_cast<byte>((l & 0x00ff0000U) >> 16);
-    buf[3] = static_cast<byte>((l & 0xff000000U) >> 24);
-  } else {
-    buf[0] = static_cast<byte>((l & 0xff000000U) >> 24);
-    buf[1] = static_cast<byte>((l & 0x00ff0000U) >> 16);
-    buf[2] = static_cast<byte>((l & 0x0000ff00U) >> 8);
-    buf[3] = static_cast<byte>(l & 0x000000ffU);
-  }
-  return 4;
+  l = Image::byteSwap(l, byteOrder == bigEndian);
+  std::memcpy(buf, &l, sizeof(l));
+  return sizeof(l);
 }
 
 size_t ull2Data(byte* buf, uint64_t l, ByteOrder byteOrder) {
-  if (byteOrder == littleEndian) {
-    for (size_t i = 0; i < 8; i++) {
-      buf[i] = static_cast<byte>(l & 0xff);
-      l >>= 8;
-    }
-  } else {
-    for (size_t i = 0; i < 8; i++) {
-      buf[8 - i - 1] = static_cast<byte>(l & 0xff);
-      l >>= 8;
-    }
-  }
-  return 8;
+  l = Image::byteSwap(l, byteOrder == bigEndian);
+  std::memcpy(buf, &l, sizeof(l));
+  return sizeof(l);
 }
 
 size_t ur2Data(byte* buf, URational l, ByteOrder byteOrder) {
@@ -380,29 +358,15 @@ size_t ur2Data(byte* buf, URational l, ByteOrder byteOrder) {
 }
 
 size_t s2Data(byte* buf, int16_t s, ByteOrder byteOrder) {
-  if (byteOrder == littleEndian) {
-    buf[0] = static_cast<byte>(s & 0x00ffU);
-    buf[1] = static_cast<byte>((s & 0xff00U) >> 8);
-  } else {
-    buf[0] = static_cast<byte>((s & 0xff00U) >> 8);
-    buf[1] = static_cast<byte>(s & 0x00ffU);
-  }
-  return 2;
+  s = Image::byteSwap(static_cast<uint16_t>(s), byteOrder == bigEndian);
+  std::memcpy(buf, &s, sizeof(s));
+  return sizeof(s);
 }
 
 size_t l2Data(byte* buf, int32_t l, ByteOrder byteOrder) {
-  if (byteOrder == littleEndian) {
-    buf[0] = static_cast<byte>(l & 0x000000ffU);
-    buf[1] = static_cast<byte>((l & 0x0000ff00U) >> 8);
-    buf[2] = static_cast<byte>((l & 0x00ff0000U) >> 16);
-    buf[3] = static_cast<byte>((l & 0xff000000U) >> 24);
-  } else {
-    buf[0] = static_cast<byte>((l & 0xff000000U) >> 24);
-    buf[1] = static_cast<byte>((l & 0x00ff0000U) >> 16);
-    buf[2] = static_cast<byte>((l & 0x0000ff00U) >> 8);
-    buf[3] = static_cast<byte>(l & 0x000000ffU);
-  }
-  return 4;
+  l = Image::byteSwap(static_cast<uint32_t>(l), byteOrder == bigEndian);
+  std::memcpy(buf, &l, sizeof(l));
+  return sizeof(l);
 }
 
 size_t r2Data(byte* buf, Rational l, ByteOrder byteOrder) {