Fix 1671884: The origin of PasteCanvas layers wasn't being taken into account when...

[synfig.git] / synfig-core / trunk / src / synfig / color.h

diff --git a/synfig-core/trunk/src/synfig/color.h b/synfig-core/trunk/src/synfig/color.h
index 849acd7..2df724f 100644 (file)
--- a/synfig-core/trunk/src/synfig/color.h
+++ b/synfig-core/trunk/src/synfig/color.h
@@ -1,34 +1,32 @@
-/* === 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
-# include "angle.h"
-#endif
 
 //#include <cmath>
 #include <math.h>
@@ -40,9 +38,11 @@
 #include <OpenEXR/half.h>
 #endif
 
-/* === M A C R O S ========================================================= */
+#ifndef SYNFIG_NO_ANGLE
+# include "angle.h"
+#endif
 
-#ifndef isnan
+/* === M A C R O S ========================================================= */
 
 #ifdef WIN32
 #include <float.h>
@@ -52,13 +52,18 @@ extern "C" { int _isnan(double x); }
 #endif
 #endif
 
-#ifdef __APPLE__
-#define isnan __isnanf
+// For some reason isnan() isn't working on macosx any more.
+// This is a quick fix.
+#if defined(__APPLE__) && !defined(SYNFIG_ISNAN_FIX)
+#ifdef isnan
+#undef isnan
 #endif
-
+inline bool isnan(double x) { return x != x; }
+inline bool isnan(float x) { return x != x; }
+#define SYNFIG_ISNAN_FIX 1
 #endif
 
-namespace sinfg {
+namespace synfig {
 
 #ifdef USE_HALF_TYPE
 typedef half ColorReal;
@@ -357,7 +362,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 +859,7 @@ PixelFormat2Color(Color &color, const PixelFormat &pf,const unsigned char *out)
 
 
 
-}; // END of namespace sinfg
+}; // END of namespace synfig
 
 /* === E N D =============================================================== */