X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_bitmap.cpp;h=cda5d09897d0fd8defef6108bc3500636bf2c819;hb=7b90fa6d64864aba582c3e8d4e0f2e8add8bd6c5;hp=fc395dc24ba1b3c3f70ba8e03c203f94a9d37320;hpb=c9582dc1cba08b936b35f36f36c0fa018a203a53;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/layer_bitmap.cpp b/synfig-core/trunk/src/synfig/layer_bitmap.cpp
index fc395dc..cda5d09 100644
--- a/synfig-core/trunk/src/synfig/layer_bitmap.cpp
+++ b/synfig-core/trunk/src/synfig/layer_bitmap.cpp
@@ -165,16 +165,14 @@ Layer_Bitmap::hit_check(synfig::Context context, const synfig::Point &pos)const
 
 inline
 const Color&
-synfig::Layer_Bitmap::filter(const Color& c)const
+synfig::Layer_Bitmap::filter(Color& x)const
 {
-	if(gamma_adjust==1.0)
-		return c;
-	static Color x;
-	x=c;
-
-	x.set_r(powf((float)x.get_r(),gamma_adjust));
-	x.set_g(powf((float)x.get_g(),gamma_adjust));
-	x.set_b(powf((float)x.get_b(),gamma_adjust));
+	if(gamma_adjust!=1.0)
+	{
+		x.set_r(powf((float)x.get_r(),gamma_adjust));
+		x.set_g(powf((float)x.get_g(),gamma_adjust));
+		x.set_b(powf((float)x.get_b(),gamma_adjust));
+	}
 	return x;
 }
 
@@ -458,7 +456,8 @@ Layer_Bitmap::accelerated_render(Context context,Surface *out_surface,int qualit
 			inx = inx_start;
 			for(x = x_start; x < x_end; x++, pen.inc_x(), inx += indx)
 			{
-				pen.put_value(filter(surface.linear_sample(inx,iny)));
+				Color col(surface.linear_sample(inx,iny));
+				pen.put_value(filter(col));
 			}
 			pen.dec_x(x_end-x_start);
 
@@ -483,7 +482,8 @@ Layer_Bitmap::accelerated_render(Context context,Surface *out_surface,int qualit
 			inx = inx_start;
 			for(x = x_start; x < x_end; x++, pen.inc_x(), inx += indx)
 			{
-				pen.put_value(filter(surface.cosine_sample(inx,iny)));
+				Color col(surface.cosine_sample(inx,iny));
+				pen.put_value(filter(col));
 			}
 			pen.dec_x(x_end-x_start);
 
@@ -507,7 +507,8 @@ Layer_Bitmap::accelerated_render(Context context,Surface *out_surface,int qualit
 			inx = inx_start;
 			for(x = x_start; x < x_end; x++, pen.inc_x(), inx += indx)
 			{
-				pen.put_value(filter(surface.cubic_sample(inx,iny)));
+				Color col(surface.cubic_sample(inx,iny));
+				pen.put_value(filter(col));
 			}
 			pen.dec_x(x_end-x_start);