initial commit of hand merging, plus getting "ancient" waf script to work correctly

1 files changed, 5 insertions, 5 deletions

diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc
index 4bc9113875..6b58a6f948 100644
--- a/libs/gtkmm2ext/utils.cc
+++ b/libs/gtkmm2ext/utils.cc
@@ -128,11 +128,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;