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

diff --git a/synfig-core/tags/stable/src/modules/lyr_std/zoom.cpp b/synfig-core/tags/stable/src/modules/lyr_std/zoom.cpp
index 1d632a1..ff73c4c 100644 (file)
--- a/synfig-core/tags/stable/src/modules/lyr_std/zoom.cpp
+++ b/synfig-core/tags/stable/src/modules/lyr_std/zoom.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file zoom.cpp
-**     \brief writeme
+**     \brief Implementation of the "Zoom" layer
 **
-**     $Id: zoom.cpp,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
 */
 /* ========================================================================= */
@@ -29,15 +30,15 @@
 #endif
 
 #include "zoom.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 +46,12 @@
 
 /* === G L O B A L S ======================================================= */
 
-SINFG_LAYER_INIT(Zoom);
-SINFG_LAYER_SET_NAME(Zoom,"zoom");
-SINFG_LAYER_SET_LOCAL_NAME(Zoom,_("Zoom"));
-SINFG_LAYER_SET_CATEGORY(Zoom,_("Transform"));
-SINFG_LAYER_SET_VERSION(Zoom,"0.1");
-SINFG_LAYER_SET_CVS_ID(Zoom,"$Id: zoom.cpp,v 1.2 2005/01/24 03:08:17 darco Exp $");
+SYNFIG_LAYER_INIT(Zoom);
+SYNFIG_LAYER_SET_NAME(Zoom,"zoom");
+SYNFIG_LAYER_SET_LOCAL_NAME(Zoom,N_("Zoom"));
+SYNFIG_LAYER_SET_CATEGORY(Zoom,N_("Transform"));
+SYNFIG_LAYER_SET_VERSION(Zoom,"0.1");
+SYNFIG_LAYER_SET_CVS_ID(Zoom,"$Id$");
 
 /* === P R O C E D U R E S ================================================= */
 
@@ -63,14 +64,14 @@ Zoom::Zoom():
        amount(0)
 {
 }
-       
+
 bool
 Zoom::set_param(const String & param, const ValueBase &value)
 {
 
        IMPORT(center);
        IMPORT(amount);
-       
+
        return false;
 }
 
@@ -82,15 +83,15 @@ Zoom::get_param(const String &param)const
 
        EXPORT_NAME();
        EXPORT_VERSION();
-               
-       return ValueBase();     
+
+       return ValueBase();
 }
 
 Layer::Vocab
 Zoom::get_param_vocab()const
 {
        Layer::Vocab ret;
-       
+
        ret.push_back(ParamDesc("amount")
                .set_local_name(_("Amount"))
                .set_description(_("Amount to zoom in"))
@@ -100,12 +101,12 @@ Zoom::get_param_vocab()const
                .set_local_name(_("Center"))
                .set_description(_("Point to zoom in to"))
        );
-       
+
        return ret;
 }
 
-sinfg::Layer::Handle
-Zoom::hit_check(sinfg::Context context, const sinfg::Point &pos)const
+synfig::Layer::Handle
+Zoom::hit_check(synfig::Context context, const synfig::Point &pos)const
 {
        return context.hit_check((pos-center)/exp(amount)+center);
 }
@@ -121,13 +122,13 @@ class Zoom_Trans : public Transform
        etl::handle<const Zoom> layer;
 public:
        Zoom_Trans(const Zoom* x):Transform(x->get_guid()),layer(x) { }
-       
-       sinfg::Vector perform(const sinfg::Vector& x)const
+
+       synfig::Vector perform(const synfig::Vector& x)const
        {
                return (x-layer->center)*exp(layer->amount)+layer->center;
        }
-       
-       sinfg::Vector unperform(const sinfg::Vector& x)const
+
+       synfig::Vector unperform(const synfig::Vector& x)const
        {
                return (x-layer->center)/exp(layer->amount)+layer->center;
        }
@@ -154,9 +155,8 @@ Zoom::accelerated_render(Context context,Surface *surface,int quality, const Ren
        return context.accelerated_render(surface,quality,desc,cb);
 }
 
-sinfg::Rect
-Zoom::get_full_bounding_rect(sinfg::Context context)const
+synfig::Rect
+Zoom::get_full_bounding_rect(synfig::Context context)const
 {
-       return context.get_full_bounding_rect();
+       return (context.get_full_bounding_rect()-center)*exp(amount)+center;
 }
-