X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fwidget_coloredit.cpp;h=81ccf3a6d203bd21aff8bbb3eb1c71058ef84cc0;hb=c2813b4d63804cac9b4067146a9e6eca717cb3e4;hp=5d199763c58b8e3fb65b796acca7d36184d4fb31;hpb=4f5692dfae20bcf73a2229c98abd13485173c2e0;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp b/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp
index 5d19976..81ccf3a 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -39,6 +40,8 @@
 #include <gtkmm/notebook.h>
 #include <gtkmm/box.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -50,11 +53,6 @@ using namespace studio;
 
 /* === M A C R O S ========================================================= */
 
-#define use_colorspace_gamma()	App::use_colorspace_gamma
-#define colorspace_gamma()	(2.2f)
-#define gamma_in(x)		((x>=0)?pow((float)x,1.0f/colorspace_gamma()):-pow((float)-x,1.0f/colorspace_gamma()))
-#define gamma_out(x)	((x>=0)?pow((float)x,colorspace_gamma()):-pow((float)-x,colorspace_gamma()))
-
 /* === G L O B A L S ======================================================= */
 
 /* === P R O C E D U R E S ================================================= */
@@ -74,29 +72,29 @@ void
 ColorSlider::set_type(Type x) { type=x; queue_draw(); }
 
 void
-ColorSlider::set_color(Color x) { color_=x; queue_draw(); }
+ColorSlider::set_color(synfig::Color x) { color_=x; queue_draw(); }
 
 void
-ColorSlider::slider_color_TYPE_R(Color &color, float amount) { color.set_r(amount); }
+ColorSlider::slider_color_TYPE_R(synfig::Color &color, float amount) { color.set_r(amount); }
 void
-ColorSlider::slider_color_TYPE_G(Color &color, float amount) { color.set_g(amount); }
+ColorSlider::slider_color_TYPE_G(synfig::Color &color, float amount) { color.set_g(amount); }
 void
-ColorSlider::slider_color_TYPE_B(Color &color, float amount) { color.set_b(amount); }
+ColorSlider::slider_color_TYPE_B(synfig::Color &color, float amount) { color.set_b(amount); }
 void
-ColorSlider::slider_color_TYPE_Y(Color &color, float amount) { color.set_y(amount); }
+ColorSlider::slider_color_TYPE_Y(synfig::Color &color, float amount) { color.set_y(amount); }
 void
-ColorSlider::slider_color_TYPE_U(Color &color, float amount) { color.set_u(amount-0.5f); }
+ColorSlider::slider_color_TYPE_U(synfig::Color &color, float amount) { color.set_u(amount-0.5f); }
 void
-ColorSlider::slider_color_TYPE_V(Color &color, float amount) { color.set_v(amount-0.5f); }
+ColorSlider::slider_color_TYPE_V(synfig::Color &color, float amount) { color.set_v(amount-0.5f); }
 void
-ColorSlider::slider_color_TYPE_HUE(Color &color, float amount) { color.set_uv_angle(Angle::rot(amount)); }
+ColorSlider::slider_color_TYPE_HUE(synfig::Color &color, float amount) { color.set_uv_angle(Angle::rot(amount)); }
 void
-ColorSlider::slider_color_TYPE_SAT(Color &color, float amount) { color.set_s(amount*0.5f); }
+ColorSlider::slider_color_TYPE_SAT(synfig::Color &color, float amount) { color.set_s(amount*0.5f); }
 void
-ColorSlider::slider_color_TYPE_A(Color &color, float amount) { color.set_a(amount); }
+ColorSlider::slider_color_TYPE_A(synfig::Color &color, float amount) { color.set_a(amount); }
 
 void
