X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Flyr_freetype%2Flyr_freetype.h;h=0d87ab3e9d96b07dc039e55b5c98969b7b7d512c;hb=eb9fc9c8065742402bc8946b5c8624b892cc0bfc;hp=12783b13b745a4e3604b547914900717cf49b2b0;hpb=16b3beced25134bef064705568ecb893a6be4e79;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.h b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.h
index 12783b1..0d87ab3 100644
--- a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.h
+++ b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.h
@@ -1,18 +1,19 @@
 /*! ========================================================================
-** Sinfg
+** Synfig
 ** Template Header File
 ** $Id: lyr_freetype.h,v 1.3 2005/01/24 03:08:17 darco Exp $
 **
-** 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.
 **
 ** === N O T E S ===========================================================
 **
@@ -20,28 +21,50 @@
 
 /* === S T A R T =========================================================== */
 
-#ifndef __SINFG_LYR_FREETYPE_H
-#define __SINFG_LYR_FREETYPE_H
+#ifndef __SYNFIG_LYR_FREETYPE_H
+#define __SYNFIG_LYR_FREETYPE_H
 
 /* === H E A D E R S ======================================================= */
 
-#include <sinfg/layer_composite.h>
-#include <sinfg/vector.h>
-#include <sinfg/color.h>
-#include <sinfg/string.h>
+//#ifdef __APPLE__
+//#define USE_MAC_FT_FUNCS	(1)
+//#endif
+
+#include <synfig/layer_composite.h>
+#include <synfig/vector.h>
+#include <synfig/color.h>
+#include <synfig/string.h>
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
 #include <vector>
 
+#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/canvas.h>
+
+
+#include <ETL/misc>
+
+#ifdef USE_MAC_FT_FUNCS
+	#include <CoreServices/CoreServices.h>
+	#include FT_MAC_H
+#endif
+
 /* === M A C R O S ========================================================= */
 
 /* === T Y P E D E F S ===================================================== */
 
 /* === 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;
 
@@ -80,21 +103,21 @@ struct TextLine
 };
 
 
-class lyr_freetype : public sinfg::Layer_Composite, public sinfg::Layer_NoDeform
+class lyr_freetype : public synfig::Layer_Composite, public synfig::Layer_NoDeform
 {
-	SINFG_LAYER_MODULE_EXT
+	SYNFIG_LAYER_MODULE_EXT
 private:
 
 	FT_Face face;
-	sinfg::String font;
-	sinfg::String family;
-	sinfg::String text;
-	sinfg::Vector size;
-	sinfg::Vector orient;
-	sinfg::Color color;
-	sinfg::Point pos;
-	sinfg::Real compress;
-	sinfg::Real vcompress;
+	synfig::String font;
+	synfig::String family;
+	synfig::String text;
+	synfig::Vector size;
+	synfig::Vector orient;
+	synfig::Color color;
+	synfig::Point pos;
+	synfig::Real compress;
+	synfig::Real vcompress;
 
 	int style;
 	int weight;
@@ -107,15 +130,15 @@ private:
 
 	void sync();
 	
-	mutable sinfg::Mutex mutex;
+	mutable synfig::Mutex mutex;
 	
 public:
 	lyr_freetype();
 	virtual ~lyr_freetype();
 
-	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 Color get_color(Context context, const synfig::Point &pos)const;
 	virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const;
 	
 	virtual Vocab get_param_vocab()const;
@@ -123,12 +146,12 @@ public:
 	virtual bool set_version(const String &ver){if(ver=="0.1")old_version=true;return true;}
 	virtual void reset_version(){old_version=false;}
 
-	virtual sinfg::Rect get_bounding_rect()const;
+	virtual synfig::Rect get_bounding_rect()const;
 
 private:
-	void new_font(const sinfg::String &family, int style=0, int weight=400);
-	bool new_font_(const sinfg::String &family, int style=0, int weight=400);
-	bool new_face(const sinfg::String &newfont);
+	void new_font(const synfig::String &family, int style=0, int weight=400);
+	bool new_font_(const synfig::String &family, int style=0, int weight=400);
+	bool new_face(const synfig::String &newfont);
 };
 
 extern FT_Library ft_library;