From ea0c704f2a4166c34a50db2184ad95e012e81c0a Mon Sep 17 00:00:00 2001
From: "Mirar (Pontus Hagland)" <pike@sort.mirar.org>
Date: Wed, 7 Jan 1998 02:11:27 +0100
Subject: [PATCH] adding Image.X - x encoding stuff
Rev: src/modules/Image/Makefile.in:1.10
Rev: src/modules/Image/encodings/Makefile.in:1.11
Rev: src/modules/Image/image.c:1.71
---
src/modules/Image/Makefile.in | 2 +-
src/modules/Image/encodings/Makefile.in | 8 +++++++-
src/modules/Image/image.c | 8 +++++---
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/modules/Image/Makefile.in b/src/modules/Image/Makefile.in
index 5de4a045a5..7aa03bc5a2 100644
--- a/src/modules/Image/Makefile.in
+++ b/src/modules/Image/Makefile.in
@@ -4,7 +4,7 @@ OBJS = image.o font.o togif.o matrix.o pnm.o blit.o \
pattern.o dct.o operator.o x.o colortable.o polyfill.o
MODNAME=image
MODULE_SUBDIRS=encodings
-MODULE_ARCHIVES=encodings/gif.a encodings/pnm.a
+MODULE_ARCHIVES=encodings/gif.a encodings/pnm.a encodings/png.a encodings/x.a
MODULE_LDFLAGS=@LDFLAGS@
@SET_MAKE@
diff --git a/src/modules/Image/encodings/Makefile.in b/src/modules/Image/encodings/Makefile.in
index 3a8b2e87a9..50528e782f 100644
--- a/src/modules/Image/encodings/Makefile.in
+++ b/src/modules/Image/encodings/Makefile.in
@@ -4,7 +4,8 @@ GIF_OBJS = gif.o gif_lzw.o png.o
JPEG_OBJS = jpeg.o
PNG_OBJS = png.o
PNM_OBJS = pnm.o
-OBJS=gif.a pnm.a png.a
+X_OBJS = x.o
+OBJS=gif.a pnm.a png.a x.a
@SET_MAKE@
@@ -23,6 +24,11 @@ gif.a : $(GIF_OBJS)
$(AR) cq gif.a $(GIF_OBJS)
$(RANLIB) gif.a
+x.a : $(X_OBJS)
+ rm -f x.a
+ $(AR) cq x.a $(X_OBJS)
+ $(RANLIB) x.a
+
png.a : $(PNG_OBJS)
rm -f png.a
$(AR) cq png.a $(PNG_OBJS)
diff --git a/src/modules/Image/image.c b/src/modules/Image/image.c
index 90e2898250..154cb7cb92 100644
--- a/src/modules/Image/image.c
+++ b/src/modules/Image/image.c
@@ -1,9 +1,9 @@
-/* $Id: image.c,v 1.70 1997/12/22 23:26:46 hubbe Exp $ */
+/* $Id: image.c,v 1.71 1998/01/07 01:11:26 mirar Exp $ */
/*
**! module Image
**! note
-**! $Id: image.c,v 1.70 1997/12/22 23:26:46 hubbe Exp $
+**! $Id: image.c,v 1.71 1998/01/07 01:11:26 mirar Exp $
**! class image
**!
**! The main object of the <ref>Image</ref> module, this object
@@ -82,7 +82,7 @@
#include "stralloc.h"
#include "global.h"
-RCSID("$Id: image.c,v 1.70 1997/12/22 23:26:46 hubbe Exp $");
+RCSID("$Id: image.c,v 1.71 1998/01/07 01:11:26 mirar Exp $");
#include "pike_macros.h"
#include "object.h"
#include "constants.h"
@@ -2981,6 +2981,7 @@ void pike_module_init(void)
init_image_gif();
init_image_pnm();
init_image_png();
+ init_image_x();
}
void pike_module_exit(void)
@@ -2996,6 +2997,7 @@ void pike_module_exit(void)
exit_image_gif();
exit_image_pnm();
exit_image_png();
+ exit_image_x();
}
--
GitLab