diff --git a/src/modules/Image/font.c b/src/modules/Image/font.c index bb8ae163124b8730670dce20a963163458f929dc..bab620811da26faa59be9c9423c8e05861fdc8c5 100644 --- a/src/modules/Image/font.c +++ b/src/modules/Image/font.c @@ -1,4 +1,4 @@ -/* $Id: font.c,v 1.50 1999/05/30 20:11:56 mirar Exp $ */ +/* $Id: font.c,v 1.51 1999/06/03 17:20:11 mirar Exp $ */ #include "global.h" #define SPACE_CHAR 'i' @@ -9,7 +9,7 @@ extern unsigned char * image_default_font; /* **! module Image **! note -**! $Id: font.c,v 1.50 1999/05/30 20:11:56 mirar Exp $ +**! $Id: font.c,v 1.51 1999/06/03 17:20:11 mirar Exp $ **! class Font **! **! note @@ -184,7 +184,7 @@ Kerningtable types: #include "dmalloc.h" -static struct program *font_program; +extern struct program *font_program; extern struct program *image_program; #undef THIS diff --git a/src/modules/Image/layers.c b/src/modules/Image/layers.c index 8de74f1cf8472641758fea4d9bcfee75b4aa47db..49942b5204d010bcf33a71f5d924f12343638295 100644 --- a/src/modules/Image/layers.c +++ b/src/modules/Image/layers.c @@ -1,7 +1,7 @@ /* **! module Image **! note -**! $Id: layers.c,v 1.14 1999/05/30 20:11:58 mirar Exp $ +**! $Id: layers.c,v 1.15 1999/06/03 17:20:13 mirar Exp $ **! class Layer */ @@ -9,7 +9,7 @@ #include <math.h> /* floor */ -RCSID("$Id: layers.c,v 1.14 1999/05/30 20:11:58 mirar Exp $"); +RCSID("$Id: layers.c,v 1.15 1999/06/03 17:20:13 mirar Exp $"); #include "image_machine.h" @@ -31,15 +31,13 @@ RCSID("$Id: layers.c,v 1.14 1999/05/30 20:11:58 mirar Exp $"); #include "image.h" extern struct program *image_program; -struct program *image_layer_program; +extern struct program *image_layer_program; +extern struct program *image_colortable_program; static struct mapping *colors=NULL; static struct object *colortable=NULL; static struct array *colornames=NULL; -struct program *image_layer_program=NULL; -extern struct program *image_colortable_program; - static const rgb_group black={0,0,0}; static const rgb_group white={COLORMAX,COLORMAX,COLORMAX};