Index: kit/CHANGELOG diff -u kit/CHANGELOG:1.9 kit/CHANGELOG:removed --- kit/CHANGELOG:1.9 Sat Sep 5 00:11:21 1998 +++ kit/CHANGELOG Mon Jun 26 05:10:04 2000 @@ -1,51 +0,0 @@ -CHANGELOG for magicpoint -$Id: CHANGELOG,v 1.9 1998/09/04 15:11:21 onoe Exp $ - -Fri Sep 5 1998 onoe@sm.sony.co.jp - * handle key inputs from invoked terminal as pressed on Xserver, - even if the Xserver is running on a remote host. - -Mon Aug 26 1998 itojun@iijlab.net - * new copyright. (BSDish copyright without clause 3) - -Mon Aug 25 1998 itojun@iijlab.net - * print.c: better x11/freetype/vflib -> postscript font mapping. - -Mon Aug 23 1998 kato@wide.ad.jp - * embedded image support (added mgpembed.pl and embed.c) - -Mon Aug 22 1998 itojun@iijlab.net - * added contrib/xmindpath, MindPath PocketPoint user-level driver. - -Fri Jul 10 11:57:59 JST 1998 itojun@iijlab.net - * cache gs-generated image file. - Suggested by: luigi@FreeBSD.org - -Mon Jul 6 11:38:32 JST 1998 itojun@iijlab.net - * capable of handling GB2312 and KSC5601 encoding. - they must be encoded by using iso-2022 like escape sequences. - EUC-cn or EUC-kr does not work. - * -x option is added. - -Thu Jul 2 18:04:16 JST 1998 itojun@iijlab.net - * eliminate gsview. - * revamp "xfont" directive. (see SYNTAX for detail) - -Thu Jun 25 13:10:28 JST 1998 itojun@iijlab.net - * print.c: color postscript support by "mgp2ps -c". - -changes between 1.02a and 1.03a: - * To allow color name that has space inbetween ("dark blue"), - color name after directives SHOULD come with doublequote. - Therefore, - %fore blue - should be - %fore "blue" - At this moment, doublequote can be ommitted for backward - compatibility. We may require to have doublequote in the future. - Font names and other string parameter obeys the same rule. - * %image is now capable of rendering encapsulated postscript files - (*.eps). - %image foo.eps - should work fine. - By using -X option, you can specify device name for ghostscript. Index: kit/configure diff -u kit/configure:1.77 kit/configure:1.78 --- kit/configure:1.77 Sun Mar 26 23:04:55 2000 +++ kit/configure Tue Jun 20 15:39:11 2000 @@ -1804,7 +1804,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 gif_ok=yes - LIBS="$LIBS -lungif" + GIFLIB="-lungif" cat >> confdefs.h <<\EOF #define USE_GIF 1 EOF @@ -1847,7 +1847,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 gif_ok=yes - LIBS="$LIBS -lgif" + GIFLIB="-lgif" cat >> confdefs.h <<\EOF #define USE_GIF 1 EOF @@ -1890,7 +1890,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 gif_ok=yes - LIBS="$LIBS -lungif" + GIFLIB="-lungif" cat >> confdefs.h <<\EOF #define USE_GIF 1 EOF @@ -1933,7 +1933,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 gif_ok=yes - LIBS="$LIBS -lgif" + GIFLIB="-lgif" cat >> confdefs.h <<\EOF #define USE_GIF 1 EOF @@ -2624,6 +2624,10 @@ done + +if test -n "$GIFLIB"; then + LIBS="$LIBS $GIFLIB" +fi mgp_keywords=`$mgp_cv_path_perl $srcdir/keywords.pl $srcdir/globals.c` Index: kit/configure.in diff -u kit/configure.in:1.74 kit/configure.in:1.75 --- kit/configure.in:1.74 Sun Mar 26 23:04:57 2000 +++ kit/configure.in Tue Jun 20 15:39:13 2000 @@ -3,7 +3,7 @@ dnl independent (using srcdir), however, xmkmf and Imake.tmpl do not dnl allow us to switch compilation directory. dnl -dnl $Id: configure.in,v 1.74 2000/03/26 14:04:57 itojun Exp $ +dnl $Id: configure.in,v 1.75 2000/06/20 06:39:13 nishida Exp $ AC_INIT(image/imagetypes.c) dnl Checks for programs. @@ -256,19 +256,19 @@ if test $mgp_gif = "yes"; then AC_CHECK_LIB(ungif, DGifOpenFileHandle, [gif_ok=yes - LIBS="$LIBS -lungif" + GIFLIB="-lungif" AC_DEFINE(USE_GIF)], [AC_CHECK_LIB(gif, DGifOpenFileHandle, [gif_ok=yes - LIBS="$LIBS -lgif" + GIFLIB="-lgif" AC_DEFINE(USE_GIF)], [AC_CHECK_LIB(ungif, DGifOpenFileName, [gif_ok=yes - LIBS="$LIBS -lungif" + GIFLIB="-lungif" AC_DEFINE(USE_GIF)], [AC_CHECK_LIB(gif, DGifOpenFilename, [gif_ok=yes - LIBS="$LIBS -lgif" + GIFLIB="-lgif" AC_DEFINE(USE_GIF)], [], [-L$x_libraries -lX11])], [-L$x_libraries -lX11])])]) if test "x$gif_ok" != "xyes"; then @@ -306,6 +306,11 @@ AC_TYPE_SIGNAL AC_CHECK_FUNCS(poll strstr _setbufend) AC_REPLACE_FUNCS(usleep strsep strdup mkstemp snprintf memcmp) + +dnl add GIFLIB to LIBS +if test -n "$GIFLIB"; then + LIBS="$LIBS $GIFLIB" +fi dnl keyword substitution. mgp_keywords=`$mgp_cv_path_perl $srcdir/keywords.pl $srcdir/globals.c` Index: kit/ctlwords.pl diff -u kit/ctlwords.pl:1.2 kit/ctlwords.pl:removed --- kit/ctlwords.pl:1.2 Sat Sep 5 06:05:08 1998 +++ kit/ctlwords.pl Mon Jun 26 05:10:08 2000 @@ -1,12 +0,0 @@ -#! /usr/bin/perl -$counter = 0; # 0 origin -print "/* generated by ctlwords.awk. do not edit by hand. */\n"; - -while (<>) { - next if (!/^\/\*CTL\*\//); - next if ($_ !~ /(CTL_[A-Z0-9]+)/); - - $word = $1; - print "#define $word\t$counter\n"; - $counter++; -} Index: kit/image/gif.h diff -u kit/image/gif.h:1.2 kit/image/gif.h:removed --- kit/image/gif.h:1.2 Mon Dec 28 17:23:03 1998 +++ kit/image/gif.h Mon Jun 26 05:10:12 2000 @@ -1,72 +0,0 @@ -/* gif.h: - * - * gifin.h - * kirk johnson - * november 1989 - * external interface to gifin.c - * - * Copyright 1989 Kirk L. Johnson (see the included file - * "kljcpyrght.h" for complete copyright information) - */ - -/* - * gifin return codes - */ -#define GIFIN_SUCCESS 0 /* success */ -#define GIFIN_DONE 1 /* no more images */ - -#define GIFIN_ERR_BAD_SD -1 /* bad screen descriptor */ -#define GIFIN_ERR_BAD_SEP -2 /* bad image separator */ -#define GIFIN_ERR_BAD_SIG -3 /* bad signature */ -#define GIFIN_ERR_EOD -4 /* unexpected end of raster data */ -#define GIFIN_ERR_EOF -5 /* unexpected end of input stream */ -#define GIFIN_ERR_FAO -6 /* file already open */ -#define GIFIN_ERR_IAO -7 /* image already open */ -#define GIFIN_ERR_NFO -8 /* no file open */ -#define GIFIN_ERR_NIO -9 /* no image open */ - -/* - * colormap indices - */ - -#define GIF_RED 0 -#define GIF_GRN 1 -#define GIF_BLU 2 - -/* - * typedef BYTE for convenience - */ - -typedef unsigned char BYTE; - -static int gifin_open_file(); -static int gifin_open_image(); -static int gifin_get_pixel(); -#if 0 -static int gifin_close_image(); -#endif -static int gifin_close_file(); -static int gifin_load_cmap(); -static int gifin_skip_extension(); -static int gifin_read_data_block(); -static int gifin_push_string(); -static void gifin_add_string(); -static void gifin_fatal(); - -/* #defines, typedefs, and such - */ - -#define GIF_SIG "GIF87a" -#define GIF_SIG_89 "GIF89a" -#define GIF_SIG_LEN 6 /* GIF signature length */ -#define GIF_SD_SIZE 7 /* GIF screen descriptor size */ -#define GIF_ID_SIZE 9 /* GIF image descriptor size */ - -#define GIF_SEPARATOR ',' /* GIF image separator */ -#define GIF_EXTENSION '!' /* GIF extension block marker */ -#define GIF_TERMINATOR ';' /* GIF terminator */ - -#define STAB_SIZE 4096 /* string table size */ -#define PSTK_SIZE 4096 /* pixel stack size */ - -#define NULL_CODE -1 /* string table null code */ Index: kit/sample/cloud.gif Index: kit/sample/dad.gif Index: kit/sample/mgp-old1.gif Index: kit/sample/mgp-old2.gif Index: kit/sample/mgp-old3.gif Index: kit/sample/mgp1.gif Index: kit/sample/mgp2.gif Index: kit/sample/mgp3.gif Index: kit/sample/v6header.gif .