[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12948] trunk/blender/source/blender/ render/intern/source/pipeline.c: Rendering

[Ken Hughes]

Revision: 12948
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12948
Author:   khughes
Date:     2007-12-19 19:17:56 +0100 (Wed, 19 Dec 2007)

Log Message:
-----------
Rendering
--------
Bugfix #4863: AVI jpg would crash on really small images (less than 16x16).
Change it to pop up an error dialog and abort.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/pipeline.c

Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c	2007-12-19 13:11:54 UTC (rev 12947)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2007-12-19 18:17:56 UTC (rev 12948)
@@ -1046,7 +1046,8 @@
 		re->recty= winy;
 	}
 	
-	if(re->rectx < 2 || re->recty < 2) {
+	if(re->rectx < 2 || re->recty < 2 || (BKE_imtype_is_movie(rd->imtype) &&
+(re->rectx < 16 || re->recty < 16) )) {
 		re->error("Image too small");
 		re->ok= 0;
 	}
@@ -2197,6 +2198,8 @@
 		push_render_result(re);
 	
 	RE_InitState(re, &scene->r, winx, winy, &disprect);
+	if(!re->ok)  /* if an error was printed, abort */
+		return 0;
 	
 	/* initstate makes new result, have to send changed tags around */
 	ntreeCompositTagRender(re->scene);