From 57ccf634857c272b59515c1b8d8ec656bc847205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Sat, 16 Feb 2019 22:46:41 -0800 Subject: [PATCH] Fixed 32-bit warnings. --- 3rdparty/astc-codec/src/decoder/endpoint_codec.cc | 2 +- .../astc-codec/src/decoder/intermediate_astc_block.cc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/3rdparty/astc-codec/src/decoder/endpoint_codec.cc b/3rdparty/astc-codec/src/decoder/endpoint_codec.cc index b3b2e58..9f85ea0 100644 --- a/3rdparty/astc-codec/src/decoder/endpoint_codec.cc +++ b/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* const vals) { assert(vals->size() == - NumValuesForEncodingMode(EndpointEncodingMode::kDirectLuma)); + size_t(NumValuesForEncodingMode(EndpointEncodingMode::kDirectLuma))); int avg1 = AverageRGB(endpoint_low); int avg2 = AverageRGB(endpoint_high); diff --git a/3rdparty/astc-codec/src/decoder/intermediate_astc_block.cc b/3rdparty/astc-codec/src/decoder/intermediate_astc_block.cc index 3c73385..18f0137 100644 --- a/3rdparty/astc-codec/src/decoder/intermediate_astc_block.cc +++ b/3rdparty/astc-codec/src/decoder/intermediate_astc_block.cc @@ -369,10 +369,10 @@ base::Optional 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) {