X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_shape.cpp;h=a686bcffa3cecd4bcbf46829f029a6112368c092;hb=2e98eca8dbf8e348f2456d9a9372cf23055a81c9;hp=d1e7aefa32d8105629ff071eae3372534864af56;hpb=37600b4b217caa5e316984ec0b035c5e8f9698af;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/layer_shape.cpp b/synfig-core/trunk/src/synfig/layer_shape.cpp
index d1e7aef..a686bcf 100644
--- a/synfig-core/trunk/src/synfig/layer_shape.cpp
+++ b/synfig-core/trunk/src/synfig/layer_shape.cpp
@@ -713,7 +713,7 @@ struct Layer_Shape::Intersector
 {
 	Rect	aabb;
 
-	//! true iff aabb hasn't been initialised yet
+	//! true iff aabb hasn't been initialized yet
 	bool	initaabb;
 
 	int 	flags;
@@ -1548,7 +1548,7 @@ void Layer_Shape::PolySpan::conic_to(Real x1, Real y1, Real x, Real y)
 	{
 		if(num >= MAX_SUBDIVISION_SIZE)
 		{
-			warning("Curve subdivision somehow ran out of space while tesselating!");
+			warning("Curve subdivision somehow ran out of space while tessellating!");
 
 			//do something...
 			assert(0);
@@ -1621,7 +1621,7 @@ void Layer_Shape::PolySpan::cubic_to(Real x1, Real y1, Real x2, Real y2, Real x,
 	{
 		if(num >= MAX_SUBDIVISION_SIZE)
 		{
-			warning("Curve subdivision somehow ran out of space while tesselating!");
+			warning("Curve subdivision somehow ran out of space while tessellating!");
 
 			//do something...
 			assert(0);
@@ -1699,7 +1699,7 @@ void Layer_Shape::PolySpan::draw_scanline(int y, Real x1, Real fy1, Real x2, Rea
 	//case all in same pixel
 	if(ix1 == ix2)  //impossible for degenerate case (covered by the previous cases)
 	{
-		current.addcover(dy,(fx1 + fx2)*dy/2); //horizontal trapazoid area
+		current.addcover(dy,(fx1 + fx2)*dy/2); //horizontal trapezoid area
 		return;
 	}
 
@@ -1713,7 +1713,7 @@ void Layer_Shape::PolySpan::draw_scanline(int y, Real x1, Real fy1, Real x2, Rea
 		mult = (1 - fx1)*dydx;	//next y intersection diff value (at 1)
 
 		//first pixel
-		current.addcover(mult,(1 + fx1)*mult/2);	// fx1,fy1,1,fy@1 - starting trapazoidal area
+		current.addcover(mult,(1 + fx1)*mult/2);	// fx1,fy1,1,fy@1 - starting trapezoidal area
 
 		//move to the next pixel
 		fy1 += mult;
@@ -1749,7 +1749,7 @@ void Layer_Shape::PolySpan::draw_scanline(int y, Real x1, Real fy1, Real x2, Rea
 		mult = fx1*dydx;	//next y intersection diff value
 
 		//first pixel
-		current.addcover(mult,fx1*mult/2);	// fx1,fy1,0,fy@0 - starting trapazoidal area
+		current.addcover(mult,fx1*mult/2);	// fx1,fy1,0,fy@0 - starting trapezoidal area
 
 		//move to next pixel
 		fy1 += mult;
@@ -1877,7 +1877,7 @@ void Layer_Shape::PolySpan::draw_line(Real x1, Real y1, Real x2, Real y2)
 
 		mult = (1 - fy1) * dxdy;
 
-		//x interset scanline
+		//x intersect scanline
 		x_from = x1 + mult;
 		draw_scanline(iy1,x1,fy1,x_from,1);
 
@@ -1907,7 +1907,7 @@ void Layer_Shape::PolySpan::draw_line(Real x1, Real y1, Real x2, Real y2)
 
 		mult = fy1 * dxdy;
 
-		//x interset scanline
+		//x intersect scanline
 		x_from = x1 + mult;
 		draw_scanline(iy1,x1,fy1,x_from,0);
 
@@ -2640,7 +2640,11 @@ Layer_Shape::render_shape(Surface *surface,bool useblend,int /*quality*/,
 
 	PolySpan	span;
 
-	//optimization for tesselating only inside tiles
+	// if the pixels are zero sized then we're too zoomed out to see anything
+	if (pw == 0 || ph == 0)
+		return true;
+
+	//optimization for tessellating only inside tiles
 	span.window.minx = 0;
 	span.window.miny = 0;
 	span.window.maxx = w;
@@ -2876,7 +2880,7 @@ Layer_Shape::render_shape(surface<float> *surface,int /*quality*/,
 
 	PolySpan	span;
 
-	//optimization for tesselating only inside tiles
+	//optimization for tessellating only inside tiles
 	span.window.minx = 0;
 	span.window.miny = 0;
 	span.window.maxx = w;