X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fsynfig%2Fcolor.h;h=fc5f680baa441ac6abb49e8db1bc0512411964b2;hb=2aa82e84160499903d3e7f85a7770ffe3d04ddb2;hp=e2499f7a1f6f37fbb25fe403aacef3ed9ed43726;hpb=d0f8d51a0f3c779fcd3795eba046e97ceb51f075;p=synfig.git diff --git a/synfig-core/src/synfig/color.h b/synfig-core/src/synfig/color.h index e2499f7..fc5f680 100644 --- a/synfig-core/src/synfig/color.h +++ b/synfig-core/src/synfig/color.h @@ -29,20 +29,16 @@ /* === H E A D E R S ======================================================= */ -//#include #include #include #include "gamma.h" #include +# include "angle.h" #ifdef USE_HALF_TYPE #include #endif -#ifndef SYNFIG_NO_ANGLE -# include "angle.h" -#endif - /* === M A C R O S ========================================================= */ #define use_colorspace_gamma() App::use_colorspace_gamma @@ -386,7 +382,6 @@ 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 SYNFIG_NO_ANGLE //! Returns the hue of the chromanance /*! This is the angle of the U and V components. ** \see set_hue() */ @@ -443,7 +438,6 @@ public: static Color YUV(const float& y, const float& s, const Angle& theta, const value_type& a=1) { return Color().set_yuv(y,s,theta).set_a(a); } -#endif //! Clamps a color so that its values are in range. Ignores attempting to visualize negative colors. Color clamped()const;