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

[synfig.git] / synfig-core / tags / stable / src / modules / lyr_std / zoom.h

diff --git a/synfig-core/tags/stable/src/modules/lyr_std/zoom.h b/synfig-core/tags/stable/src/modules/lyr_std/zoom.h
index 3a30194..aaced17 100644 (file)
--- a/synfig-core/tags/stable/src/modules/lyr_std/zoom.h
+++ b/synfig-core/tags/stable/src/modules/lyr_std/zoom.h
@@ -1,33 +1,34 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file zoom.h
-**     \brief writeme
+**     \brief Header file for implementation of the "Zoom" layer
 **
-**     $Id: zoom.h,v 1.2 2005/01/24 03:08:17 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_ZOOM_H
-#define __SINFG_ZOOM_H
+#ifndef __SYNFIG_ZOOM_H
+#define __SYNFIG_ZOOM_H
 
 /* === H E A D E R S ======================================================= */
 
-#include <sinfg/layer.h>
-#include <sinfg/vector.h>
+#include <synfig/layer.h>
+#include <synfig/vector.h>
 
 /* === M A C R O S ========================================================= */
 
@@ -35,7 +36,7 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
-using namespace sinfg;
+using namespace synfig;
 using namespace std;
 using namespace etl;
 
@@ -43,22 +44,22 @@ class Zoom_Trans;
 
 class Zoom : public Layer
 {
-       SINFG_LAYER_MODULE_EXT
+       SYNFIG_LAYER_MODULE_EXT
        friend class Zoom_Trans;
 private:
        Vector center;
        Real amount;
 public:
        Zoom();
-       
-       virtual bool set_param(const String & param, const sinfg::ValueBase &value);
+
+       virtual bool set_param(const String & param, const synfig::ValueBase &value);
        virtual ValueBase get_param(const String & param)const;
        virtual Color get_color(Context context, const Point &pos)const;
        virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const;
-       sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; 
+       synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const;
        virtual Vocab get_param_vocab()const;
-       virtual sinfg::Rect get_full_bounding_rect(sinfg::Context context)const;
-       virtual etl::handle<sinfg::Transform> get_transform()const;
+       virtual synfig::Rect get_full_bounding_rect(synfig::Context context)const;
+       virtual etl::handle<synfig::Transform> get_transform()const;
 
 };