Skip to content

Commit 44a02f6

Browse files
committed
Update to newer vcpkg baseline
1 parent 9599084 commit 44a02f6

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ if(NOT VCPKG_MANIFEST_MODE)
6464
list(APPEND PACKAGES_ALL ${PACKAGES_TEST})
6565

6666
ezvcpkg_fetch(
67-
COMMIT 2024.07.12
67+
COMMIT 2024.11.16
6868
PACKAGES ${PACKAGES_ALL}
6969
# Clean the build trees after building, so that we don't use a ton a disk space on the CI cache
7070
CLEAN_BUILDTREES

CesiumGltfContent/src/ImageManipulation.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace Cesium {
77
// Use STB resize in our own namespace to avoid conflicts from other libs
88
#define STBIRDEF
9-
#include <stb_image_resize.h>
9+
#include <stb_image_resize2.h>
1010
#undef STBIRDEF
1111
} // namespace Cesium
1212

@@ -108,7 +108,7 @@ bool ImageManipulation::blitImage(
108108
}
109109

110110
// Use STB to do the copy / scale
111-
stbir_resize_uint8(
111+
stbir_resize_uint8_linear(
112112
reinterpret_cast<const unsigned char*>(pSource),
113113
sourcePixels.width,
114114
sourcePixels.height,
@@ -117,7 +117,7 @@ bool ImageManipulation::blitImage(
117117
targetPixels.width,
118118
targetPixels.height,
119119
int(bytesPerTargetRow),
120-
target.channels);
120+
static_cast<stbir_pixel_layout>(target.channels));
121121
}
122122

123123
return true;

CesiumGltfReader/src/GltfReader.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace Cesium {
3535
// Use STB resize in our own namespace to avoid conflicts from other libs
3636
#define STBIRDEF
3737
#define STB_IMAGE_RESIZE_IMPLEMENTATION
38-
#include <stb_image_resize.h>
38+
#include <stb_image_resize2.h>
3939
#undef STBIRDEF
4040
} // namespace Cesium
4141

@@ -970,7 +970,7 @@ std::optional<std::string> GltfReader::generateMipMaps(ImageCesium& image) {
970970
image.mipPositions[mipIndex].byteOffset = byteOffset;
971971
image.mipPositions[mipIndex].byteSize = byteSize;
972972

973-
if (!stbir_resize_uint8(
973+
if (!stbir_resize_uint8_linear(
974974
reinterpret_cast<const unsigned char*>(
975975
&image.pixelData[lastByteOffset]),
976976
lastWidth,
@@ -980,7 +980,7 @@ std::optional<std::string> GltfReader::generateMipMaps(ImageCesium& image) {
980980
mipWidth,
981981
mipHeight,
982982
0,
983-
image.channels)) {
983+
static_cast<stbir_pixel_layout>(image.channels))) {
984984
// Remove any added mipmaps.
985985
image.mipPositions.clear();
986986
image.pixelData.resize(imageByteSize);

0 commit comments

Comments
 (0)