Fix bugs in previous commit that caused FTBFS in synfig and ETL FTBFS with older...

[synfig.git] / synfig-core / tags / stable / src / modules / mod_gradient / spiralgradient.h

diff --git a/synfig-core/tags/stable/src/modules/mod_gradient/spiralgradient.h b/synfig-core/tags/stable/src/modules/mod_gradient/spiralgradient.h
index b4d2a20..32e3d91 100644 (file)
--- a/synfig-core/tags/stable/src/modules/mod_gradient/spiralgradient.h
+++ b/synfig-core/tags/stable/src/modules/mod_gradient/spiralgradient.h
@@ -1,37 +1,38 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file spiralgradient.h
-**     \brief Template Header
+**     \brief Header file for implementation of the "Spiral Gradient" layer
 **
-**     $Id: spiralgradient.h,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $
+**     $Id$
 **
 **     \legal
-**     Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**     This software and associated documentation
-**     are CONFIDENTIAL and PROPRIETARY property of
-**     the above-mentioned copyright holder.
+**     This package is free software; you can redistribute it and/or
+**     modify it under the terms of the GNU General Public License as
+**     published by the Free Software Foundation; either version 2 of
+**     the License, or (at your option) any later version.
 **
-**     You may not copy, print, publish, or in any
-**     other way distribute this software without
-**     a prior written agreement with
-**     the copyright holder.
+**     This package is distributed in the hope that it will be useful,
+**     but WITHOUT ANY WARRANTY; without even the implied warranty of
+**     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**     General Public License for more details.
 **     \endlegal
 */
 /* ========================================================================= */
 
 /* === S T A R T =========================================================== */
 
-#ifndef __SINFG_SPIRALGRADIENT_H
-#define __SINFG_SPIRALGRADIENT_H
+#ifndef __SYNFIG_SPIRALGRADIENT_H
+#define __SYNFIG_SPIRALGRADIENT_H
 
 /* === H E A D E R S ======================================================= */
 
-#include <sinfg/layer_composite.h>
-#include <sinfg/color.h>
-#include <sinfg/vector.h>
-#include <sinfg/value.h>
-#include <sinfg/gradient.h>
-#include <sinfg/angle.h>
+#include <synfig/layer_composite.h>
+#include <synfig/color.h>
+#include <synfig/vector.h>
+#include <synfig/value.h>
+#include <synfig/gradient.h>
+#include <synfig/angle.h>
 
 /* === M A C R O S ========================================================= */
 
@@ -39,39 +40,39 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
-class SpiralGradient : public sinfg::Layer_Composite, public sinfg::Layer_NoDeform
+class SpiralGradient : public synfig::Layer_Composite, public synfig::Layer_NoDeform
 {
-       SINFG_LAYER_MODULE_EXT
-       
+       SYNFIG_LAYER_MODULE_EXT
+
 private:
 
-       sinfg::Gradient gradient;
+       synfig::Gradient gradient;
 
-       sinfg::Point center;
+       synfig::Point center;
 
-       sinfg::Real radius;
+       synfig::Real radius;
 
-       sinfg::Angle angle;
+       synfig::Angle angle;
 
        bool clockwise;
 
-       sinfg::Color color_func(const sinfg::Point &x, float supersample=0)const;
+       synfig::Color color_func(const synfig::Point &x, float supersample=0)const;
 
-       float calc_supersample(const sinfg::Point &x, float pw,float ph)const;
+       float calc_supersample(const synfig::Point &x, float pw,float ph)const;
 
 public:
-       
+
        SpiralGradient();
-       
-       virtual bool set_param(const sinfg::String & param, const sinfg::ValueBase &value);
 
-       virtual sinfg::ValueBase get_param(const sinfg::String & param)const;
+       virtual bool set_param(const synfig::String & param, const synfig::ValueBase &value);
+
+       virtual synfig::ValueBase get_param(const synfig::String & param)const;
+
+       virtual synfig::Color get_color(synfig::Context context, const synfig::Point &pos)const;
+
+       virtual bool accelerated_render(synfig::Context context,synfig::Surface *surface,int quality, const synfig::RendDesc &renddesc, synfig::ProgressCallback *cb)const;
+       synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const;
 
-       virtual sinfg::Color get_color(sinfg::Context context, const sinfg::Point &pos)const;
-       
-       virtual bool accelerated_render(sinfg::Context context,sinfg::Surface *surface,int quality, const sinfg::RendDesc &renddesc, sinfg::ProgressCallback *cb)const;
-       sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; 
-       
        virtual Vocab get_param_vocab()const;
 }; // END of class SpiralGradient