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 Aug 30 05:10:03 1999 @@ -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.61 kit/configure:1.62 --- kit/configure:1.61 Wed Jun 9 05:00:39 1999 +++ kit/configure Sat Aug 28 04:02:48 1999 @@ -14,6 +14,8 @@ ac_help="$ac_help --enable-debug compile debugging information in." ac_help="$ac_help + --enable-gif compile gif support in." +ac_help="$ac_help --enable-locale perform setlocale() on invocation." ac_help="$ac_help --disable-freetype DON'T use freetype routines." @@ -537,7 +539,7 @@ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:541: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:543: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -589,7 +591,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:593: checking host system type" >&5 +echo "configure:595: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -614,7 +616,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:618: checking for $ac_word" >&5 +echo "configure:620: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -648,7 +650,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:652: checking for $ac_word" >&5 +echo "configure:654: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -681,7 +683,7 @@ # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:685: checking for $ac_word" >&5 +echo "configure:687: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -715,7 +717,7 @@ *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:719: checking for yywrap in -l$ac_lib" >&5 +echo "configure:721: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -723,7 +725,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -761,7 +763,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:765: checking for $ac_word" >&5 +echo "configure:767: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_mgp_cv_path_perl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -803,7 +805,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:807: checking for $ac_word" >&5 +echo "configure:809: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_mgp_cv_path_uuencode'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -845,7 +847,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:849: checking for $ac_word" >&5 +echo "configure:851: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_mgp_cv_path_gzip'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -887,7 +889,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:891: checking for $ac_word" >&5 +echo "configure:893: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_mgp_cv_path_uudecode'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -928,7 +930,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:932: checking for $ac_word" >&5 +echo "configure:934: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_mgp_cv_path_gunzip'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -979,7 +981,7 @@ OPTFLAGS="$OPTFLAGS -DGUNZIP=\\\"$mgp_cv_path_gunzip\\\"" echo $ac_n "checking if --enable-debug option specified""... $ac_c" 1>&6 -echo "configure:983: checking if --enable-debug option specified" >&5 +echo "configure:985: checking if --enable-debug option specified" >&5 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then enableval="$enable_debug" @@ -990,8 +992,23 @@ echo "$ac_t""$mgp_debug" 1>&6 +echo $ac_n "checking if --enable-gif option specified""... $ac_c" 1>&6 +echo "configure:997: checking if --enable-gif option specified" >&5 +# Check whether --enable-gif or --disable-gif was given. +if test "${enable_gif+set}" = set; then + enableval="$enable_gif" + mgp_gif="yes"; cat >> confdefs.h <<\EOF +#define USE_GIF 1 +EOF + +else + mgp_gif="no" +fi + +echo "$ac_t""$mgp_gif" 1>&6 + echo $ac_n "checking if --enable-locale option specified""... $ac_c" 1>&6 -echo "configure:995: checking if --enable-locale option specified" >&5 +echo "configure:1012: checking if --enable-locale option specified" >&5 # Check whether --enable-locale or --disable-locale was given. if test "${enable_locale+set}" = set; then enableval="$enable_locale" @@ -1005,7 +1022,7 @@ LIBS="-lm $LIBS" echo $ac_n "checking if --disable-freetype option specified""... $ac_c" 1>&6 -echo "configure:1009: checking if --disable-freetype option specified" >&5 +echo "configure:1026: checking if --disable-freetype option specified" >&5 # Check whether --enable-freetype or --disable-freetype was given. if test "${enable_freetype+set}" = set; then enableval="$enable_freetype" @@ -1018,7 +1035,7 @@ if test "$mgp_use_freetype" = "yes"; then echo $ac_n "checking for freetype library/header""... $ac_c" 1>&6 -echo "configure:1022: checking for freetype library/header" >&5 +echo "configure:1039: checking for freetype library/header" >&5 for dir in /usr/local/freetype /usr/local /opt/freetype /usr/pkg /usr; do ac_cv_ft_lib=no ac_cv_ft_include=no @@ -1054,7 +1071,7 @@ OPTFLAGS="-I$ac_cv_ft_include $OPTFLAGS" DEPLIBS="$ac_cv_ft_lib/$ac_cv_ft_libpath $DEPLIBS" echo $ac_n "checking for TT_Init_FreeType in -lttf""... $ac_c" 1>&6 -echo "configure:1058: checking for TT_Init_FreeType in -lttf" >&5 +echo "configure:1075: checking for TT_Init_FreeType in -lttf" >&5 ac_lib_var=`echo ttf'_'TT_Init_FreeType | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1062,7 +1079,7 @@ ac_save_LIBS="$LIBS" LIBS="-lttf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1103,14 +1120,14 @@ fi cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:1114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -1125,16 +1142,16 @@ EOF echo $ac_n "checking for num_CharMaps field in TT_Face_Properties""... $ac_c" 1>&6 -echo "configure:1129: checking for num_CharMaps field in TT_Face_Properties" >&5 +echo "configure:1146: checking for num_CharMaps field in TT_Face_Properties" >&5 cat > conftest.$ac_ext < int main() { TT_Face_Properties x; return x.num_CharMaps; ; return 0; } EOF -if { (eval echo configure:1138: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* result=yes; cat >> confdefs.h <<\EOF #define HAVE_TT_FACE_PROPERTIES_CHARMAPS 1 @@ -1151,7 +1168,7 @@ fi echo $ac_n "checking if --disable-vflib option specified""... $ac_c" 1>&6 -echo "configure:1155: checking if --disable-vflib option specified" >&5 +echo "configure:1172: checking if --disable-vflib option specified" >&5 # Check whether --enable-vflib or --disable-vflib was given. if test "${enable_vflib+set}" = set; then enableval="$enable_vflib" @@ -1164,7 +1181,7 @@ if test "$mgp_use_vflib" = "yes"; then echo $ac_n "checking for VFlib library/header""... $ac_c" 1>&6 -echo "configure:1168: checking for VFlib library/header" >&5 +echo "configure:1185: checking for VFlib library/header" >&5 for dir in /usr/local/VFlib /usr/local/vflib /usr/local /usr/pkg; do ac_cv_vf_libname=VFlib ac_cv_vf_libdir=no @@ -1213,7 +1230,7 @@ OPTFLAGS="-I$ac_cv_vf_hdrdir $OPTFLAGS" DEPLIBS="$ac_cv_vf_libdir/$ac_cv_vf_libpath $DEPLIBS" echo $ac_n "checking for VF_Init in -l$ac_cv_vf_libname""... $ac_c" 1>&6 -echo "configure:1217: checking for VF_Init in -l$ac_cv_vf_libname" >&5 +echo "configure:1234: checking for VF_Init in -l$ac_cv_vf_libname" >&5 ac_lib_var=`echo $ac_cv_vf_libname'_'VF_Init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1221,7 +1238,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$ac_cv_vf_libname $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1255,14 +1272,14 @@ fi cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:1266: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -1278,7 +1295,7 @@ echo $ac_n "checking for VFlib configuration file""... $ac_c" 1>&6 -echo "configure:1282: checking for VFlib configuration file" >&5 +echo "configure:1299: checking for VFlib configuration file" >&5 # Check whether --with-vfontcap or --without-vfontcap was given. if test "${with_vfontcap+set}" = set; then withval="$with_vfontcap" @@ -1316,7 +1333,7 @@ if test "$mgp_use_freetype" = "yes"; then echo $ac_n "checking if --enable-freetype-charset16 option specified""... $ac_c" 1>&6 -echo "configure:1320: checking if --enable-freetype-charset16 option specified" >&5 +echo "configure:1337: checking if --enable-freetype-charset16 option specified" >&5 # Check whether --enable-freetype-charset16 or --disable-freetype-charset16 was given. if test "${enable_freetype_charset16+set}" = set; then enableval="$enable_freetype_charset16" @@ -1336,7 +1353,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1340: checking how to run the C preprocessor" >&5 +echo "configure:1357: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1351,13 +1368,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1361: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1378: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1368,13 +1385,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1378: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1385,13 +1402,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1412: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1420,7 +1437,7 @@ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:1424: checking for X" >&5 +echo "configure:1441: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1482,12 +1499,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1491: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1508: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1556,14 +1573,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -1650,12 +1667,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1654: checking for ANSI C header files" >&5 +echo "configure:1671: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1663,7 +1680,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1667: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1684: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1680,7 +1697,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1698,7 +1715,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1719,7 +1736,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1730,7 +1747,7 @@ exit (0); } EOF -if { (eval echo configure:1734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1754,12 +1771,12 @@ fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:1758: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:1775: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1775,7 +1792,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:1779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -1799,17 +1816,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1803: checking for $ac_hdr" >&5 +echo "configure:1820: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1813: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1830: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1837,12 +1854,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1841: checking for working const" >&5 +echo "configure:1858: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1912: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1912,21 +1929,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1916: checking for inline" >&5 +echo "configure:1933: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1947: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1952,12 +1969,12 @@ esac echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:1956: checking for pid_t" >&5 +echo "configure:1973: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1985,12 +2002,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1989: checking for size_t" >&5 +echo "configure:2006: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2018,12 +2035,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2022: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:2039: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2032,7 +2049,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2036: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2053: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2053,12 +2070,12 @@ fi echo $ac_n "checking for u_int""... $ac_c" 1>&6 -echo "configure:2057: checking for u_int" >&5 +echo "configure:2074: checking for u_int" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2086,12 +2103,12 @@ fi echo $ac_n "checking for u_char""... $ac_c" 1>&6 -echo "configure:2090: checking for u_char" >&5 +echo "configure:2107: checking for u_char" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2120,7 +2137,7 @@ echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:2124: checking for 8-bit clean memcmp" >&5 +echo "configure:2141: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2128,7 +2145,7 @@ ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -2156,12 +2173,12 @@ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2160: checking return type of signal handlers" >&5 +echo "configure:2177: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2178,7 +2195,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:2182: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2199: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2199,12 +2216,12 @@ for ac_func in poll strstr _setbufend do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2203: checking for $ac_func" >&5 +echo "configure:2220: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2254,12 +2271,12 @@ for ac_func in usleep strsep strdup mkstemp snprintf memcmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2258: checking for $ac_func" >&5 +echo "configure:2275: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else Index: kit/configure.in diff -u kit/configure.in:1.58 kit/configure.in:1.59 --- kit/configure.in:1.58 Wed Jun 9 05:00:41 1999 +++ kit/configure.in Sat Aug 28 04:02:50 1999 @@ -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.58 1999/06/08 20:00:41 itojun Exp $ +dnl $Id: configure.in,v 1.59 1999/08/27 19:02:50 itojun Exp $ AC_INIT(image/imagetypes.c) dnl Checks for programs. @@ -44,6 +44,14 @@ [mgp_debug="yes"; OPTFLAGS="$OPTFLAGS -g -DDEBUG -Wall"], [mgp_debug="no"]) AC_MSG_RESULT($mgp_debug) + +dnl Checks for gif support. +AC_MSG_CHECKING(if --enable-gif option specified) +AC_ARG_ENABLE(gif, + [ --enable-gif compile gif support in.], + [mgp_gif="yes"; AC_DEFINE(USE_GIF)], + [mgp_gif="no"]) +AC_MSG_RESULT($mgp_gif) dnl Checks for locale option. AC_MSG_CHECKING(if --enable-locale option specified) 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 Aug 30 05:10:08 1999 @@ -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/mgp.c diff -u kit/mgp.c:1.104 kit/mgp.c:1.105 --- kit/mgp.c:1.104 Wed Jul 28 12:44:52 1999 +++ kit/mgp.c Sat Aug 28 03:46:21 1999 @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ /* - * $Id: mgp.c,v 1.104 1999/07/28 03:44:52 kazu Exp $ + * $Id: mgp.c,v 1.105 1999/08/27 18:46:21 itojun Exp $ */ static char *mgp_version = "1.06a (990728)"; @@ -456,19 +456,17 @@ draw_page(&state, NULL); /* - * dump out gif image + * dump out jpg image */ fprintf(stderr, "(full image)"); sprintf(buf, "xwintoppm -silent -name MagicPoint | " - "ppmquant 256 %s | " - "ppmtogif %s > %s/mgp%05d.gif", - childdebug, childdebug, dumpdir, page); + "cjpeg %s > %s/mgp%05d.jpg", + childdebug, dumpdir, page); system(buf); /*XXX security hole*/ fprintf(stderr, "(thumbnail)"); - sprintf(buf, "giftopnm %s/mgp%05d.gif | " - "pnmscale 0.25 | ppmquant 256 %s | " - "ppmtogif %s > %s/mgp%05d.idx.gif", - dumpdir, page, childdebug, childdebug, + sprintf(buf, "djpeg %s/mgp%05d.jpg | " + "pnmscale 0.25 | cjpeg %s > %s/mgp%05d.idx.jpg", + dumpdir, page, childdebug, dumpdir, page); system(buf); /*XXX security hole*/ @@ -504,11 +502,11 @@ fprintf(html, "
Page %d: %s
\n", page, page_title(page)); fprintf(html, "
\n"); if (window_width < 0 || window_height < 0) { - fprintf(html, "\n", page, page); } else { - fprintf(html, "\"Page
\n", page, window_width, window_height, page); @@ -569,12 +567,12 @@ for (page = start_page; page <= maxpage; page++) { if (window_width < 0 || window_height < 0) { fprintf(html, "" - "\n", page, page, page); } else { fprintf(html, "" - "\n", page, page, window_width / 4, @@ -991,7 +989,7 @@ number = number * 10 + key - XK_0; break; - case XK_c: + case XK_c: if (verbose) if (mgp_flag & FL_FRDCACHE) printf("turn off forward cache\n"); @@ -999,7 +997,7 @@ printf("turn on forward cache\n"); mgp_flag ^= FL_FRDCACHE; - break; + break; case XK_a: XCopyArea(display, cachewin, window, gc_cache, Index: kit/mgp.man diff -u kit/mgp.man:1.55 kit/mgp.man:1.56 --- kit/mgp.man:1.55 Thu Jun 17 14:21:26 1999 +++ kit/mgp.man Sat Aug 28 03:48:34 1999 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: mgp.man,v 1.55 1999/06/17 05:21:26 kazu Exp $ +.\" $Id: mgp.man,v 1.56 1999/08/27 18:48:34 itojun Exp $ .\" .Dd November 1997 .Dt MGP 1 @@ -171,14 +171,16 @@ .Xr xwintoppm 1 (included in mgp kit), and -.Xr ppmquant 1 , .Xr pnmscale 1 , -.Xr giftopnm 1 , +.Xr cjpeg 1 , and -.Xr ppmtogif 1 +.Xr djpeg 1 .Po included in .Li netpbm +and +Independent Jpeg Group +.Li jpeg package .Pc . .It Fl F Ar mode,effect,value Index: kit/image/Imakefile.in diff -u kit/image/Imakefile.in:1.6 kit/image/Imakefile.in:1.7 --- kit/image/Imakefile.in:1.6 Thu May 27 12:22:58 1999 +++ kit/image/Imakefile.in Sat Aug 28 04:02:54 1999 @@ -17,6 +17,8 @@ AllTarget($(TARGET)) DependTarget() SpecialObjectRule(window.o,window.c,$(DEFS)) +SpecialObjectRule(gif.o,gif.c,$(DEFS)) +SpecialObjectRule(imagetypes.o,imagetypes.c,$(DEFS)) #ifndef NullParameter #define NullParameter Index: kit/image/gif.c diff -u kit/image/gif.c:1.4 kit/image/gif.c:1.5 --- kit/image/gif.c:1.4 Mon Dec 28 17:23:01 1998 +++ kit/image/gif.c Sat Aug 28 04:02:55 1999 @@ -17,6 +17,8 @@ #include "gif.h" #include "kljcpyrght.h" +#ifdef USE_GIF + /**** ** ** local #defines @@ -629,3 +631,5 @@ zclose(zf); return(ret); } + +#endif /*USE_GIF*/ Index: kit/image/imagetypes.c diff -u kit/image/imagetypes.c:1.4 kit/image/imagetypes.c:1.5 --- kit/image/imagetypes.c:1.4 Mon Dec 28 17:23:06 1998 +++ kit/image/imagetypes.c Sat Aug 28 04:02:56 1999 @@ -13,6 +13,34 @@ #include "imagetypes.h" #include +/* some of these are order-dependent + */ + +static struct imagetypes { + int (*identifier)(); /* print out image info if this kind of image */ + Image *(*loader)(); /* load image if this kind of image */ + char *name; /* name of this image format */ +} ImageTypes[] = { + { fbmIdent, fbmLoad, "FBM Image" }, + { sunRasterIdent, sunRasterLoad, "Sun Rasterfile" }, + { cmuwmIdent, cmuwmLoad, "CMU WM Raster" }, + { pbmIdent, pbmLoad, "Portable Bit Map (PBM, PGM, PPM)" }, + { facesIdent, facesLoad, "Faces Project" }, +#ifdef USE_GIF + { gifIdent, gifLoad, "GIF Image" }, +#endif + { rleIdent, rleLoad, "Utah RLE Image" }, + { jpegIdent, jpegLoad, "JFIF-style JPEG Image" }, + { xwdIdent, xwdLoad, "X Window Dump" }, + { mcidasIdent, mcidasLoad, "McIDAS areafile" }, + { g3Ident, g3Load, "G3 FAX Image" }, + { pcxIdent, pcxLoad, "PC Paintbrush Image" }, + { imgIdent, imgLoad, "GEM Bit Image" }, + { macIdent, macLoad, "MacPaint Image" }, + { xpixmapIdent, xpixmapLoad, "X Pixmap" }, + { xbitmapIdent, xbitmapLoad, "X Bitmap" }, + { NULL, NULL, NULL } +}; /* SUPPRESS 560 */ extern int errno; Index: kit/image/imagetypes.h diff -u kit/image/imagetypes.h:1.2 kit/image/imagetypes.h:1.3 --- kit/image/imagetypes.h:1.2 Mon Dec 28 17:23:08 1998 +++ kit/image/imagetypes.h Sat Aug 28 04:02:58 1999 @@ -41,29 +41,3 @@ int mcidasIdent(); int jpegIdent(); -/* some of these are order-dependent - */ - -struct { - int (*identifier)(); /* print out image info if this kind of image */ - Image *(*loader)(); /* load image if this kind of image */ - char *name; /* name of this image format */ -} ImageTypes[] = { - { fbmIdent, fbmLoad, "FBM Image" }, - { sunRasterIdent, sunRasterLoad, "Sun Rasterfile" }, - { cmuwmIdent, cmuwmLoad, "CMU WM Raster" }, - { pbmIdent, pbmLoad, "Portable Bit Map (PBM, PGM, PPM)" }, - { facesIdent, facesLoad, "Faces Project" }, - { gifIdent, gifLoad, "GIF Image" }, - { rleIdent, rleLoad, "Utah RLE Image" }, - { jpegIdent, jpegLoad, "JFIF-style JPEG Image" }, - { xwdIdent, xwdLoad, "X Window Dump" }, - { mcidasIdent, mcidasLoad, "McIDAS areafile" }, - { g3Ident, g3Load, "G3 FAX Image" }, - { pcxIdent, pcxLoad, "PC Paintbrush Image" }, - { imgIdent, imgLoad, "GEM Bit Image" }, - { macIdent, macLoad, "MacPaint Image" }, - { xpixmapIdent, xpixmapLoad, "X Pixmap" }, - { xbitmapIdent, xbitmapLoad, "X Bitmap" }, - { NULL, NULL, NULL } -}; Index: kit/sample/cloud.gif Index: kit/sample/cloud.jpg Index: kit/sample/dad.gif Index: kit/sample/dad.jpg Index: kit/sample/embed-jp.mgp diff -u kit/sample/embed-jp.mgp:1.1 kit/sample/embed-jp.mgp:1.2 --- kit/sample/embed-jp.mgp:1.1 Fri Sep 4 21:13:23 1998 +++ kit/sample/embed-jp.mgp Sat Aug 28 04:09:34 1999 @@ -28,7 +28,7 @@ 埋め込みイメージ %center -%image "cloud.gif" +%image "cloud.jpg" %page Index: kit/sample/embed.mgp diff -u kit/sample/embed.mgp:1.3 kit/sample/embed.mgp:1.4 --- kit/sample/embed.mgp:1.3 Fri Sep 4 21:04:57 1998 +++ kit/sample/embed.mgp Sat Aug 28 04:09:36 1999 @@ -28,7 +28,7 @@ Embedded image %center -%image "cloud.gif" +%image "cloud.jpg" %page Index: kit/sample/mgp-old1.gif Index: kit/sample/mgp-old1.jpg Index: kit/sample/mgp-old2.gif Index: kit/sample/mgp-old2.jpg Index: kit/sample/mgp-old3.gif Index: kit/sample/mgp-old3.jpg Index: kit/sample/mgp1.gif Index: kit/sample/mgp1.jpg Index: kit/sample/mgp2.gif Index: kit/sample/mgp2.jpg Index: kit/sample/mgp3.gif Index: kit/sample/mgp3.jpg Index: kit/sample/sample-fr.mgp diff -u kit/sample/sample-fr.mgp:1.4 kit/sample/sample-fr.mgp:1.5 --- kit/sample/sample-fr.mgp:1.4 Thu Jun 17 10:46:06 1999 +++ kit/sample/sample-fr.mgp Sat Aug 28 04:09:47 1999 @@ -137,7 +137,7 @@ Mettez une image %CENTER -%IMAGE "cloud.gif" +%IMAGE "cloud.jpg" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %PAGE Index: kit/sample/sample-jp.mgp diff -u kit/sample/sample-jp.mgp:1.27 kit/sample/sample-jp.mgp:1.28 --- kit/sample/sample-jp.mgp:1.27 Thu Jun 17 10:46:08 1999 +++ kit/sample/sample-jp.mgp Sat Aug 28 04:09:48 1999 @@ -153,7 +153,7 @@ イメージ・ファイルを表示できます %CENTER -%IMAGE "cloud.gif" +%IMAGE "cloud.jpg" これは草刈千晶さんの作品です。ありがとう。 @@ -170,7 +170,6 @@ CMU WM Raster Portable Bit Map (PBM, PGM, PPM) Faces Project - GIF Image Utah RLE Image JFIF-style JPEG Image X Window Dump @@ -187,13 +186,13 @@ 横を1.5倍、縦を1/3した場合 -%center, image "cloud.gif" 0 150 33 1 +%center, image "cloud.jpg" 0 150 33 1 %leftfill 横を画面の幅の50%、縦を画面の幅の30%にした場合 -%center, image "cloud.gif" 0 50 30 0 +%center, image "cloud.jpg" 0 50 30 0 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %PAGE @@ -202,10 +201,10 @@ 256色→16色→4色→2色に減色した場合 -%left, image "cloud.gif" 256 40 40 1, cont -%image "cloud.gif" 16 40 40 1, cont -%image "cloud.gif" 4 40 40 1, cont -%image "cloud.gif" 2 40 40 1, cont +%left, image "cloud.jpg" 256 40 40 1, cont +%image "cloud.jpg" 16 40 40 1, cont +%image "cloud.jpg" 4 40 40 1, cont +%image "cloud.jpg" 2 40 40 1, cont %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %PAGE @@ -242,15 +241,15 @@ SPC を押して下さい %center, fore "white" -%mark, image "mgp-old1.gif" +%mark, image "mgp-old1.jpg" -%pause, again, mark, image "mgp-old2.gif" +%pause, again, mark, image "mgp-old2.jpg" -%again, mark, image "mgp-old3.gif" +%again, mark, image "mgp-old3.jpg" -%again, mark, image "mgp-old2.gif" +%again, mark, image "mgp-old2.jpg" -%again, mark, image "mgp-old1.gif" +%again, mark, image "mgp-old1.jpg" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %PAGE Index: kit/sample/sample.mgp diff -u kit/sample/sample.mgp:1.21 kit/sample/sample.mgp:1.22 --- kit/sample/sample.mgp:1.21 Wed Aug 18 12:18:28 1999 +++ kit/sample/sample.mgp Sat Aug 28 04:09:49 1999 @@ -130,7 +130,7 @@ Visualize inline images! %CENTER -%IMAGE "cloud.gif" +%IMAGE "cloud.jpg" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %PAGE Index: kit/sample/tutorial-jp.mgp diff -u kit/sample/tutorial-jp.mgp:1.6 kit/sample/tutorial-jp.mgp:1.7 --- kit/sample/tutorial-jp.mgp:1.6 Sun Jul 19 22:50:31 1998 +++ kit/sample/tutorial-jp.mgp Sat Aug 28 04:09:51 1999 @@ -7,7 +7,7 @@ よい子の -%image "mgp-old1.gif" 800x600 +%image "mgp-old1.jpg" 800x600 操作マニュアル Index: kit/sample/tutorial.mgp diff -u kit/sample/tutorial.mgp:1.3 kit/sample/tutorial.mgp:1.4 --- kit/sample/tutorial.mgp:1.3 Thu Jun 17 10:46:10 1999 +++ kit/sample/tutorial.mgp Sat Aug 28 04:09:52 1999 @@ -7,7 +7,7 @@ Operation Manual -%image "mgp-old1.gif" 800x600 +%image "mgp-old1.jpg" 800x600 for good boys and girls Index: kit/sample/v6-jp.mgp diff -u kit/sample/v6-jp.mgp:1.12 kit/sample/v6-jp.mgp:1.13 --- kit/sample/v6-jp.mgp:1.12 Fri Sep 4 20:26:10 1998 +++ kit/sample/v6-jp.mgp Sat Aug 28 04:09:53 1999 @@ -57,7 +57,7 @@ %center, size 2 %image "v6header.eps" 800x600 -%%image "v6header.gif" 800x600 +%%image "v6header.jpg" 800x600 %left アドレス長は 4 倍、ヘッダ長は 2 倍 @@ -71,7 +71,7 @@ %center, size 2 %image "dad.eps" 800x600 -%%image "dad.gif" 800x600 +%%image "dad.jpg" 800x600 %left 近隣要請を出す Index: kit/sample/v6.mgp diff -u kit/sample/v6.mgp:1.2 kit/sample/v6.mgp:1.3 --- kit/sample/v6.mgp:1.2 Sat Sep 5 02:36:16 1998 +++ kit/sample/v6.mgp Sat Aug 28 04:09:54 1999 @@ -57,7 +57,7 @@ %center, size 2 %image "v6header.eps" 800x600 -%%image "v6header.gif" 800x600 +%%image "v6header.jpg" 800x600 %left 4 times for address length, twice of header length @@ -71,7 +71,7 @@ %center, size 2 %image "dad.eps" 800x600 -%%image "dad.gif" 800x600 +%%image "dad.jpg" 800x600 %left Sending Neighbor Solicitation Message Index: kit/sample/v6header.gif Index: kit/sample/v6header.jpg