diff options
| author | rsburke4 <rsburke@g.clemson.edu> | 2023-11-11 22:17:56 -0500 |
|---|---|---|
| committer | rsburke4 <rsburke@g.clemson.edu> | 2023-12-10 15:06:22 -0500 |
| commit | dec2269bca8c616dac73ec987f7e670cf0451c77 (patch) | |
| tree | 4d92602f0efc73224c56f515b330d47ab723b57e | |
| parent | 9df6491853b7b043afba3c6d56f4c5b21ac7fd7c (diff) | |
| download | redot-engine-dec2269bca8c616dac73ec987f7e670cf0451c77.tar.gz | |
Added error to catch conversion on invalid image
| -rw-r--r-- | core/io/image.cpp | 1 | ||||
| -rw-r--r-- | tests/core/io/test_image.h | 23 |
2 files changed, 24 insertions, 0 deletions
diff --git a/core/io/image.cpp b/core/io/image.cpp index ce08b417a8..c72064e4f7 100644 --- a/core/io/image.cpp +++ b/core/io/image.cpp @@ -509,6 +509,7 @@ static void _convert(int p_width, int p_height, const uint8_t *p_src, uint8_t *p } void Image::convert(Format p_new_format) { + ERR_FAIL_INDEX_MSG(p_new_format, FORMAT_MAX, "The Image format specified (" + itos(p_new_format) + ") is out of range. See Image's Format enum."); if (data.size() == 0) { return; } diff --git a/tests/core/io/test_image.h b/tests/core/io/test_image.h index 07c7c04e36..945a7e1ba3 100644 --- a/tests/core/io/test_image.h +++ b/tests/core/io/test_image.h @@ -403,6 +403,29 @@ TEST_CASE("[Image] Custom mipmaps") { } } +TEST_CASE("[Image] Convert image") { + for (int format = Image::FORMAT_RF; format < Image::FORMAT_RGBE9995; format++) { + for (int new_format = Image::FORMAT_RF; new_format < Image::FORMAT_RGBE9995; new_format++) { + Ref<Image> image = memnew(Image(4, 4, false, (Image::Format)format)); + image->convert((Image::Format)new_format); + String format_string = Image::format_names[(Image::Format)format]; + String new_format_string = Image::format_names[(Image::Format)new_format]; + format_string = "Error converting from " + format_string + " to " + new_format_string + "."; + CHECK_MESSAGE(image->get_format() == new_format, format_string); + } + } + + Ref<Image> image = memnew(Image(4, 4, false, Image::FORMAT_RGBA8)); + PackedByteArray image_data = image->get_data(); + image->convert((Image::Format)-1); + CHECK_MESSAGE(image->get_data() == image_data, "Image conversion to invalid type (-1) should not alter image."); + + Ref<Image> image2 = memnew(Image(4, 4, false, Image::FORMAT_RGBA8)); + image_data = image2->get_data(); + image2->convert((Image::Format)(Image::FORMAT_MAX + 1)); + CHECK_MESSAGE(image2->get_data() == image_data, "Image conversion to invalid type (Image::FORMAT_MAX + 1) should not alter image."); +} + } // namespace TestImage #endif // TEST_IMAGE_H |