-ColorSlider::adjust_color(Type type, Color &color, float amount)
+ColorSlider::adjust_color(Type type, synfig::Color &color, float amount)
 {
 	static const slider_color_func jump_table[int(TYPE_END)] =
 	{
@@ -114,7 +112,7 @@ ColorSlider::adjust_color(Type type, Color &color, float amount)
 }
 
 bool
-ColorSlider::redraw(GdkEventExpose*bleh)
+ColorSlider::redraw(GdkEventExpose */*bleh*/)
 {
 	Color color(color_);
 
@@ -158,61 +156,32 @@ ColorSlider::redraw(GdkEventExpose*bleh)
 	Glib::RefPtr<Gdk::GC> gc(Gdk::GC::create(get_window()));
 	const Color bg1(0.75, 0.75, 0.75);
 	const Color bg2(0.5, 0.5, 0.5);
-	Gdk::Color gdk_c;
 	int i;
 	for(i=width-1;i>=0;i--)
 	{
-		color_func(color,float(i)/float(width));
+		color_func(color,
+				   (use_colorspace_gamma() && type<TYPE_U)
+				   ? gamma_out(float(i)/float(width))
+				   :		  (float(i)/float(width)));
 		const Color c1(Color::blend(color,bg1,1.0).clamped());
 		const Color c2(Color::blend(color,bg2,1.0).clamped());
 		assert(c1.is_valid());
 		assert(c2.is_valid());
 
-		gushort r1;
-		gushort g1;
-		gushort b1;
-		gushort r2;
-		gushort g2;
-		gushort b2;
-
-		if(use_colorspace_gamma() && (type<TYPE_U))
-		{
-			r1=(256*App::gamma.r_F32_to_U8(gamma_out(c1.get_r())));
-			g1=(256*App::gamma.g_F32_to_U8(gamma_out(c1.get_g())));
-			b1=(256*App::gamma.b_F32_to_U8(gamma_out(c1.get_b())));
-			r2=(256*App::gamma.r_F32_to_U8(gamma_out(c2.get_r())));
-			g2=(256*App::gamma.g_F32_to_U8(gamma_out(c2.get_g())));
-			b2=(256*App::gamma.b_F32_to_U8(gamma_out(c2.get_b())));
-		}
-		else
-		{
-			r1=(256*App::gamma.r_F32_to_U8(c1.get_r()));
-			g1=(256*App::gamma.g_F32_to_U8(c1.get_g()));
-			b1=(256*App::gamma.b_F32_to_U8(c1.get_b()));
-			r2=(256*App::gamma.r_F32_to_U8(c2.get_r()));
-			g2=(256*App::gamma.g_F32_to_U8(c2.get_g()));
-			b2=(256*App::gamma.b_F32_to_U8(c2.get_b()));
-		}
-
-
 		if((i*2/height)&1)
 		{
-			gdk_c.set_rgb(r1,g1,b1);
-			gc->set_rgb_fg_color(gdk_c);
+			gc->set_rgb_fg_color(colorconv_synfig2gdk(c1));
 			get_window()->draw_rectangle(gc, true, ca.get_x()+i, ca.get_y(), 1, height/2);
 
-			gdk_c.set_rgb(r2,g2,b2);
-			gc->set_rgb_fg_color(gdk_c);
+			gc->set_rgb_fg_color(colorconv_synfig2gdk(c2));
 			get_window()->draw_rectangle(gc, true, ca.get_x()+i, ca.get_y()+height/2, 1, height/2);
 		}
 		else
 		{
-			gdk_c.set_rgb(r2,g2,b2);
-			gc->set_rgb_fg_color(gdk_c);
+			gc->set_rgb_fg_color(colorconv_synfig2gdk(c2));
 			get_window()->draw_rectangle(gc, true, ca.get_x()+i, ca.get_y(), 1, height/2);
 
-			gdk_c.set_rgb(r1,g1,b1);
-			gc->set_rgb_fg_color(gdk_c);
+			gc->set_rgb_fg_color(colorconv_synfig2gdk(c1));
 			get_window()->draw_rectangle(gc, true, ca.get_x()+i, ca.get_y()+height/2, 1, height/2);
 		}
 	}
@@ -525,14 +494,12 @@ Widget_ColorEdit::get_value_raw()
 		color.set_r(gamma_out(R_adjustment.get_value()/100.0f));
 		color.set_g(gamma_out(G_adjustment.get_value()/100.0f));
 		color.set_b(gamma_out(B_adjustment.get_value()/100.0f));
-		assert(color.is_valid());
 	}
 	else
 	{
 		color.set_r(R_adjustment.get_value()/100);
 		color.set_g(G_adjustment.get_value()/100);
 		color.set_b(B_adjustment.get_value()/100);
-		assert(color.is_valid());
 	}
 	color.set_a(A_adjustment.get_value()/100);
 	assert(color.is_valid());