From 07bf584673579d47dc6e80f86d6e53d354acda5b Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 1 Mar 2007 18:28:04 +0000
Subject: [PATCH] fixes to handle broken libart_lgpl 2.3.18+ headers

git-svn-id: svn://localhost/ardour2/trunk@1539 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/canvas-imageframe.h | 4 ++++
 gtk2_ardour/utils.cc            | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/gtk2_ardour/canvas-imageframe.h b/gtk2_ardour/canvas-imageframe.h
index 6c2e5ab8b6..48c981cb36 100644
--- a/gtk2_ardour/canvas-imageframe.h
+++ b/gtk2_ardour/canvas-imageframe.h
@@ -16,7 +16,11 @@
 
 #include <libgnomecanvas/libgnomecanvas.h>
 #include <gtk/gtkenums.h> 
+
+extern "C" {
+/* some versions of libart contain functions not inside an extern C block */
 #include <libart_lgpl/art_misc.h>
+}
 #include <libart_lgpl/art_pixbuf.h>
 
 
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index 1057773ae7..396940284b 100644
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -119,7 +119,7 @@ xpm2rgb (const char** xpm, uint32_t& w, uint32_t& h)
 		return 0;
 	}
 
-	savergb = rgb = (unsigned char*)art_alloc (h * w * 3);
+	savergb = rgb = (unsigned char*) malloc (h * w * 3);
 	
 	// LOAD XPM COLORMAP LONG ENOUGH TO DO CONVERSION
 	for (t = 0; t < colors; ++t) {
@@ -162,7 +162,7 @@ xpm2rgba (const char** xpm, uint32_t& w, uint32_t& h)
 		return 0;
 	}
 
-	savergb = rgb = (unsigned char*)art_alloc (h * w * 4);
+	savergb = rgb = (unsigned char*) malloc (h * w * 4);
 	
 	// LOAD XPM COLORMAP LONG ENOUGH TO DO CONVERSION