fix abi call fail out of stack

Author: Cyberhan123

.gitignore

@@ -2,3 +2,4 @@
 /.vs/
 /out/
 /cmake-build-debug/
+/cmake-build-release/

.idea/workspace.xml

@@ -54,5 +54,3 @@ set_target_properties(stable-diffusion PROPERTIES POSITION_INDEPENDENT_CODE ON)
 set_target_properties(${SD_ABI} PROPERTIES POSITION_INDEPENDENT_CODE ON)
 target_compile_definitions(${SD_ABI} PRIVATE STABLE_DIFFUSION_SHARED STABLE_DIFFUSION_BUILD)
 target_link_libraries(${SD_ABI} PRIVATE ggml stable-diffusion ${CMAKE_THREAD_LIBS_INIT})
-
-

CMakeLists.txt

@@ -4,8 +4,8 @@ if(${CMAKE_VERSION} VERSION_LESS 3.14)
     include(add_FetchContent_MakeAvailable.cmake)
 endif()
 
-set(SD_GIT_TAG  70d2919decdf8f5fcd4956d1da60594c9e7b03ac)
-set(SD_GIT_URL  https://github.com/Cyberhan123/stable-diffusion.cpp)
+set(SD_GIT_TAG  47dd704198f46ee75b11cbaf3aa2b8f644df0be9)
+set(SD_GIT_URL  https://github.com/leejet/stable-diffusion.cpp)
 set(BUILD_SHARED_LIBS OFF)
 
 FetchContent_Declare(

cmake/sd.cmake

@@ -1,11 +1,13 @@
 #include "stable-diffusion-abi.h"
 
 #include "stable-diffusion.h"
-#include "base64.hpp"
 #include <string>
 #include <cstring>
 #include <map>
+#include <algorithm>
+#include <iterator>
 #include <vector>
+
 /*================================================= StableDiffusion ABI API  =============================================*/
 
 const static std::map<std::string, enum SDLogLevel> SDLogLevelMap = {
@@ -188,7 +190,7 @@ bool load_from_file(void* sd, const char* file_path, const char* schedule) {
     return false;
 };
 
-const char* txt2img(void* sd, const sd_txt2img_options* opt) {
+const uint8_t* txt2img(void* sd, const sd_txt2img_options* opt) {
     const auto sm = std::string(opt->sample_method);
     const auto it = SampleMethodMap.find(sm);
     if (it != SampleMethodMap.end()) {
@@ -204,16 +206,23 @@ const char* txt2img(void* sd, const sd_txt2img_options* opt) {
             opt->seed,
             opt->batch_count
         );
-        const auto str = code::base64_encode<std::string, std::vector<uint8_t *>>(result, false);
-        const auto buffer = new char[str.size()];
-        std::memcpy(buffer, str.c_str(), str.size());
+        const auto image_size = opt->width * opt->height * 3;
+        std::vector<uint8_t> images;
+        images.reserve(image_size * opt->batch_count);
+        for (const auto img: result) {
+            if (img != nullptr) {
+                std::copy_n(img, image_size, std::back_inserter(images));
+            }
+        };
+        const auto buffer = new uint8_t[image_size * opt->batch_count];
+        std::memcpy(buffer, images.data(), images.size());
         return buffer;
     }
     delete opt;
     return nullptr;
 };
 
-const char* img2img(void* sd, const sd_img2img_options* opt) {
+const uint8_t* img2img(void* sd, const sd_img2img_options* opt) {
     const auto sm = std::string(opt->sample_method);
     const auto it = SampleMethodMap.find(sm);
     if (it != SampleMethodMap.end()) {
@@ -230,9 +239,16 @@ const char* img2img(void* sd, const sd_img2img_options* opt) {
             opt->strength,
             opt->seed
         );
-        const auto str = code::base64_encode<std::string, std::vector<uint8_t *>>(result, false);
-        const auto buffer = new char[str.size()];
-        std::memcpy(buffer, str.c_str(), str.size());
+        const auto image_size = opt->width * opt->height * 3;
+        std::vector<uint8_t> images;
+        images.reserve(image_size);
+        for (const auto img: result) {
+            if (img != nullptr) {
+                std::copy_n(img, image_size, std::back_inserter(images));
+            }
+        };
+        const auto buffer = new uint8_t[image_size];
+        std::memcpy(buffer, images.data(), images.size());
         return buffer;
     }
     delete opt;

stable-diffusion-abi.cpp

@@ -7,12 +7,12 @@
 #ifdef STABLE_DIFFUSION_SHARED
 #if defined(_WIN32) && !defined(__MINGW32__)
 #ifdef STABLE_DIFFUSION_BUILD
-            #define STABLE_DIFFUSION_API __declspec(dllexport)
+    #define STABLE_DIFFUSION_API __declspec(dllexport)
 #else
-            #define STABLE_DIFFUSION_API __declspec(dllimport)
+    #define STABLE_DIFFUSION_API __declspec(dllimport)
 #endif
 #else
-#define STABLE_DIFFUSION_API __attribute__((visibility("default")))
+    #define STABLE_DIFFUSION_API __attribute__((visibility("default")))
 #endif
 #else
     #define STABLE_DIFFUSION_API
@@ -83,9 +83,9 @@ STABLE_DIFFUSION_API void destroy_stable_diffusion(void* sd);
 
 STABLE_DIFFUSION_API bool load_from_file(void* sd, const char* file_path, const char* schedule);
 
-STABLE_DIFFUSION_API const char* txt2img(void* sd, const sd_txt2img_options* opt);
+STABLE_DIFFUSION_API const uint8_t* txt2img(void* sd, const sd_txt2img_options* opt);
 
-STABLE_DIFFUSION_API const char* img2img(void* sd, const sd_img2img_options* opt);
+STABLE_DIFFUSION_API const uint8_t* img2img(void* sd, const sd_img2img_options* opt);
 
 STABLE_DIFFUSION_API void set_stable_diffusion_log_level(const char* level);