mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix STR#2884: Fl_PNG_Image made from static memory will forget share name

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9712 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2012-11-10 08:31:35 +00:00
parent cff8941836
commit 54d5327958
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Fl_PNG_Image.cxx
View File

@ -114,7 +114,7 @@ void Fl_PNG_Image::load_png_(const char *name_png, const unsigned char *buffer_p
if (!from_memory) { if (!from_memory) {
if ((fp = fl_fopen(name_png, "rb")) == NULL) return; if ((fp = fl_fopen(name_png, "rb")) == NULL) return;
} }
else name_png = "In-memory PNG data"; const char *display_name = (name_png ? name_png : "");
// Setup the PNG data structures... // Setup the PNG data structures...
pp = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); pp = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
@ -122,7 +122,7 @@ void Fl_PNG_Image::load_png_(const char *name_png, const unsigned char *buffer_p
if (!pp || !info) { if (!pp || !info) {
if (pp) png_destroy_read_struct(&pp, NULL, NULL); if (pp) png_destroy_read_struct(&pp, NULL, NULL);
if (!from_memory) fclose(fp); if (!from_memory) fclose(fp);
Fl::warning("Cannot allocate memory to read PNG file or data \"%s\".\n", name_png); Fl::warning("Cannot allocate memory to read PNG file or data \"%s\".\n", display_name);
return; return;
} }
@ -130,7 +130,7 @@ void Fl_PNG_Image::load_png_(const char *name_png, const unsigned char *buffer_p
{ {
png_destroy_read_struct(&pp, &info, NULL); png_destroy_read_struct(&pp, &info, NULL);
if (!from_memory) fclose(fp); if (!from_memory) fclose(fp);
Fl::warning("PNG file or data \"%s\" is too large or contains errors!\n", name_png); Fl::warning("PNG file or data \"%s\" is too large or contains errors!\n", display_name);
return; return;
} }