Merge 7b496b2f5b into 1786e34bd3

Source/Core/DiscIO/WIABlob.cpp

@@ -1445,7 +1445,7 @@ WIARVZFileReader<RVZ>::ProcessAndCompress(CompressThreadState* state, CompressPa
               ASSERT(hash_offset <= std::numeric_limits<u16>::max());
 
               HashExceptionEntry& exception = exception_lists[exception_list_index].emplace_back();
-              exception.offset = static_cast<u16>(Common::swap16(hash_offset));
+              exception.offset = Common::swap16(static_cast<u16>(hash_offset));
               std::memcpy(exception.hash.data(), desired_hash, Common::SHA1::DIGEST_LEN);
             }
           };

Source/Core/DiscIO/WIABlob.h

@@ -60,7 +60,7 @@ public:
   std::string GetCompressionMethod() const override;
   std::optional<int> GetCompressionLevel() const override
   {
-    return static_cast<int>(static_cast<s32>(Common::swap32(m_header_2.compression_level)));
+    return static_cast<int>(Common::swap32(m_header_2.compression_level));
   }
 
   bool Read(u64 offset, u64 size, u8* out_ptr) override;