X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fcolor.h;h=c7b693d68b24e4a52a33b074552f327b2c6d48b7;hb=4c003ac49046e06b6d9a31b38707f921830ea41b;hp=849acd70093fa96c05b8baf9cf6bc450301c47b5;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/color.h b/synfig-core/trunk/src/synfig/color.h
index 849acd7..c7b693d 100644
--- a/synfig-core/trunk/src/synfig/color.h
+++ b/synfig-core/trunk/src/synfig/color.h
@@ -1,32 +1,33 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file color.h
 **	\brief Color Class Implementation
 **
 **	$Id: color.h,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
 **
 **	\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_COLOR_H
-#define __SINFG_COLOR_H
+#ifndef __SYNFIG_COLOR_H
+#define __SYNFIG_COLOR_H
 
 /* === H E A D E R S ======================================================= */
 
-#ifndef SINFG_NO_ANGLE
+#ifndef SYNFIG_NO_ANGLE
 # include "angle.h"
 #endif
 
@@ -58,7 +59,7 @@ extern "C" { int _isnan(double x); }
 
 #endif
 
-namespace sinfg {
+namespace synfig {
 
 #ifdef USE_HALF_TYPE
 typedef half ColorReal;
@@ -357,7 +358,7 @@ public:
 	static Color YUV(const float& y, const float& u, const float& v, const value_type& a=1)
 		{ return Color().set_yuv(y,u,v).set_a(a); }
 
-#ifndef SINFG_NO_ANGLE
+#ifndef SYNFIG_NO_ANGLE
 	//! Returns the hue of the chromanance
 	/*!	This is the angle of the U and V components.
 	**	\see set_hue() */
@@ -854,7 +855,7 @@ PixelFormat2Color(Color &color, const PixelFormat &pf,const unsigned char *out)
 
 
 
-}; // END of namespace sinfg
+}; // END of namespace synfig
 
 /* === E N D =============================================================== */