Skip to content

Commit 80c5bcb

Browse files
ext: bump compressonator, tinyexr, webp
1 parent 00266b4 commit 80c5bcb

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

ext/_ext.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ add_sourcepp_remote_library(bufferstream https://github.com/craftablescience/Buf
44

55
# compressonator
66
if(SOURCEPP_USE_VTFPP)
7-
add_sourcepp_remote_library(CMP_Compressonator https://github.com/craftablescience/compressonator a599efbe2e30f7c8e3287e15436ec6c1be580b99)
7+
add_sourcepp_remote_library(CMP_Compressonator https://github.com/craftablescience/compressonator e06368c682f1bc26362c01aaebe929137bcca589)
88
endif()
99

1010

@@ -135,5 +135,5 @@ if(SOURCEPP_USE_VTFPP AND SOURCEPP_VTFPP_SUPPORT_WEBP)
135135
set(WEBP_BUILD_FUZZTEST OFF CACHE INTERNAL "" FORCE)
136136
set(WEBP_USE_THREAD ${SOURCEPP_BUILD_WITH_THREADS} CACHE INTERNAL "" FORCE)
137137
set(WEBP_NEAR_LOSSLESS ON CACHE INTERNAL "" FORCE)
138-
add_sourcepp_remote_library(webp https://github.com/webmproject/libwebp a3dddea9b5d0d445c24c756a406713686abf1257 EXCLUDE_FROM_ALL)
138+
add_sourcepp_remote_library(webp https://github.com/webmproject/libwebp 934b7d7448c2d2850be9fa3aa4a924d51fff9823 EXCLUDE_FROM_ALL)
139139
endif()

ext/tinyexr/include/tinyexr.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5934,7 +5934,7 @@ static bool ReconstructTileOffsets(OffsetData& offset_data,
59345934
if (size_t(tileX) >= offset_data.offsets[size_t(level_idx)][size_t(tileY)].size()) {
59355935
return false;
59365936
}
5937-
5937+
59385938
offset_data.offsets[size_t(level_idx)][size_t(tileY)][size_t(tileX)] = tileOffset;
59395939
}
59405940
}
@@ -6620,6 +6620,7 @@ int LoadEXRFromMemory(float **out_rgba, int *width, int *height,
66206620

66216621
ret = ParseEXRHeaderFromMemory(&exr_header, &exr_version, memory, size, err);
66226622
if (ret != TINYEXR_SUCCESS) {
6623+
FreeEXRHeader(&exr_header);
66236624
return ret;
66246625
}
66256626

@@ -6633,6 +6634,8 @@ int LoadEXRFromMemory(float **out_rgba, int *width, int *height,
66336634
InitEXRImage(&exr_image);
66346635
ret = LoadEXRImageFromMemory(&exr_image, &exr_header, memory, size, err);
66356636
if (ret != TINYEXR_SUCCESS) {
6637+
FreeEXRHeader(&exr_header);
6638+
FreeEXRImage(&exr_image);
66366639
return ret;
66376640
}
66386641

@@ -6936,7 +6939,7 @@ struct MemoryMappedFile {
69366939
if (read_bytes != size) {
69376940
// TODO: Try to read data until reading `size` bytes.
69386941
fclose(fp);
6939-
size = 0;
6942+
size = 0;
69406943
data = nullptr;
69416944
return;
69426945
}
@@ -7787,7 +7790,7 @@ static size_t SaveEXRNPartImageToMemory(const EXRImage* exr_images,
77877790
SetErrorMessage("Failed to compute Tile offsets",
77887791
err);
77897792
return TINYEXR_ERROR_INVALID_DATA;
7790-
7793+
77917794
}
77927795
total_chunk_count += chunk_count[i];
77937796
}

0 commit comments

Comments
 (0)