Update to new vcpkg baseline to fix msys2 download error

Author: lilleyse

CMakeLists.txt

@@ -64,7 +64,7 @@ if(NOT VCPKG_MANIFEST_MODE)
     list(APPEND PACKAGES_ALL ${PACKAGES_TEST})
 
     ezvcpkg_fetch(
-        COMMIT 2024.07.12
+        COMMIT 2024.11.16
         PACKAGES ${PACKAGES_ALL}
         # Clean the build trees after building, so that we don't use a ton a disk space on the CI cache
         CLEAN_BUILDTREES

CesiumGltfContent/src/ImageManipulation.cpp

@@ -3,14 +3,9 @@
 
 #include <cstring>
 
-namespace Cesium {
-// Use STB resize in our own namespace to avoid conflicts from other libs
 #define STBIRDEF
-#include <stb_image_resize.h>
+#include <stb_image_resize2.h>
 #undef STBIRDEF
-} // namespace Cesium
-
-using namespace Cesium;
 
 #define STB_IMAGE_WRITE_STATIC
 #define STB_IMAGE_WRITE_IMPLEMENTATION
@@ -108,7 +103,7 @@ bool ImageManipulation::blitImage(
     }
 
     // Use STB to do the copy / scale
-    stbir_resize_uint8(
+    stbir_resize_uint8_linear(
         reinterpret_cast<const unsigned char*>(pSource),
         sourcePixels.width,
         sourcePixels.height,
@@ -117,7 +112,7 @@ bool ImageManipulation::blitImage(
         targetPixels.width,
         targetPixels.height,
         int(bytesPerTargetRow),
-        target.channels);
+        static_cast<stbir_pixel_layout>(target.channels));
   }
 
   return true;

CesiumGltfReader/src/GltfReader.cpp

@@ -31,13 +31,10 @@
 
 #define STBI_FAILURE_USERMSG
 
-namespace Cesium {
-// Use STB resize in our own namespace to avoid conflicts from other libs
 #define STBIRDEF
 #define STB_IMAGE_RESIZE_IMPLEMENTATION
-#include <stb_image_resize.h>
+#include <stb_image_resize2.h>
 #undef STBIRDEF
-} // namespace Cesium
 
 #define STB_IMAGE_STATIC
 #define STB_IMAGE_IMPLEMENTATION
@@ -49,7 +46,6 @@ using namespace CesiumGltf;
 using namespace CesiumGltfReader;
 using namespace CesiumJsonReader;
 using namespace CesiumUtility;
-using namespace Cesium;
 
 namespace {
 #pragma pack(push, 1)
@@ -970,7 +966,7 @@ std::optional<std::string> GltfReader::generateMipMaps(ImageCesium& image) {
     image.mipPositions[mipIndex].byteOffset = byteOffset;
     image.mipPositions[mipIndex].byteSize = byteSize;
 
-    if (!stbir_resize_uint8(
+    if (!stbir_resize_uint8_linear(
             reinterpret_cast<const unsigned char*>(
                 &image.pixelData[lastByteOffset]),
             lastWidth,
@@ -980,7 +976,7 @@ std::optional<std::string> GltfReader::generateMipMaps(ImageCesium& image) {
             mipWidth,
             mipHeight,
             0,
-            image.channels)) {
+            static_cast<stbir_pixel_layout>(image.channels))) {
       // Remove any added mipmaps.
       image.mipPositions.clear();
       image.pixelData.resize(imageByteSize);