X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fblur.h;h=5d1c8011d480f9d39543b5f79101f3bda1340964;hb=d15c4522466bedfbe61620c401becae0931854f5;hp=e8c9dbdae9e6a0714fc2663588e8bf31e91cf44d;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/blur.h b/synfig-core/trunk/src/synfig/blur.h
index e8c9dbd..5d1c801 100644
--- a/synfig-core/trunk/src/synfig/blur.h
+++ b/synfig-core/trunk/src/synfig/blur.h
@@ -1,41 +1,44 @@
-/* === S I N F G =========================================================== */
-/*!	\file blur.h
+/* === S Y N F I G ========================================================= */
+/*!	\file synfig/blur.h
 **	\brief Blur Helper Header file
 **
-**	$Id: blur.h,v 1.1.1.1 2005/01/04 01:23:14 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
 */
 /* ========================================================================= */
 
 /* === S T A R T =========================================================== */
 
-#ifndef __SINFG_BLUR_HELPER_H
-#define __SINFG_BLUR_HELPER_H
+#ifndef __SYNFIG_BLUR_HELPER_H
+#define __SYNFIG_BLUR_HELPER_H
 
 /* === H E A D E R S ======================================================= */
-#include <sinfg/surface.h>
-#include <sinfg/color.h>
-#include <sinfg/vector.h>
+#include <synfig/surface.h>
+#include <synfig/color.h>
+#include <synfig/vector.h>
 
 /* === 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 ======================================= */
-class sinfg::ProgressCallback;
-	
+namespace synfig {
+	class ProgressCallback;
+}
+
 class Blur
 {
 public:
@@ -46,40 +49,40 @@ public:
 		CROSS			=2,
 		GAUSSIAN		=3,
 		DISC			=4,
-		
+
 		FORCE_DWORD = 0x8fffffff
 	};
 
 private:
-	sinfg::Point	size;
+	synfig::Point	size;
 	int				type;
 
-	sinfg::ProgressCallback *cb;
+	synfig::ProgressCallback *cb;
 
 public:
-	sinfg::Point & set_size(const sinfg::Point &v) { return (size = v); }
-	const sinfg::Point & get_size() const { return size; }
-	sinfg::Point & get_size() { return size; }
-	
+	synfig::Point & set_size(const synfig::Point &v) { return (size = v); }
+	const synfig::Point & get_size() const { return size; }
+	synfig::Point & get_size() { return size; }
+
 	int & set_type(const int &t) { return (type = t); }
 	const int & get_type() const { return type; }
 	int & get_type() { return type; }
-	
+
 	Blur() {}
-	Blur(const sinfg::Point &s, int t, sinfg::ProgressCallback *callb=0):size(s), type(t), cb(callb) {}
-	Blur(sinfg::Real sx, sinfg::Real sy, int t, sinfg::ProgressCallback *callb = 0): size(sx,sy), type(t), cb(callb) {}
-	
+	Blur(const synfig::Point &s, int t, synfig::ProgressCallback *callb=0):size(s), type(t), cb(callb) {}
+	Blur(synfig::Real sx, synfig::Real sy, int t, synfig::ProgressCallback *callb = 0): size(sx,sy), type(t), cb(callb) {}
+
 	//Parametric Blur
-	sinfg::Point operator ()(const sinfg::Point &p) const;
-	sinfg::Point operator ()(sinfg::Real x, sinfg::Real y) const;
-	
+	synfig::Point operator()(const synfig::Point &p) const;
+	synfig::Point operator()(synfig::Real x, synfig::Real y) const;
+
 	//Surface based blur
 	//	input surface can be the same as output surface,
 	//	though both have to be the same size
-	bool operator ()(const sinfg::Surface &surface, const sinfg::Vector &resolution, sinfg::Surface &out) const;
-		
-	bool operator ()(const etl::surface<float> &surface, const sinfg::Vector &resolution, etl::surface<float> &out) const;
-	//bool operator ()(const etl::surface<unsigned char> &surface, const sinfg::Vector &resolution, etl::surface<unsigned char> &out) const;
+	bool operator()(const synfig::Surface &surface, const synfig::Vector &resolution, synfig::Surface &out) const;
+
+	bool operator()(const etl::surface<float> &surface, const synfig::Vector &resolution, etl::surface<float> &out) const;
+	//bool operator()(const etl::surface<unsigned char> &surface, const synfig::Vector &resolution, etl::surface<unsigned char> &out) const;
 };
 
 /* === E N D =============================================================== */