Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace old stb_image 1.18 with stb_image 2.30 and stb_image_write 1.16 #53

Merged
merged 6 commits into from
Jun 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions crnlib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@ set(CRNLIB_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/lzma_LzmaLib.h
${CMAKE_CURRENT_SOURCE_DIR}/lzma_MyVersion.h
${CMAKE_CURRENT_SOURCE_DIR}/lzma_Types.h
${CMAKE_CURRENT_SOURCE_DIR}/stb_image.h
${CMAKE_CURRENT_SOURCE_DIR}/stb_image_write.h
${CMAKE_CURRENT_SOURCE_DIR}/../inc/crn_decomp.h
${CMAKE_CURRENT_SOURCE_DIR}/../inc/crnlib.h
${CMAKE_CURRENT_SOURCE_DIR}/../inc/dds_defs.h
Expand Down
4 changes: 2 additions & 2 deletions crnlib/crn_image_utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
#include "crn_mipmapped_texture.h"
#include "crn_buffer_stream.h"

#define STBI_HEADER_FILE_ONLY
#include "crn_stb_image.cpp"
#include "stb_image.h"
#include "stb_image_write.h"

#include "crn_jpgd.h"

Expand Down
4,238 changes: 4 additions & 4,234 deletions crnlib/crn_stb_image.cpp

Large diffs are not rendered by default.

7,988 changes: 7,988 additions & 0 deletions crnlib/stb_image.h

Large diffs are not rendered by default.

Loading