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

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

diff --git a/synfig-core/tags/stable/src/modules/lyr_freetype/lyr_freetype.h b/synfig-core/tags/stable/src/modules/lyr_freetype/lyr_freetype.h
index 36d88fa..81261bc 100644 (file)
--- a/synfig-core/tags/stable/src/modules/lyr_freetype/lyr_freetype.h
+++ b/synfig-core/tags/stable/src/modules/lyr_freetype/lyr_freetype.h
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!    \file lyr_freetype.h
-**     \brief Template Header
+**     \brief Header file for implementation of the "Text" layer
 **
 **     $Id$
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2007, 2008 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -106,7 +107,7 @@ struct TextLine
 };
 
 
-class lyr_freetype : public synfig::Layer_Composite, public synfig::Layer_NoDeform
+class Layer_Freetype : public synfig::Layer_Composite, public synfig::Layer_NoDeform
 {
        SYNFIG_LAYER_MODULE_EXT
 private:
@@ -118,7 +119,7 @@ private:
        synfig::Vector size;
        synfig::Vector orient;
        synfig::Color color;
-       synfig::Point pos;
+       synfig::Point origin;
        synfig::Real compress;
        synfig::Real vcompress;
 
@@ -133,11 +134,13 @@ private:
 
        void sync();
 
+       synfig::Color color_func(const synfig::Point &x, int quality=10, float supersample=0)const;
+
        mutable synfig::Mutex mutex;
 
 public:
-       lyr_freetype();
-       virtual ~lyr_freetype();
+       Layer_Freetype();
+       virtual ~Layer_Freetype();
 
        virtual bool set_param(const String & param, const synfig::ValueBase &value);
        virtual ValueBase get_param(const String & param)const;