Skip to content

Commit 2d4669c

Browse files
authored
Update git URL for stb (#117)
* Update git URL for stb * Upgrade stb_image_resize2.h * Update image_io.cpp STBIR_RGBA replaced with static_cast<stbir_pixel_layout>(depth)
1 parent a98e42d commit 2d4669c

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

extern/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ set(CXXOPTS_ENABLE_INSTALL OFF CACHE BOOL "Generate the install target" FORCE)
1818

1919
FetchContent_MakeAvailable(extern_cxxopts)
2020

21-
foreach(STB_IMAGE_LIB "stb_image" "stb_image_write" "stb_image_resize")
21+
foreach(STB_IMAGE_LIB "stb_image" "stb_image_write" "stb_image_resize2")
2222
FetchContent_Declare(
2323
extern_${STB_IMAGE_LIB}
2424
URL https://raw.githubusercontent.com/nothings/stb/master/${STB_IMAGE_LIB}.h

utils/image_io/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ target_sources(image-io PUBLIC src/image_io.cpp
1313
)
1414
target_include_directories(image-io PUBLIC include)
1515

16-
target_link_libraries(image-io ${TORCH_LIBRARIES} stb-image stb-image-write stb-image-resize)
16+
target_link_libraries(image-io ${TORCH_LIBRARIES} stb-image stb-image-write stb-image-resize2)
1717

1818
set_target_properties(image-io PROPERTIES
1919
CXX_STANDARD 14

utils/image_io/src/image_io.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "stb_image_write.h"
1010

1111
#define STB_IMAGE_RESIZE_IMPLEMENTATION
12-
#include "stb_image_resize.h"
12+
#include "stb_image_resize2.h"
1313

1414
namespace image_io {
1515
namespace {
@@ -165,8 +165,8 @@ torch::Tensor load_image(const std::string& file_path,
165165

166166
std::vector<unsigned char> image_resized_buffer(buffer_size);
167167

168-
stbir_resize_uint8(image_raw.get(), width, height, 0,
169-
image_resized_buffer.data(), new_width, new_height, 0, depth);
168+
stbir_resize_uint8_linear(image_raw.get(), width, height, 0,
169+
image_resized_buffer.data(), new_width, new_height, 0, static_cast<stbir_pixel_layout>(depth));
170170

171171
return transform(torch::from_blob(image_resized_buffer.data(),
172172
{new_height, new_width, depth}, torch::kUInt8).clone().to(torch::kFloat32).permute({2, 0, 1}).div_(255));

0 commit comments

Comments
 (0)