Browse Source

Fixed 32-bit warnings.

Branimir Karadžić 6 years ago
parent
commit
57ccf63485

+ 1 - 1
3rdparty/astc-codec/src/decoder/endpoint_codec.cc

@@ -153,7 +153,7 @@ bool EncodeColorsLuma(const RgbaColor& endpoint_low,
                       int max_value, ColorEndpointMode* const astc_mode,
                       std::vector<int>* const vals) {
   assert(vals->size() ==
-         NumValuesForEncodingMode(EndpointEncodingMode::kDirectLuma));
+         size_t(NumValuesForEncodingMode(EndpointEncodingMode::kDirectLuma)));
   int avg1 = AverageRGB(endpoint_low);
   int avg2 = AverageRGB(endpoint_high);
 

+ 4 - 4
3rdparty/astc-codec/src/decoder/intermediate_astc_block.cc

@@ -369,10 +369,10 @@ base::Optional<VoidExtentData> UnpackVoidExtent(const PhysicalASTCBlock& pb) {
 
   const auto void_extent_coords = pb.VoidExtentCoords();
   if (void_extent_coords) {
-    data.coords[0] = void_extent_coords->at(0);
-    data.coords[1] = void_extent_coords->at(1);
-    data.coords[2] = void_extent_coords->at(2);
-    data.coords[3] = void_extent_coords->at(3);
+    data.coords[0] = uint16_t(void_extent_coords->at(0));
+    data.coords[1] = uint16_t(void_extent_coords->at(1));
+    data.coords[2] = uint16_t(void_extent_coords->at(2));
+    data.coords[3] = uint16_t(void_extent_coords->at(3));
   } else {
     uint16_t all_ones = (1 << 13) - 1;
     for (auto& coord : data.coords) {