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)
prabhuomkar · Oct 31, 2023 · 2d4669c · 2d4669c
1 parent a98e42d
commit 2d4669c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
@@ -18,7 +18,7 @@ set(CXXOPTS_ENABLE_INSTALL OFF CACHE BOOL "Generate the install target" FORCE)
 
 FetchContent_MakeAvailable(extern_cxxopts)
 
-foreach(STB_IMAGE_LIB "stb_image" "stb_image_write" "stb_image_resize")
+foreach(STB_IMAGE_LIB "stb_image" "stb_image_write" "stb_image_resize2")
     FetchContent_Declare(
         extern_${STB_IMAGE_LIB}
         URL https://github.com/raw/nothings/stb/master/${STB_IMAGE_LIB}.h

diff --git a/utils/image_io/CMakeLists.txt b/utils/image_io/CMakeLists.txt
@@ -13,7 +13,7 @@ target_sources(image-io PUBLIC src/image_io.cpp
 )
 target_include_directories(image-io PUBLIC include)
 
-target_link_libraries(image-io ${TORCH_LIBRARIES} stb-image stb-image-write stb-image-resize)
+target_link_libraries(image-io ${TORCH_LIBRARIES} stb-image stb-image-write stb-image-resize2)
 
 set_target_properties(image-io PROPERTIES
   CXX_STANDARD 14

diff --git a/utils/image_io/src/image_io.cpp b/utils/image_io/src/image_io.cpp
@@ -9,7 +9,7 @@
 #include "stb_image_write.h"
 
 #define STB_IMAGE_RESIZE_IMPLEMENTATION
-#include "stb_image_resize.h"
+#include "stb_image_resize2.h"
 
 namespace image_io {
 namespace {
@@ -165,8 +165,8 @@ torch::Tensor load_image(const std::string& file_path,
 
     std::vector<unsigned char> image_resized_buffer(buffer_size);
 
-    stbir_resize_uint8(image_raw.get(), width, height, 0,
-        image_resized_buffer.data(), new_width, new_height, 0, depth);
+    stbir_resize_uint8_linear(image_raw.get(), width, height, 0,
+        image_resized_buffer.data(), new_width, new_height, 0, static_cast<stbir_pixel_layout>(depth));
 
     return transform(torch::from_blob(image_resized_buffer.data(),
         {new_height, new_width, depth}, torch::kUInt8).clone().to(torch::kFloat32).permute({2, 0, 1}).div_(255));