smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 11:46:25 +01:00
Code Issues Projects Releases Wiki Activity

fixes to handle broken libart_lgpl 2.3.18+ headers

Browse source 
git-svn-id: svn://localhost/ardour2/trunk@1539 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2007-03-01 18:28:04 +00:00
parent c6d7221890
commit 07bf584673
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/canvas-imageframe.h
View file

@ -16,7 +16,11 @@
#include <libgnomecanvas/libgnomecanvas.h> #include <libgnomecanvas/libgnomecanvas.h>
#include <gtk/gtkenums.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_misc.h>
}
#include <libart_lgpl/art_pixbuf.h> #include <libart_lgpl/art_pixbuf.h>

4
gtk2_ardour/utils.cc
View file

@ -119,7 +119,7 @@ xpm2rgb (const char** xpm, uint32_t& w, uint32_t& h)
return 0; 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 // LOAD XPM COLORMAP LONG ENOUGH TO DO CONVERSION
for (t = 0; t < colors; ++t) { for (t = 0; t < colors; ++t) {
@ -162,7 +162,7 @@ xpm2rgba (const char** xpm, uint32_t& w, uint32_t& h)
return 0; 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 // LOAD XPM COLORMAP LONG ENOUGH TO DO CONVERSION