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 / insideout.cpp

diff --git a/synfig-core/tags/stable/src/modules/lyr_std/insideout.cpp b/synfig-core/tags/stable/src/modules/lyr_std/insideout.cpp
index b1af4f4..e5e65be 100644 (file)
--- a/synfig-core/tags/stable/src/modules/lyr_std/insideout.cpp
+++ b/synfig-core/tags/stable/src/modules/lyr_std/insideout.cpp
@@ -1,18 +1,23 @@
-/*! ========================================================================
-** Sinfg
-** Template File
-** $Id: insideout.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $
+/* === S Y N F I G ========================================================= */
+/*!    \file insideout.cpp
+**     \brief Implementation of the "Inside Out" layer
 **
-** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     $Id$
 **
-** This software and associated documentation
-** are CONFIDENTIAL and PROPRIETARY property of
-** the above-mentioned copyright holder.
+**     \legal
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2007 Chris Moore
 **
-** 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 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.
+**
+**     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
 **
 ** === N O T E S ===========================================================
 **
@@ -29,15 +34,15 @@
 
 #include "insideout.h"
 
-#include <sinfg/string.h>
-#include <sinfg/time.h>
-#include <sinfg/context.h>
-#include <sinfg/paramdesc.h>
-#include <sinfg/renddesc.h>
-#include <sinfg/surface.h>
-#include <sinfg/value.h>
-#include <sinfg/valuenode.h>
-#include <sinfg/transform.h>
+#include <synfig/string.h>
+#include <synfig/time.h>
+#include <synfig/context.h>
+#include <synfig/paramdesc.h>
+#include <synfig/renddesc.h>
+#include <synfig/surface.h>
+#include <synfig/value.h>
+#include <synfig/valuenode.h>
+#include <synfig/transform.h>
 
 #endif
 
@@ -45,12 +50,12 @@
 
 /* === G L O B A L S ======================================================= */
 
-SINFG_LAYER_INIT(InsideOut);
-SINFG_LAYER_SET_NAME(InsideOut,"inside_out");
-SINFG_LAYER_SET_LOCAL_NAME(InsideOut,_("InsideOut"));
-SINFG_LAYER_SET_CATEGORY(InsideOut,_("Distortions"));
-SINFG_LAYER_SET_VERSION(InsideOut,"0.1");
-SINFG_LAYER_SET_CVS_ID(InsideOut,"$Id: insideout.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $");
+SYNFIG_LAYER_INIT(InsideOut);
+SYNFIG_LAYER_SET_NAME(InsideOut,"inside_out");
+SYNFIG_LAYER_SET_LOCAL_NAME(InsideOut,N_("Inside Out"));
+SYNFIG_LAYER_SET_CATEGORY(InsideOut,N_("Distortions"));
+SYNFIG_LAYER_SET_VERSION(InsideOut,"0.1");
+SYNFIG_LAYER_SET_CVS_ID(InsideOut,"$Id$");
 
 /* === P R O C E D U R E S ================================================= */
 
@@ -60,7 +65,7 @@ InsideOut::InsideOut():
        origin(0,0)
 {
 }
-       
+
 bool
 InsideOut::set_param(const String & param, const ValueBase &value)
 {
@@ -72,15 +77,15 @@ ValueBase
 InsideOut::get_param(const String & param)const
 {
        EXPORT(origin);
-       
+
        EXPORT_NAME();
        EXPORT_VERSION();
-               
-       return ValueBase();     
+
+       return ValueBase();
 }
 
-sinfg::Layer::Handle
-InsideOut::hit_check(sinfg::Context context, const sinfg::Point &p)const
+synfig::Layer::Handle
+InsideOut::hit_check(synfig::Context context, const synfig::Point &p)const
 {
        Point pos(p-origin);
        Real inv_mag=pos.inv_mag();
@@ -102,8 +107,8 @@ class InsideOut_Trans : public Transform
        etl::handle<const InsideOut> layer;
 public:
        InsideOut_Trans(const InsideOut* x):layer(x) { }
-       
-       sinfg::Vector perform(const sinfg::Vector& x)const
+
+       synfig::Vector perform(const synfig::Vector& x)const
        {
                Point pos(x-layer->origin);
                Real inv_mag=pos.inv_mag();
@@ -111,8 +116,8 @@ public:
                        return (pos*(inv_mag*inv_mag)+layer->origin);
                return x;
        }
-       
-       sinfg::Vector unperform(const sinfg::Vector& x)const
+
+       synfig::Vector unperform(const synfig::Vector& x)const
        {
                Point pos(x-layer->origin);
                Real inv_mag=pos.inv_mag();
@@ -131,11 +136,11 @@ Layer::Vocab
 InsideOut::get_param_vocab()const
 {
        Layer::Vocab ret;
-       
+
        ret.push_back(ParamDesc("origin")
                .set_local_name(_("Origin"))
                .set_description(_("Defines the where the center will be"))
        );
-       
+
        return ret;
 }