From: dooglus <dooglus@1f10aa63-cdf2-0310-b900-c93c546f37ac>
Date: Sun, 1 Apr 2007 14:28:28 +0000 (+0000)
Subject: Fixes 1692348.  todo: revisit the 'if(z>0 && z<horizon*2)' checks.  Is there a better... 
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=e3dfe7e4df9f65f2331031103453d80c1268a8fd;p=synfig.git

Fixes 1692348.  todo: revisit the 'if(z>0 && z<horizon*2)' checks.  Is there a better way to determine the areas of interest?


git-svn-id: http://svn.voria.com/code@406 1f10aa63-cdf2-0310-b900-c93c546f37ac
---

diff --git a/synfig-core/trunk/src/modules/lyr_std/warp.cpp b/synfig-core/trunk/src/modules/lyr_std/warp.cpp
index 3abf207..2110e02 100644
--- a/synfig-core/trunk/src/modules/lyr_std/warp.cpp
+++ b/synfig-core/trunk/src/modules/lyr_std/warp.cpp
@@ -691,9 +691,7 @@ Warp::accelerated_render(Context context,Surface *surface,int quality, const Ren
 				v=(tmp[1]-tl[1])*src_ph;
 
 				if(u<0 || v<0 || u>=source.get_w() || v>=source.get_h() || isnan(u) || isnan(v))
-				{
 					(*surface)[y][x]=context.get_color(tmp);
-				}
 				else
 					(*surface)[y][x]=source.cubic_sample(u,v);
 			}
@@ -727,12 +725,7 @@ Warp::accelerated_render(Context context,Surface *surface,int quality, const Ren
 				v=(tmp[1]-tl[1])*src_ph;
 
 				if(u<0 || v<0 || u>=source.get_w() || v>=source.get_h() || isnan(u) || isnan(v))
-				{
-					if(clip)
-						(*surface)[y][x]=Color::alpha();
-					else
-						(*surface)[y][x]=context.get_color(tmp);
-				}
+					(*surface)[y][x]=context.get_color(tmp);
 				else
 					(*surface)[y][x]=source.linear_sample(u,v);
 			}
@@ -765,15 +758,10 @@ Warp::accelerated_render(Context context,Surface *surface,int quality, const Ren
 				v=(tmp[1]-tl[1])*src_ph;
 
 				if(u<0 || v<0 || u>=source.get_w() || v>=source.get_h() || isnan(u) || isnan(v))
-				{
-					if(clip)
-						(*surface)[y][x]=Color::alpha();
-					else
-						(*surface)[y][x]=context.get_color(tmp);
-				}
+					(*surface)[y][x]=context.get_color(tmp);
 				else
-				//pen.set_value(source[v][u]);
-				(*surface)[y][x]=source[floor_to_int(v)][floor_to_int(u)];
+					//pen.set_value(source[v][u]);
+					(*surface)[y][x]=source[floor_to_int(v)][floor_to_int(u)];
 			}
 			if(y&31==0 && cb)
 			{