diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-01-23 17:19:51 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-01-23 17:19:51 -0300 |
| commit | 08e536dbe0ed12f7f1548c38f1cc19ccde19ea94 (patch) | |
| tree | 917feaf9dfb8738070398fd533dfe366afbe86fc | |
| parent | de7fe2fced036154993376e245c694a03ef70172 (diff) | |
-Support the TRNS flag on libpng, fixes #3097
| -rw-r--r-- | drivers/png/image_loader_png.cpp | 7 | ||||
| -rw-r--r-- | tools/editor/property_editor.cpp | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/drivers/png/image_loader_png.cpp b/drivers/png/image_loader_png.cpp index a86e747d80..50b26d601a 100644 --- a/drivers/png/image_loader_png.cpp +++ b/drivers/png/image_loader_png.cpp @@ -124,6 +124,13 @@ Error ImageLoaderPNG::_load_image(void *rf_up,png_rw_ptr p_func,Image *p_image) png_read_update_info(png, info); } + if (png_get_valid(png,info,PNG_INFO_tRNS)) { +// png_set_expand_gray_1_2_4_to_8(png); + png_set_tRNS_to_alpha(png); + png_read_update_info(png, info); + png_get_IHDR(png, info, &width, &height, &depth, &color, NULL, NULL, NULL); + } + int palette_colors = 0; int palette_components = 0; int components = 0; diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp index 286a8f25b1..edaac2c632 100644 --- a/tools/editor/property_editor.cpp +++ b/tools/editor/property_editor.cpp @@ -2045,7 +2045,7 @@ void PropertyEditor::set_item_text(TreeItem *p_item, int p_type, const String& p if (img.empty()) p_item->set_text(1,"[Image (empty)]"); else - p_item->set_text(1,"[Image "+itos(img.get_width())+"x"+itos(img.get_height())+"]"); + p_item->set_text(1,"[Image "+itos(img.get_width())+"x"+itos(img.get_height())+"-"+String(Image::get_format_name(img.get_format()))+"]"); } break; case Variant::NODE_PATH: { @@ -3007,7 +3007,7 @@ void PropertyEditor::update_tree() { if (img.empty()) item->set_text(1,"[Image (empty)]"); else - item->set_text(1,"[Image "+itos(img.get_width())+"x"+itos(img.get_height())+"]"); + item->set_text(1,"[Image "+itos(img.get_width())+"x"+itos(img.get_height())+"-"+String(Image::get_format_name(img.get_format()))+"]"); if (show_type_icons) item->set_icon( 0,get_icon("Image","EditorIcons") ); |