X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Flyr_std%2Fwarp.cpp;h=1a9a0291fa76f67b6da286029cebc4d9dca14791;hb=334e15ce6c4d9b1f30a168a55e7ef4d31320d568;hp=f3767aebe0bc61c5977c5099c1686d90a916c2ce;hpb=674a53ae87b0b2dd3663e3718a7981c0fef415fb;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/lyr_std/warp.cpp b/synfig-core/trunk/src/modules/lyr_std/warp.cpp
index f3767ae..1a9a029 100644
--- a/synfig-core/trunk/src/modules/lyr_std/warp.cpp
+++ b/synfig-core/trunk/src/modules/lyr_std/warp.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file warp.cpp
-**	\brief Template File
+**	\brief Implementation of the "Warp" layer
 **
 **	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -51,8 +52,8 @@
 
 SYNFIG_LAYER_INIT(Warp);
 SYNFIG_LAYER_SET_NAME(Warp,"warp");
-SYNFIG_LAYER_SET_LOCAL_NAME(Warp,_("Warp"));
-SYNFIG_LAYER_SET_CATEGORY(Warp,_("Distortions"));
+SYNFIG_LAYER_SET_LOCAL_NAME(Warp,N_("Warp"));
+SYNFIG_LAYER_SET_CATEGORY(Warp,N_("Distortions"));
 SYNFIG_LAYER_SET_VERSION(Warp,"0.1");
 SYNFIG_LAYER_SET_CVS_ID(Warp,"$Id$");
 
@@ -613,6 +614,12 @@ Warp::accelerated_render(Context context,Surface *surface,int quality, const Ren
 	Point min_point(bounding_rect.get_min());
 	Point max_point(bounding_rect.get_max());
 
+	// we're going to divide by the difference of these pairs soon;
+	// if they're the same, we'll be dividing by zero, and we don't
+	// want to do that!
+	// \todo what should we do in this case?
+	if (min_point[0] == max_point[0]) max_point[0] += 0.001;
+	if (min_point[1] == max_point[1]) max_point[1] += 0.001;
 
 	if(tl[0]>br[0])
 	{
@@ -699,7 +706,7 @@ Warp::accelerated_render(Context context,Surface *surface,int quality, const Ren
 				else
 					(*surface)[y][x]=source.cubic_sample(u,v);
 			}
-			if(y&31==0 && cb)
+			if((y&31)==0 && cb)
 			{
 				if(!stagetwo.amount_complete(y,surface->get_h()))
 					return false;
@@ -733,7 +740,7 @@ Warp::accelerated_render(Context context,Surface *surface,int quality, const Ren
 				else
 					(*surface)[y][x]=source.linear_sample(u,v);
 			}
-			if(y&31==0 && cb)
+			if((y&31)==0 && cb)
 			{
 				if(!stagetwo.amount_complete(y,surface->get_h()))
 					return false;
@@ -767,7 +774,7 @@ Warp::accelerated_render(Context context,Surface *surface,int quality, const Ren
 					//pen.set_value(source[v][u]);
 					(*surface)[y][x]=source[floor_to_int(v)][floor_to_int(u)];
 			}
-			if(y&31==0 && cb)
+			if((y&31)==0 && cb)
 			{
 				if(!stagetwo.amount_complete(y,surface->get_h()))
 					return false;