[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49284] trunk/blender/source/blender/ blenkernel: clamp mask resolution, the occasional crash would happen failing to alloc when adding feather points very close together .

[Campbell Barton]

Revision: 49284
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49284
Author:   campbellbarton
Date:     2012-07-27 11:05:08 +0000 (Fri, 27 Jul 2012)
Log Message:
-----------
clamp mask resolution, the occasional crash would happen failing to alloc when adding feather points very close together.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_mask.h
    trunk/blender/source/blender/blenkernel/intern/mask.c

Modified: trunk/blender/source/blender/blenkernel/BKE_mask.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_mask.h	2012-07-27 10:55:24 UTC (rev 49283)
+++ trunk/blender/source/blender/blenkernel/BKE_mask.h	2012-07-27 11:05:08 UTC (rev 49284)
@@ -214,6 +214,8 @@
 #define MASKPOINT_SEL_HANDLE(p)     { (p)->bezt.f1 |=  SELECT; (p)->bezt.f3 |=  SELECT; } (void)0
 #define MASKPOINT_DESEL_HANDLE(p)   { (p)->bezt.f1 &= ~SELECT; (p)->bezt.f3 &= ~SELECT; } (void)0
 
+#define MASK_RESOL_MAX 128
+
 /* disable to test alternate rasterizer */
 /* #define USE_RASKTER */
 

Modified: trunk/blender/source/blender/blenkernel/intern/mask.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mask.c	2012-07-27 10:55:24 UTC (rev 49283)
+++ trunk/blender/source/blender/blenkernel/intern/mask.c	2012-07-27 11:05:08 UTC (rev 49284)
@@ -301,6 +301,12 @@
 		resol = MAX2(resol, cur_resol);
 	}
 
+	BLI_assert(resol > 0);
+
+	if (resol > MASK_RESOL_MAX) {
+		resol = MASK_RESOL_MAX;
+	}
+
 	return resol;
 }
 
@@ -331,6 +337,12 @@
 
 	resol += max_jump / max_segment;
 
+	BLI_assert(resol > 0);
+
+	if (resol > MASK_RESOL_MAX) {
+		resol = MASK_RESOL_MAX;
+	}
+
 	return resol;
 }