From 15e40e7b2a414a3864848f8a83a3252c8965097d Mon Sep 17 00:00:00 2001
From: "Mirar (Pontus Hagland)" <pike@sort.mirar.org>
Date: Thu, 3 Jun 1999 19:20:13 +0200
Subject: [PATCH] removed some wierd definitions of program i thought was
exterminated
Rev: src/modules/Image/font.c:1.51
Rev: src/modules/Image/layers.c:1.15
---
src/modules/Image/font.c | 6 +++---
src/modules/Image/layers.c | 10 ++++------
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/modules/Image/font.c b/src/modules/Image/font.c
index bb8ae16312..bab620811d 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 8de74f1cf8..49942b5204 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};
--
GitLab