Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-studio / trunk / src / gtkmm / dock_info.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/dock_info.cpp b/synfig-studio/trunk/src/gtkmm/dock_info.cpp
index 5bd393e..42c8a82 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dock_info.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_info.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
@@ -34,11 +35,14 @@
 #include "workarea.h"
 
 #include <synfig/canvas.h>
+#include <synfig/color.h>              // for gamma_in()
 #include <synfig/context.h>
 
 #include <gtkmm/separator.h>
 #include <gtkmm/invisible.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -48,10 +52,6 @@ using namespace etl;
 using namespace synfig;
 
 /* === 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 ======================================================= */