gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-10-03 05:21:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #84546 from Rubonnek/fix-jpg-save-bugs

Browse source 
Do not mutate source Image in `Image::save_jpg` and use encoder return value
This commit is contained in:
Rémi Verschelde 2024-01-04 14:26:04 +01:00
parent 0fa767beff 62cbd6805c
commit bfbe145457
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/jpg/image_loader_jpegd.cpp
View file

@ -162,6 +162,7 @@ static Error _jpgd_save_to_output_stream(jpge::output_stream *p_output_stream, c
ERR_FAIL_COND_V_MSG(error != OK, error, "Couldn't decompress image."); ERR_FAIL_COND_V_MSG(error != OK, error, "Couldn't decompress image.");
} }
if (image->get_format() != Image::FORMAT_RGB8) { if (image->get_format() != Image::FORMAT_RGB8) {
image = p_img->duplicate();
image->convert(Image::FORMAT_RGB8); image->convert(Image::FORMAT_RGB8);
} }
@ -173,12 +174,16 @@ static Error _jpgd_save_to_output_stream(jpge::output_stream *p_output_stream, c
const uint8_t *src_data = image->get_data().ptr(); const uint8_t *src_data = image->get_data().ptr();
for (int i = 0; i < image->get_height(); i++) { for (int i = 0; i < image->get_height(); i++) {
enc.process_scanline(&src_data[i * image->get_width() * 3]); if (!enc.process_scanline(&src_data[i * image->get_width() * 3])) {
return FAILED;
}
} }
enc.process_scanline(nullptr); if (enc.process_scanline(nullptr)) {
return OK; return OK;
} else {
return FAILED;
}
} }
static Vector<uint8_t> _jpgd_buffer_save_func(const Ref<Image> &p_img, float p_quality) { static Vector<uint8_t> _jpgd_buffer_save_func(const Ref<Image> &p_img, float p_quality) {