X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Fcanvas%2Futils.h;h=8137b2abf723a503143bc6aaa5947bcc792cf79d;hb=d2371a6a903e226466fa4bdba2c6cb0b7f390664;hp=a3210543a6080bc995d2663e1a9b17490c3eb25f;hpb=84f55440a3c6317dd2ab5d7e3d638016609e4d03;p=ardour.git

diff --git a/libs/canvas/canvas/utils.h b/libs/canvas/canvas/utils.h
index a3210543a6..8137b2abf7 100644
--- a/libs/canvas/canvas/utils.h
+++ b/libs/canvas/canvas/utils.h
@@ -17,18 +17,17 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "canvas/types.h"
-
-namespace ArdourCanvas {
+#ifndef __CANVAS_UTILS_H__
+#define __CANVAS_UTILS_H__
 
-	extern void color_to_hsv (Color color, double& h, double& s, double& v);
-	extern Color hsv_to_color (double h, double s, double v, double a);
+#include <cairomm/context.h>
 
-	extern void color_to_rgba (Color, double& r, double& g, double& b, double& a);
-	extern Color rgba_to_color (double r, double g, double b, double a);
+#include "canvas/visibility.h"
+#include "canvas/types.h"
 
-	extern void set_source_rgba (Cairo::RefPtr<Cairo::Context>, Color);
+namespace ArdourCanvas {
 
-	Distance distance_to_segment_squared (Duple const & p, Duple const & p1, Duple const & p2, double& t, Duple& at);
+	Distance LIBCANVAS_API distance_to_segment_squared (Duple const & p, Duple const & p1, Duple const & p2, double& t, Duple& at);
 }
 
+#endif // __CANVAS_UTILS_H__