Tha_14/tomato-testing
1
0
Fork 0
forked from Green-Sky/tomato
Code Pull Requests Actions Packages Releases Activity

improve windows debug conformity

Browse Source
This commit is contained in:
Green Sky 2024-05-28 22:38:52 +02:00
parent 2d4729a877
commit ba7188cf66
No known key found for this signature in database
8 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/cd.yml vendored
View File

@ -22,7 +22,7 @@ jobs:
submodules: recursive submodules: recursive
- name: Install Dependencies - name: Install Dependencies
run: sudo apt update && sudo apt -y install libsodium-dev run: sudo apt update && sudo apt -y install libsodium-dev cmake
- name: Configure CMake - name: Configure CMake
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}

2
.github/workflows/ci.yml vendored
View File

@ -21,7 +21,7 @@ jobs:
submodules: recursive submodules: recursive
- name: Install Dependencies - name: Install Dependencies
run: sudo apt update && sudo apt -y install libsodium-dev run: sudo apt update && sudo apt -y install libsodium-dev cmake
- name: Configure CMake - name: Configure CMake
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}

3
src/chat_gui/send_image_popup.cpp
View File

@ -151,8 +151,7 @@ void SendImagePopup::sendMemory(
} }
// copy paste data to memory // copy paste data to memory
original_data.clear(); original_data = {data, data+data_size};
original_data.insert(original_data.begin(), data, data+data_size);
if (!load()) { if (!load()) {
std::cerr << "SIP: failed to load image from memory\n"; std::cerr << "SIP: failed to load image from memory\n";

2
src/image_loader_qoi.cpp
View File

@ -41,7 +41,7 @@ ImageLoaderQOI::ImageResult ImageLoaderQOI::loadFromMemoryRGBA(const uint8_t* da
auto& new_frame = res.frames.emplace_back(); auto& new_frame = res.frames.emplace_back();
new_frame.ms = 0; new_frame.ms = 0;
new_frame.data.insert(new_frame.data.cbegin(), img_data, img_data+(desc.width*desc.height*4)); new_frame.data = {img_data, img_data+(desc.width*desc.height*4)};
free(img_data); free(img_data);
return res; return res;

2
src/image_loader_sdl_bmp.cpp
View File

@ -47,7 +47,7 @@ ImageLoaderSDLBMP::ImageResult ImageLoaderSDLBMP::loadFromMemoryRGBA(const uint8
auto& new_frame = res.frames.emplace_back(); auto& new_frame = res.frames.emplace_back();
new_frame.ms = 0; new_frame.ms = 0;
new_frame.data.insert(new_frame.data.cbegin(), (const uint8_t*)conv_surf->pixels, ((const uint8_t*)conv_surf->pixels) + (surf->w*surf->h*4)); new_frame.data = {(const uint8_t*)conv_surf->pixels, ((const uint8_t*)conv_surf->pixels) + (surf->w*surf->h*4)};
SDL_UnlockSurface(conv_surf); SDL_UnlockSurface(conv_surf);
SDL_DestroySurface(conv_surf); SDL_DestroySurface(conv_surf);

2
src/image_loader_sdl_image.cpp
View File

@ -99,7 +99,7 @@ ImageLoaderSDLImage::ImageResult ImageLoaderSDLImage::loadFromMemoryRGBA(const u
auto& new_frame = res.frames.emplace_back(); auto& new_frame = res.frames.emplace_back();
new_frame.ms = anim->delays[i]; new_frame.ms = anim->delays[i];
new_frame.data.insert(new_frame.data.cbegin(), (const uint8_t*)conv_surf->pixels, ((const uint8_t*)conv_surf->pixels) + (anim->w*anim->h*4)); new_frame.data = {(const uint8_t*)conv_surf->pixels, ((const uint8_t*)conv_surf->pixels) + (anim->w*anim->h*4)};
SDL_UnlockSurface(conv_surf); SDL_UnlockSurface(conv_surf);
SDL_DestroySurface(conv_surf); SDL_DestroySurface(conv_surf);

4
src/image_loader_stb.cpp
View File

@ -41,7 +41,7 @@ ImageLoaderSTB::ImageResult ImageLoaderSTB::loadFromMemoryRGBA(const uint8_t* da
for (int i = 0; i < z; i++) { for (int i = 0; i < z; i++) {
auto& new_frame = res.frames.emplace_back(); auto& new_frame = res.frames.emplace_back();
new_frame.ms = delays[i]; new_frame.ms = delays[i];
new_frame.data.insert(new_frame.data.cbegin(), img_data + (i*stride), img_data + ((i+1)*stride)); new_frame.data = {img_data + (i*stride), img_data + ((i+1)*stride)};
} }
stbi_image_free(delays); // hope this is right stbi_image_free(delays); // hope this is right
@ -62,7 +62,7 @@ ImageLoaderSTB::ImageResult ImageLoaderSTB::loadFromMemoryRGBA(const uint8_t* da
auto& new_frame = res.frames.emplace_back(); auto& new_frame = res.frames.emplace_back();
new_frame.ms = 0; new_frame.ms = 0;
new_frame.data.insert(new_frame.data.cbegin(), img_data, img_data+(x*y*4)); new_frame.data = {img_data, img_data+(x*y*4)};
stbi_image_free(img_data); stbi_image_free(img_data);
return res; return res;

2
src/image_loader_webp.cpp
View File

@ -78,7 +78,7 @@ ImageLoaderWebP::ImageResult ImageLoaderWebP::loadFromMemoryRGBA(const uint8_t*
auto& new_frame = res.frames.emplace_back(); auto& new_frame = res.frames.emplace_back();
new_frame.ms = timestamp-prev_timestamp; new_frame.ms = timestamp-prev_timestamp;
prev_timestamp = timestamp; prev_timestamp = timestamp;
new_frame.data.insert(new_frame.data.end(), buf, buf+(res.width*res.height*4)); new_frame.data = {buf, buf+(res.width*res.height*4)};
} }
assert(anim_info.frame_count == res.frames.size()); assert(anim_info.frame_count == res.frames.size());