X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Flyr_std%2Fstretch.cpp;h=c8b509020d6dc37b3293c4d795c908fe210a7861;hb=53001077db315f4a8e85199408bbd1c6ebe504ed;hp=c54cf67d1e89e2ca1489d254c7f45709b5f9de4f;hpb=cc54c38609ee9745ad678e5e9b9d7d2912be9c95;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/lyr_std/stretch.cpp b/synfig-core/trunk/src/modules/lyr_std/stretch.cpp
index c54cf67..c8b5090 100644
--- a/synfig-core/trunk/src/modules/lyr_std/stretch.cpp
+++ b/synfig-core/trunk/src/modules/lyr_std/stretch.cpp
@@ -6,6 +6,7 @@
 **
 **	\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
@@ -135,12 +136,14 @@ public:
 
 	synfig::Vector perform(const synfig::Vector& x)const
 	{
-		return Vector((x[0]-layer->center[0])*layer->amount[0]+layer->center[0],(x[1]-layer->center[1])*layer->amount[1]+layer->center[1]);
+		return Vector((x[0]-layer->center[0])*layer->amount[0]+layer->center[0],
+					  (x[1]-layer->center[1])*layer->amount[1]+layer->center[1]);
 	}
 
 	synfig::Vector unperform(const synfig::Vector& x)const
 	{
-		return Vector((x[0]-layer->center[0])/layer->amount[0]+layer->center[0],(x[1]-layer->center[1])/layer->amount[1]+layer->center[1]);
+		return Vector((x[0]-layer->center[0])/layer->amount[0]+layer->center[0],
+					  (x[1]-layer->center[1])/layer->amount[1]+layer->center[1]);
 	}
 };
 etl::handle<Transform>
@@ -152,6 +155,13 @@ Layer_Stretch::get_transform()const
 bool
 Layer_Stretch::accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const
 {
+	if (amount[0] == 0 || amount[1] == 0)
+	{
+		surface->set_wh(renddesc.get_w(), renddesc.get_h());
+		surface->clear();
+		return true;
+	}
+
 	RendDesc desc(renddesc);
 	desc.clear_flags();
     // Adjust the top_left and bottom_right points
@@ -167,3 +177,15 @@ Layer_Stretch::accelerated_render(Context context,Surface *surface,int quality,
 	// Render the scene
 	return context.accelerated_render(surface,quality,desc,cb);
 }
+
+Rect
+Layer_Stretch::get_full_bounding_rect(Context context)const
+{
+	Rect rect(context.get_full_bounding_rect());
+	Point min(rect.get_min()), max(rect.get_max());
+
+	return Rect(Point((min[0]-center[0])*amount[0]+center[0],
+					  (min[1]-center[1])*amount[1]+center[1]),
+				Point((max[0]-center[0])*amount[0]+center[0],
+					  (max[1]-center[1])*amount[1]+center[1]));
+}