From b38dea64a48a82dfd5f920ae332129be382d947c Mon Sep 17 00:00:00 2001 From: Green Sky Date: Tue, 28 May 2024 22:38:52 +0200 Subject: [PATCH] improve windows debug conformity --- src/chat_gui/send_image_popup.cpp | 3 +-- src/image_loader_qoi.cpp | 2 +- src/image_loader_sdl_bmp.cpp | 2 +- src/image_loader_webp.cpp | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/chat_gui/send_image_popup.cpp b/src/chat_gui/send_image_popup.cpp index 555cba14..6a1de02a 100644 --- a/src/chat_gui/send_image_popup.cpp +++ b/src/chat_gui/send_image_popup.cpp @@ -151,8 +151,7 @@ void SendImagePopup::sendMemory( } // copy paste data to memory - original_data.clear(); - original_data.insert(original_data.begin(), data, data+data_size); + original_data = {data, data+data_size}; if (!load()) { std::cerr << "SIP: failed to load image from memory\n"; diff --git a/src/image_loader_qoi.cpp b/src/image_loader_qoi.cpp index bed0fd63..cd8f6e7a 100644 --- a/src/image_loader_qoi.cpp +++ b/src/image_loader_qoi.cpp @@ -41,7 +41,7 @@ ImageLoaderQOI::ImageResult ImageLoaderQOI::loadFromMemoryRGBA(const uint8_t* da auto& new_frame = res.frames.emplace_back(); 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); return res; diff --git a/src/image_loader_sdl_bmp.cpp b/src/image_loader_sdl_bmp.cpp index f9f9e56c..0a656059 100644 --- a/src/image_loader_sdl_bmp.cpp +++ b/src/image_loader_sdl_bmp.cpp @@ -47,7 +47,7 @@ ImageLoaderSDLBMP::ImageResult ImageLoaderSDLBMP::loadFromMemoryRGBA(const uint8 auto& new_frame = res.frames.emplace_back(); 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_DestroySurface(conv_surf); diff --git a/src/image_loader_webp.cpp b/src/image_loader_webp.cpp index 01cd9fb4..09acdd73 100644 --- a/src/image_loader_webp.cpp +++ b/src/image_loader_webp.cpp @@ -78,7 +78,7 @@ ImageLoaderWebP::ImageResult ImageLoaderWebP::loadFromMemoryRGBA(const uint8_t* auto& new_frame = res.frames.emplace_back(); new_frame.ms = timestamp-prev_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());