X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_noise%2Fdistort.cpp;h=837189edcf69523493260e8b3a17f926ad4df02b;hb=c3ad95144d148602f672e95ddda1f18fc35502f8;hp=49b5572202515cc594627d6752f951d24d3406fd;hpb=5ddcf36f04cfbd10fabda4e3c5633cb27cdd4c0a;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_noise/distort.cpp b/synfig-core/trunk/src/modules/mod_noise/distort.cpp
index 49b5572..837189e 100644
--- a/synfig-core/trunk/src/modules/mod_noise/distort.cpp
+++ b/synfig-core/trunk/src/modules/mod_noise/distort.cpp
@@ -1,8 +1,8 @@
 /* === S Y N F I G ========================================================= */
-/*!	\file noise.cpp
+/*!	\file distort.cpp
 **	\brief blehh
 **
-**	$Id: distort.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -55,7 +55,7 @@ SYNFIG_LAYER_SET_NAME(NoiseDistort,"noise_distort");
 SYNFIG_LAYER_SET_LOCAL_NAME(NoiseDistort,_("Noise Distort"));
 SYNFIG_LAYER_SET_CATEGORY(NoiseDistort,_("Distortions"));
 SYNFIG_LAYER_SET_VERSION(NoiseDistort,"0.0");
-SYNFIG_LAYER_SET_CVS_ID(NoiseDistort,"$Id: distort.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $");
+SYNFIG_LAYER_SET_CVS_ID(NoiseDistort,"$Id$");
 
 /* === P R O C E D U R E S ================================================= */
 
@@ -74,7 +74,7 @@ NoiseDistort::NoiseDistort():
 }
 
 inline Color
-NoiseDistort::color_func(const Point &point, float supersample,Context context)const
+NoiseDistort::color_func(const Point &point, float /*supersample*/,Context context)const
 {
 	Color ret(0,0,0,0);
 
@@ -84,7 +84,8 @@ NoiseDistort::color_func(const Point &point, float supersample,Context context)c
 	int i;
 	Time time;
 	time=speed*curr_time;
-	int smooth((!speed && smooth==3)?5:smooth);
+	int temp_smooth(smooth);
+	int smooth((!speed && temp_smooth==3)?5:temp_smooth);
 
 	{
 		Vector vect(0,0);
@@ -120,7 +121,7 @@ NoiseDistort::color_func(const Point &point, float supersample,Context context)c
 }
 
 inline float
-NoiseDistort::calc_supersample(const synfig::Point &x, float pw,float ph)const
+NoiseDistort::calc_supersample(const synfig::Point &/*x*/, float /*pw*/,float /*ph*/)const
 {
 	return 0.0f;
 }
@@ -154,7 +155,7 @@ NoiseDistort::hit_check(synfig::Context context, const synfig::Point &point)cons
 bool
 NoiseDistort::set_param(const String & param, const ValueBase &value)
 {
-	if(param=="seed" && value.same_as(int()))
+	if(param=="seed" && value.same_type_as(int()))
 	{
 		random.set_seed(value.get(int()));
 		return true;