From 119243777a963c973cfe5679dbbe29d272582830 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 27 Aug 2008 22:27:30 +0000 Subject: merged in relevant changes from the v0-40 pd-extended release branch svn path=/trunk/externals/pidip/; revision=10266 --- modules/pdp_aging.c~ | 0 modules/pdp_colorgrid.c | 12 +++++++++--- modules/pdp_qtext.c | 12 +++++++----- modules/pdp_text.c | 12 +++++++----- system/pidip.c | 2 +- 5 files changed, 24 insertions(+), 14 deletions(-) delete mode 100644 modules/pdp_aging.c~ diff --git a/modules/pdp_aging.c~ b/modules/pdp_aging.c~ deleted file mode 100644 index e69de29..0000000 diff --git a/modules/pdp_colorgrid.c b/modules/pdp_colorgrid.c index 8936b84..dffa66a 100644 --- a/modules/pdp_colorgrid.c +++ b/modules/pdp_colorgrid.c @@ -17,13 +17,19 @@ #include "g_canvas.h" #include "t_tk.h" -#ifdef NT +#ifdef _WIN32 #include #else #include #endif -#define COLORGRID_IMG "/usr/local/lib/pd/externs/pdp_colorgrid/pdp_colorgrid.pnm" +#ifdef __APPLE__ +# define COLORGRID_IMG "/Applications/Pd-extended.app/Contents/Resources/doc/examples/pidip/images/colorgrid.pnm" +#endif +#ifdef __gnu_linux__ +# define COLORGRID_IMG "/usr/lib/pd/doc/examples/pidip/images/colorgrid.pnm" +#endif + #define DEFAULT_COLORGRID_WIDTH 256 #define DEFAULT_COLORGRID_HEIGHT 50 #define DEFAULT_COLORGRID_NBLINES 10 @@ -132,7 +138,7 @@ static int pdp_colorgridcount=0; static int guidebug=0; static int pointsize = 5; -static char *pdp_colorgrid_version = "pdp_colorgrid: version 0.4, written by Yves Degoyon (ydegoyon@free.fr) & Lluis Gomez i Bigorda (lluis@artefacte.org)"; +static char *pdp_colorgrid_version = "pdp_colorgrid: version 0.4\nby Yves Degoyon (ydegoyon@free.fr) & Lluis Gomez i Bigorda (lluis@artefacte.org)"; #define COLORGRID_SYS_VGUI2(a,b) if (guidebug) \ post(a,b);\ diff --git a/modules/pdp_qtext.c b/modules/pdp_qtext.c index 1d76912..84cabec 100644 --- a/modules/pdp_qtext.c +++ b/modules/pdp_qtext.c @@ -658,7 +658,8 @@ static void pdp_qtext_font(t_pdp_qtext *x, t_symbol *sfont ) font = imlib_load_font(sfont->s_name); if ( !font ) { - post( "pdp_qtext : could not load font : >%s<", sfont->s_name ); + pd_error( x, "[%s] error: could not load font: '%s'", + class_getname(*(t_pd *)x), sfont->s_name ); return; } imlib_context_set_font( font ); @@ -670,8 +671,9 @@ static void pdp_qtext_allocate(t_pdp_qtext *x) x->x_image = imlib_create_image( x->x_vwidth, x->x_vheight ); if ( x->x_image == NULL ) { - post( "pdp_qtext : severe error : could not allocate image !!" ); - return; + pd_error( x, "[%s] error: could not allocate image!!", + class_getname(*(t_pd *)x) ); + return; } imlib_context_set_image(x->x_image); } @@ -1084,8 +1086,8 @@ void pdp_qtext_setup(void) font = imlib_load_font(DEFAULT_FONT); if ( !font ) { - post( "pdp_qtext : severe error : could not load default font : no rendering !!!" ); - post( "pdp_text : try installing Bitstream Vera (http://www.gnome.org/fonts/)" ); + error( "[pdp_qtext] error: could not load default font, no text rendering!" ); + post( "\tinstall Bitstream Vera, it's free! (http://www.gnome.org/fonts/)" ); } imlib_context_set_font( font ); } diff --git a/modules/pdp_text.c b/modules/pdp_text.c index 24b4c3e..7840e1c 100644 --- a/modules/pdp_text.c +++ b/modules/pdp_text.c @@ -380,7 +380,8 @@ static void pdp_text_font(t_pdp_text *x, t_symbol *sfont ) font = imlib_load_font(sfont->s_name); if ( !font ) { - post( "pdp_text : could not load font : >%s<", sfont->s_name ); + pd_error( x, "[%s] error: could not load font: '%s'", + class_getname(*(t_pd *)x), sfont->s_name ); return; } imlib_context_set_font( font ); @@ -392,8 +393,9 @@ static void pdp_text_allocate(t_pdp_text *x) x->x_image = imlib_create_image( x->x_vwidth, x->x_vheight ); if ( x->x_image == NULL ) { - post( "pdp_text : severe error : could not allocate image !!" ); - return; + pd_error( x, "[%s] error: could not allocate image!!", + class_getname(*(t_pd *)x) ); + return; } imlib_context_set_image(x->x_image); } @@ -647,8 +649,8 @@ void pdp_text_setup(void) font = imlib_load_font(DEFAULT_FONT); if ( !font ) { - post( "pdp_text : severe error : could not load default font : no rendering !!!" ); - post( "pdp_text : try installing Bitstream Vera (http://www.gnome.org/fonts/)" ); + error( "[pdp_text] error: could not load default font, no text rendering!" ); + post( "\tinstall Bitstream Vera, it's free! (http://www.gnome.org/fonts/)" ); } imlib_context_set_font( font ); } diff --git a/system/pidip.c b/system/pidip.c index 3e0479e..78dec9c 100644 --- a/system/pidip.c +++ b/system/pidip.c @@ -110,7 +110,7 @@ extern "C" /* library setup routine */ void pidip_setup(void){ - post ("PiDiP : additional video processing objects for PDP : version " PDP_PIDIP_VERSION " ( ydegoyon@free.fr )\n"); + post ("PiDiP : additional video processing objects for PDP\n\tversion " PDP_PIDIP_VERSION " ( ydegoyon@free.fr )"); pdp_intrusion_setup(); pdp_yqt_setup(); -- cgit v1.2.1