[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31291] trunk/blender/source/blender/imbuf /intern/thumbs.c: Fix #23188: libpng error: Image width or height is zero in IHDR.

Brecht Van Lommel brecht at blender.org
Thu Aug 12 17:15:02 CEST 2010


Revision: 31291
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31291
Author:   blendix
Date:     2010-08-12 17:15:02 +0200 (Thu, 12 Aug 2010)

Log Message:
-----------
Fix #23188: libpng error: Image width or height is zero in IHDR.

The file thumbnail generator would write 0x0 size png's to the .thumbnails/fail
folder. However libpng throws an error when doing this. Instead we now write 1x1
png's, which nautilus seems to be doing as well. The content shouldn't matter
anyway since we won't use it.

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/thumbs.c

Modified: trunk/blender/source/blender/imbuf/intern/thumbs.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/thumbs.c	2010-08-12 14:49:08 UTC (rev 31290)
+++ trunk/blender/source/blender/imbuf/intern/thumbs.c	2010-08-12 15:15:02 UTC (rev 31291)
@@ -264,7 +264,7 @@
 			tsize = 256;
 			break;
 		case THB_FAIL:
-			tsize = 0;
+			tsize = 1;
 			break;
 		default:
 			return 0; /* unknown size */
@@ -280,7 +280,7 @@
 			return NULL;
 		}
 		if (size == THB_FAIL) {
-			img = IMB_allocImBuf(0,0,32, IB_rect | IB_metadata, 0);
+			img = IMB_allocImBuf(1,1,32, IB_rect | IB_metadata, 0);
 			if (!img) return 0;
 		} else {
 			if (THB_SOURCE_IMAGE == source || THB_SOURCE_BLEND == source) {





More information about the Bf-blender-cvs mailing list