vtfpp: start using LERep where applicable

milestone: entire vtfpp test suite passes!

Author: partyvan

include/vtfpp/VTF.h

@@ -9,6 +9,7 @@
 #include <variant>
 #include <vector>
 
+#include <sourcepp/Bits.h>
 #include <sourcepp/parser/Binary.h>
 #include <sourcepp/Macros.h>
 
@@ -76,7 +77,7 @@ struct Resource {
 		std::tuple<uint8_t, uint8_t, uint8_t, uint8_t>, // LOD
 		std::string, // KVD
 		HOT, // Hotspot data
-		std::span<uint32_t> // AXC
+		std::span<sourcepp::bits::ui32le> // AXC
 	>;
 	[[nodiscard]] ConvertedData convertData() const;
 
@@ -105,19 +106,19 @@ struct Resource {
 	}
 
 	[[nodiscard]] int16_t getDataAsAuxCompressionLevel() const {
-		return static_cast<int16_t>(std::get<std::span<uint32_t>>(this->convertData())[1] & 0xffff);
+		return static_cast<int16_t>(std::get<std::span<sourcepp::bits::ui32le>>(this->convertData())[1].operator uint32_t() & 0xffff);
 	}
 
 	[[nodiscard]] CompressionMethod getDataAsAuxCompressionMethod() const {
-		auto method = static_cast<int16_t>((std::get<std::span<uint32_t>>(this->convertData())[1] & 0xffff0000) >> 16);
+		auto method = static_cast<int16_t>((std::get<std::span<sourcepp::bits::ui32le>>(this->convertData())[1].operator uint32_t() & 0xffff0000) >> 16);
 		if (method <= 0) {
 			return CompressionMethod::DEFLATE;
 		}
 		return static_cast<CompressionMethod>(method);
 	}
 
 	[[nodiscard]] uint32_t getDataAsAuxCompressionLength(uint8_t mip, uint8_t mipCount, uint16_t frame, uint16_t frameCount, uint16_t face, uint16_t faceCount) const {
-		return std::get<std::span<uint32_t>>(this->convertData())[((mipCount - 1 - mip) * frameCount * faceCount + frame * faceCount + face) + 2];
+		return std::get<std::span<sourcepp::bits::ui32le>>(this->convertData())[((mipCount - 1 - mip) * frameCount * faceCount + frame * faceCount + face) + 2];
 	}
 };
 SOURCEPP_BITFLAGS_ENUM(Resource::Flags)

src/vtfpp/VTF.cpp

@@ -18,10 +18,12 @@
 #include <miniz.h>
 #include <zstd.h>
 
+#include <sourcepp/Bits.h>
 #include <sourcepp/compression/LZMA.h>
 #include <vtfpp/ImageConversion.h>
 
 using namespace sourcepp;
+using namespace sourcepp::bits;
 using namespace vtfpp;
 
 namespace {
@@ -180,13 +182,13 @@ Resource::ConvertedData Resource::convertData() const {
 			if (this->data.size() <= sizeof(uint32_t)) {
 				return {};
 			}
-			return SHT{{reinterpret_cast<const std::byte*>(this->data.data()) + sizeof(uint32_t), *reinterpret_cast<const uint32_t*>(this->data.data())}};
+			return SHT{{reinterpret_cast<const std::byte*>(this->data.data()) + sizeof(uint32_t), reinterpret_le<uint32_t>(this->data.data())}};
 		case TYPE_CRC:
 		case TYPE_EXTENDED_FLAGS:
 			if (this->data.size() != sizeof(uint32_t)) {
 				return {};
 			}
-			return *reinterpret_cast<const uint32_t*>(this->data.data());
+			return reinterpret_le<uint32_t>(this->data.data());
 		case TYPE_LOD_CONTROL_INFO:
 			if (this->data.size() != sizeof(uint32_t)) {
 				return {};
@@ -200,17 +202,17 @@ Resource::ConvertedData Resource::convertData() const {
 			if (this->data.size() <= sizeof(uint32_t)) {
 				return "";
 			}
-			return std::string(reinterpret_cast<const char*>(this->data.data()) + sizeof(uint32_t), *reinterpret_cast<const uint32_t*>(this->data.data()));
+			return std::string(reinterpret_cast<const char*>(this->data.data()) + sizeof(uint32_t), reinterpret_le<uint32_t>(this->data.data()));
 		case TYPE_HOTSPOT_DATA:
 			if (this->data.size() <= sizeof(uint32_t)) {
 				return {};
 			}
-			return HOT{{reinterpret_cast<const std::byte*>(this->data.data()) + sizeof(uint32_t), *reinterpret_cast<const uint32_t*>(this->data.data())}};
+			return HOT{{reinterpret_cast<const std::byte*>(this->data.data()) + sizeof(uint32_t), reinterpret_le<uint32_t>(this->data.data())}};
 		case TYPE_AUX_COMPRESSION:
 			if (this->data.size() <= sizeof(uint32_t) || this->data.size() % sizeof(uint32_t) != 0) {
 				return {};
 			}
-			return std::span{reinterpret_cast<uint32_t*>(this->data.data()), this->data.size() / 4};
+			return std::span{reinterpret_cast<ui32le*>(this->data.data()), this->data.size() / 4};
 		default:
 			break;
 	}
@@ -303,16 +305,16 @@ VTF::VTF(std::vector<std::byte>&& vtfData, bool parseHeaderOnly)
 			if (!(lhs.flags & Resource::FLAG_LOCAL_DATA) && (rhs.flags & Resource::FLAG_LOCAL_DATA)) {
 				return false;
 			}
-			return *reinterpret_cast<uint32_t*>(lhs.data.data()) < *reinterpret_cast<uint32_t*>(rhs.data.data());
+			return reinterpret_le<uint32_t>(lhs.data.data()) < reinterpret_le<uint32_t>(rhs.data.data());
 		});
 
 		// Fix up data spans to point to the actual data
 		Resource* lastResource = nullptr;
 		for (auto& resource : this->resources) {
 			if (!(resource.flags & Resource::FLAG_LOCAL_DATA)) {
 				if (lastResource) {
-					const auto lastOffset = *reinterpret_cast<uint32_t*>(lastResource->data.data());
-					const auto currentOffset = *reinterpret_cast<uint32_t*>(resource.data.data());
+					const auto lastOffset = reinterpret_le<uint32_t>(lastResource->data.data());
+					const auto currentOffset = reinterpret_le<uint32_t>(resource.data.data());
 					const auto curPos = stream.tell();
 					stream.seek(lastOffset);
 					lastResource->data = stream.read_span<std::byte>(currentOffset - lastOffset);
@@ -322,7 +324,7 @@ VTF::VTF(std::vector<std::byte>&& vtfData, bool parseHeaderOnly)
 			}
 		}
 		if (lastResource) {
-			auto offset = *reinterpret_cast<uint32_t*>(lastResource->data.data());
+			auto offset = reinterpret_le<uint32_t>(lastResource->data.data());
 			auto curPos = stream.tell();
 			stream.seek(offset);
 			lastResource->data = stream.read_span<std::byte>(stream.size() - offset);