[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53572] trunk/blender/source/blender/ editors/space_image/image_draw.c: Fix #33761: Infinite loop in space_image if tile size > image size

Sergey Sharybin sergey.vfx at gmail.com
Sat Jan 5 08:30:55 CET 2013


Revision: 53572
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53572
Author:   nazgul
Date:     2013-01-05 07:30:52 +0000 (Sat, 05 Jan 2013)
Log Message:
-----------
Fix #33761: Infinite loop in space_image if tile size > image size

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_image/image_draw.c

Modified: trunk/blender/source/blender/editors/space_image/image_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_draw.c	2013-01-05 07:25:02 UTC (rev 53571)
+++ trunk/blender/source/blender/editors/space_image/image_draw.c	2013-01-05 07:30:52 UTC (rev 53572)
@@ -587,8 +587,8 @@
 		sima->curtile = ima->xrep * ima->yrep - 1;
 	
 	/* retrieve part of image buffer */
-	dx = ibuf->x / ima->xrep;
-	dy = ibuf->y / ima->yrep;
+	dx = max_ii(ibuf->x / ima->xrep, 1);
+	dy = max_ii(ibuf->y / ima->yrep, 1);
 	sx = (sima->curtile % ima->xrep) * dx;
 	sy = (sima->curtile / ima->xrep) * dy;
 	rect = get_part_from_buffer((unsigned int *)display_buffer, ibuf->x, sx, sy, sx + dx, sy + dy);




More information about the Bf-blender-cvs mailing list