fix merge errors with master

[ardour.git] / libs / gtkmm2ext / utils.cc

diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc
index 1fec597fbaf562bf0aecde5c39f12a0b850dde89..0f04b8cfe7d72f3dc9c5ffb486ecfcbe672935b7 100644 (file)
--- a/libs/gtkmm2ext/utils.cc
+++ b/libs/gtkmm2ext/utils.cc
@@ -57,9 +57,9 @@ Gtkmm2ext::get_ink_pixel_size (Glib::RefPtr<Pango::Layout> layout,
 }
 
 void
-get_pixel_size (Glib::RefPtr<Pango::Layout> layout,
-                              int& width,
-                              int& height)
+Gtkmm2ext::get_pixel_size (Glib::RefPtr<Pango::Layout> layout,
+                          int& width,
+                          int& height)
 {
        layout->get_pixel_size (width, height);
 }
@@ -129,11 +129,11 @@ demultiply_alpha (guint8 src,
        return alpha ? ((guint (src) << 8) - src) / alpha : 0;
 }
 
-static void
-convert_bgra_to_rgba (guint8 const* src,
-                     guint8*       dst,
-                     int           width,
-                     int           height)
+void
+Gtkmm2ext::convert_bgra_to_rgba (guint8 const* src,
+                                guint8*       dst,
+                                int           width,
+                                int           height)
 {
        guint8 const* src_pixel = src;
        guint8*       dst_pixel = dst;