Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-core / trunk / src / modules / mod_filter / halftone.h

diff --git a/synfig-core/trunk/src/modules/mod_filter/halftone.h b/synfig-core/trunk/src/modules/mod_filter/halftone.h
index 7b12db2..c75df2c 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_filter/halftone.h
+++ b/synfig-core/trunk/src/modules/mod_filter/halftone.h
@@ -1,33 +1,35 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file halftone.h
 **     \brief Template Header
 **
-**     $Id: halftone.h,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $
+**     $Id$
 **
 **     \legal
-**     Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2008 Chris Moore
 **
-**     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_HALFTONE_H
-#define __SINFG_HALFTONE_H
+#ifndef __SYNFIG_HALFTONE_H
+#define __SYNFIG_HALFTONE_H
 
 /* === H E A D E R S ======================================================= */
 
-#include <sinfg/vector.h>
-#include <sinfg/angle.h>
+#include <synfig/vector.h>
+#include <synfig/angle.h>
 
 /* === M A C R O S ========================================================= */
 
@@ -46,13 +48,13 @@ class Halftone
 public:
 
        int type;
-       sinfg::Point offset;
-       sinfg::Vector size;
-       sinfg::Angle angle;
+       synfig::Point origin;
+       synfig::Vector size;
+       synfig::Angle angle;
 
-       float mask(sinfg::Point point)const;
-       
-       float operator()(const sinfg::Point &point, const float& intensity, float supersample=0)const;
+       float mask(synfig::Point point)const;
+
+       float operator()(const synfig::Point &point, const float& intensity, float supersample=0)const;
 };
 
 /* === E N D =============================================================== */