#! /bin/sh # # This is a shell script that converts tiff-v3.4beta034 to tiff-v3.4beta035 # TOP=. findBinary() { IFS=: for i in $PATH; do test -x $i/$1 && return done echo "Fatal error: this shell script requires $2." exit 1 } findBinary patch "Larry Wall's patch program" Patch() { echo "Patch $1:" patch -s $TOP/$1 } NewFile() { echo "New file $1" cat >$TOP/$1 } NewDir() { echo "New directory $1" mkdir "$TOP/$1" } RmDir() { echo "Remove directory $1" rm -rf $TOP/$1.orig mv $TOP/$1 $TOP/$1.orig } RmFile() { echo "Remove $1" rm -f $TOP/$1.orig mv $TOP/$1 $TOP/$1.orig } Patch Makefile.in<<'EOF-EOF-EOF' *** tiff-v3.4beta034/Makefile.in Tue May 21 12:01:23 1996 --- tiff-v3.4beta035/Makefile.in Mon Jun 10 15:24:57 1996 *************** *** 1,5 **** #! smake ! # $Header: /usr/people/sam/tiff/RCS/Makefile.in,v 1.54 1996/05/21 18:59:50 sam Exp $ # # @WARNING@ # --- 1,5 ---- #! smake ! # $Header: /usr/people/sam/tiff/RCS/Makefile.in,v 1.57 1996/06/10 22:24:41 sam Exp $ # # @WARNING@ # *************** *** 35,41 **** # DATE: @DATE@ # TARGET: @TARGET@ # CCOMPILER: @CCOMPILER@ - # CXXCOMPILER: @CXXCOMPILER@ # @SETMAKE@ SHELL = @SCRIPT_SH@ --- 35,40 ---- *************** *** 42,47 **** --- 41,47 ---- NULL = ECHO = echo GENDIST = ${TOOLROOT}/usr/sbin/gendist + INSTALL = @INSTALL@ all default: @if [ "@PORT@" = yes ]; then \ *************** *** 57,62 **** --- 57,67 ---- @${ECHO} "= "libtiff; cd libtiff; ${MAKE} install @${ECHO} "= "tools; cd tools; ${MAKE} install @${ECHO} "= "man; cd man; ${MAKE} install + @if [ "@HTML@" = yes ]; then \ + ${ECHO} "= "html; cd html; ${MAKE} install; \ + else \ + true; \ + fi clean: @if [ "@PORT@" = yes ]; then \ *************** *** 76,89 **** rm -f tools/Makefile rm -f man/Makefile rm -f port/Makefile port/install.sh # # The folllowing rule creates a binary distribution for IRIX. # product:: test -d dist || mkdir dist rm -f dist/rawidb ! SRC=`pwd` RAWIDB=`pwd`/dist/rawidb ${MAKE} install rm -f dist/idb sort -u +4 dist/rawidb > dist/idb ${GENDIST} -v -dist dist -idb dist/idb \ --- 81,102 ---- rm -f tools/Makefile rm -f man/Makefile rm -f port/Makefile port/install.sh + rm -f html/Makefile # # The folllowing rule creates a binary distribution for IRIX. # + installLink:: + if [ @DIR_LIB@ != /usr/lib ]; then \ + ${INSTALL} -idb tiff.sw.tools -F /usr/lib \ + -lns @DIR_LIB@/libtiff.@DSOSUF@ -O libtiff.@DSOSUF@; \ + else \ + true; \ + fi product:: test -d dist || mkdir dist rm -f dist/rawidb ! SRC=`pwd` RAWIDB=`pwd`/dist/rawidb ${MAKE} install installLink rm -f dist/idb sort -u +4 dist/rawidb > dist/idb ${GENDIST} -v -dist dist -idb dist/idb \ EOF-EOF-EOF Patch config.site<<'EOF-EOF-EOF' *** tiff-v3.4beta034/config.site Tue May 21 12:01:22 1996 --- tiff-v3.4beta035/config.site Mon Jun 10 15:24:57 1996 *************** *** 1,4 **** ! # $Header: /usr/people/sam/tiff/RCS/config.site,v 1.12 1996/02/22 18:16:44 sam Exp $ # # TIFF Software # --- 1,4 ---- ! # $Header: /usr/people/sam/tiff/RCS/config.site,v 1.13 1996/06/05 21:24:33 sam Exp $ # # TIFF Software # *************** *** 45,50 **** --- 45,51 ---- #ZIP="no" # yes|no configure Deflate support (see below) #LIBGL="auto" # yes|no|auto configure IRIS GL-based tools #LIBIMAGE="auto" # yes|no|auto configure SGI RGB image tools + #HTML="no" # yes|no install HTML documentation # # Directory parameters. *************** *** 53,58 **** --- 54,60 ---- #DIR_LIB="/usr/local/lib" # directory for libraries #DIR_INC="/usr/local/include" # directory for include files #DIR_MAN="/usr/local/man" # directory for manual pages + #DIR_HTML="/var/httpd/htdocs/tiff" # directory for HTML documentation # # Configuring supporting libraries. EOF-EOF-EOF Patch configure<<'EOF-EOF-EOF' *** tiff-v3.4beta034/configure Tue May 21 12:01:22 1996 --- tiff-v3.4beta035/configure Mon Jun 10 15:24:56 1996 *************** *** 1,5 **** #!/bin/sh ! # $Header: /usr/people/sam/tiff/RCS/configure,v 1.49 1996/05/21 18:30:05 sam Exp $ # # Tag Image File Format (TIFF) Software # --- 1,5 ---- #!/bin/sh ! # $Header: /usr/people/sam/tiff/RCS/configure,v 1.52 1996/06/10 20:48:14 sam Exp $ # # Tag Image File Format (TIFF) Software # *************** *** 47,52 **** --- 47,53 ---- DIR_BIN=/usr/local/bin # destination for applications DIR_LIB=/usr/local/lib # destination for library DIR_INC=/usr/local/include # destination for include files + DIR_HTML=/var/httpd/htdocs/tiff # destination for HTML files DIRS_LIBINC= # dirs to search for ancillary includes DIR_JPEGLIB= # dir for IJG -ljpeg DIR_GZLIB= # dir for zlib -lgz *************** *** 55,60 **** --- 56,62 ---- JPEG=no # configure JPEG support ZIP=no # configure ZIP/Deflate support PORT=auto # enable portability emulations + HTML=no # install HTML documentation LIBGL=auto # auto-enable build of SGI -lgl apps LIBIMAGE=auto # auto-enable build of SGI -limage apps MACHDEPLIBS=-lm # machine-dependent libraries for apps *************** *** 145,151 **** -target|--target) ac_prev=TARGET;; -target=*|--target=*) TARGET="$ac_optarg" ;; -version|--version) ! echo "This is TIFF configure $Revision: 1.49 $" exit 0 ;; -help|--help) usage; exit 0;; --- 147,153 ---- -target|--target) ac_prev=TARGET;; -target=*|--target=*) TARGET="$ac_optarg" ;; -version|--version) ! echo "This is TIFF configure $Revision: 1.52 $" exit 0 ;; -help|--help) usage; exit 0;; *************** *** 1081,1086 **** --- 1083,1089 ---- Note "" Note "Checking for Dynamic Shared Object (DSO) support." if [ "$DSO" = auto ]; then + DSO=no DSOSUF_VERSION= DSOLD='${LD}' TIFFLIBREF= *************** *** 1131,1136 **** --- 1134,1145 ---- DSO=NETBSD TIFFLIBREF='-L${DEPTH}/libtiff -ltiff' ;; + *-freebsd*) + DSOSUF=so.${DIST_MAJOR}.0 + LIBCOPTS='-fpic -fPIC' + DSO=FREEBSD + TIFFLIBREF='-L${DEPTH}/libtiff -ltiff' + ;; *-linux*) if [ -x /lib/libc.so.5 ]; then DSOSUF=so.${DIST_MAJOR} *************** *** 1145,1154 **** DSOOPTS='-shared' DSO=OSF ;; - *) DSO=no;; esac - test -z "$TIFFLIBREF" && TIFFLIBREF="\${DEPTH}/libtiff/libtiff.${DSOSUF}" - test -z "$DSOSUF_VERSION" && DSOSUF_VERSION=${DSOSUF} fi if [ "$DSO" != no ]; then JUNK="$JUNK t.${DSOSUF}" --- 1154,1160 ---- *************** *** 1181,1186 **** --- 1187,1194 ---- DSOSUF=a DSOOPTS= LIBCOPTS= DSOSUF_VERSION=$DSOSUF fi + test -z "$TIFFLIBREF" && TIFFLIBREF="\${DEPTH}/libtiff/libtiff.${DSOSUF}" + test -z "$DSOSUF_VERSION" && DSOSUF_VERSION=${DSOSUF} Note "Done checking for DSO support." Note "" *************** *** 1450,1456 **** [ 2] Directory for libraries: $DIR_LIB [ 3] Directory for include files: $DIR_INC [ 4] Directory for manual pages: $DIR_MAN ! [ 5] Manual page installation scheme: $MANSCHEME EOF } --- 1458,1465 ---- [ 2] Directory for libraries: $DIR_LIB [ 3] Directory for include files: $DIR_INC [ 4] Directory for manual pages: $DIR_MAN ! [ 5] Directory for HTML documents: $DIR_HTML ! [ 6] Manual page installation scheme: $MANSCHEME EOF } *************** *** 1470,1476 **** 4) promptForNonNullStringParameter "$DIR_MAN" \ "Directory to install manual pages"; DIR_MAN="$param" ;; ! 5) promptForManPageScheme;; esac } --- 1479,1488 ---- 4) promptForNonNullStringParameter "$DIR_MAN" \ "Directory to install manual pages"; DIR_MAN="$param" ;; ! 5) promptForNonNullStringParameter "$DIR_HTML" \ ! "Directory to install HTML documents"; DIR_HTML="$param" ! ;; ! 6) promptForManPageScheme;; esac } *************** *** 1688,1693 **** --- 1700,1706 ---- /@DIR_BIN@/s;;${DIR_BIN};g /@DIR_JPEGLIB@/s;;`relativize ${DIR_JPEGLIB}`;g /@DIR_GZLIB@/s;;`relativize ${DIR_GZLIB}`;g + /@DIR_HTML@/s;;${DIR_HTML};g /@DIR_INC@/s;;${DIR_INC};g /@DIR_LIB@/s;;${DIR_LIB};g /@DIR_MAN@/s;;${DIR_MAN};g *************** *** 1702,1707 **** --- 1715,1721 ---- /@ENVOPTS@/s;;${ENVOPTS};g /@FILLORDER@/s;;${FILLORDER};g /@GCOPTS@/s;;${GCOPTS};g + /@HTML@/s;;${HTML};g /@INSTALL@/s;;${INSTALL};g /@LIBJPEG@/s;;`relativize ${LIBJPEG}`;g /@LIBGL@/s;;${LIBGL};g *************** *** 1797,1806 **** tools/Makefile port/install.sh " fi - SedConfigFiles $CONF_FILES - test $PORT = yes && SedConfigFiles port/Makefile Note "Done." --- 1811,1820 ---- tools/Makefile port/install.sh " + test $HTML = yes && CONF_FILES="$CONF_FILES html/Makefile" + test $PORT = yes && CONF_FILES="$CONF_FILES port/Makefile" fi SedConfigFiles $CONF_FILES Note "Done." EOF-EOF-EOF Patch dist/tiff.alpha<<'EOF-EOF-EOF' *** tiff-v3.4beta034/dist/tiff.alpha Tue May 21 11:44:21 1996 --- tiff-v3.4beta035/dist/tiff.alpha Wed Jun 5 14:24:18 1996 *************** *** 1 **** ! define ALPHA 034 --- 1 ---- ! define ALPHA 035 EOF-EOF-EOF Patch dist/tiff.spec<<'EOF-EOF-EOF' *** tiff-v3.4beta034/dist/tiff.spec Tue May 21 12:01:24 1996 --- tiff-v3.4beta035/dist/tiff.spec Mon Jun 10 15:24:59 1996 *************** *** 1,4 **** ! # $Header: /usr/people/sam/tiff/dist/RCS/tiff.spec,v 1.3 1996/01/10 19:37:41 sam Exp $ # # TIFF Software # --- 1,4 ---- ! # $Header: /usr/people/sam/tiff/dist/RCS/tiff.spec,v 1.6 1996/06/10 21:43:11 sam Exp $ # # TIFF Software # *************** *** 40,50 **** id "${TIFF_NAME} Software" version "${CUR_VERS}" subsys tools default ! id "${TIFF_NAME} Tools" exp "tiff.sw.tools" endsubsys subsys dev ! id "${TIFF_NAME} Library" exp "tiff.sw.dev" endsubsys endimage --- 40,50 ---- id "${TIFF_NAME} Software" version "${CUR_VERS}" subsys tools default ! id "${TIFF_NAME} Tools & Library DSO" exp "tiff.sw.tools" endsubsys subsys dev ! id "${TIFF_NAME} Developement Software" exp "tiff.sw.dev" endsubsys endimage *************** *** 60,73 **** id "${TIFF_NAME} Library Manual Pages" exp "tiff.man.dev" endsubsys ! endimage ! ! image html ! id "${TIFF_NAME} HTML Materials" ! version "${CUR_VERS}" ! subsys sw ! id "${TIFF_NAME} Software Distribution" ! exp "tiff.html.sw" endsubsys endimage endproduct --- 60,68 ---- id "${TIFF_NAME} Library Manual Pages" exp "tiff.man.dev" endsubsys ! subsys html ! id "${TIFF_NAME} HTML Materials" ! exp "tiff.man.html" endsubsys endimage endproduct EOF-EOF-EOF Patch html/Makefile.in<<'EOF-EOF-EOF' *** tiff-v3.4beta034/html/Makefile.in Tue May 21 12:01:52 1996 --- tiff-v3.4beta035/html/Makefile.in Mon Jun 10 15:25:50 1996 *************** *** 1,4 **** ! # $Header: /usr/people/sam/tiff/html/RCS/Makefile.in,v 1.11 1996/05/21 18:57:50 sam Exp $ # # @WARNING@ # --- 1,4 ---- ! # $Header: /usr/people/sam/tiff/html/RCS/Makefile.in,v 1.13 1996/06/05 21:43:27 sam Exp $ # # @WARNING@ # *************** *** 86,92 **** images/ring.gif \ images/smallliz.jpg \ images/strike.gif \ - images/strike.jpg \ images/warning.gif \ ${NULL} TARGETS= --- 86,91 ---- *************** *** 94,102 **** all: ${TARGETS} install: all ! ${INSTALL} -m 755 -dir -idb tiff.html.sw ${HTML} ${HTML}/images for i in ${HTMLFILES} ${IMAGES}; do \ ! ${INSTALL} -idb tiff.html.sw -m 444 -F ${HTML} \ -src ${SRCDIR}/$$i -O $$i; \ done --- 93,101 ---- all: ${TARGETS} install: all ! ${INSTALL} -m 755 -dir -idb tiff.man.html ${HTML} ${HTML}/images for i in ${HTMLFILES} ${IMAGES}; do \ ! ${INSTALL} -idb tiff.man.html -m 444 -F ${HTML} \ -src ${SRCDIR}/$$i -O $$i; \ done EOF-EOF-EOF Patch libtiff/Makefile.in<<'EOF-EOF-EOF' *** tiff-v3.4beta034/libtiff/Makefile.in Tue May 21 12:01:24 1996 --- tiff-v3.4beta035/libtiff/Makefile.in Mon Jun 10 15:25:00 1996 *************** *** 1,4 **** ! # $Header: /usr/people/sam/tiff/libtiff/RCS/Makefile.in,v 1.36 1996/05/21 18:30:39 sam Exp $ # # Tag Image File Format Library # --- 1,4 ---- ! # $Header: /usr/people/sam/tiff/libtiff/RCS/Makefile.in,v 1.38 1996/06/10 20:48:50 sam Exp $ # # Tag Image File Format Library # *************** *** 190,197 **** ${AR} ${AROPTS} libtiff.@DSOSUF@ shr.o rm -f shr.o touch $@ ! # NetBSD 1.1 and newer ! NETBSDdso: ${OBJS} @rm -f libtiff_pic.a @${AR} cq libtiff_pic.a `lorder ${OBJS} | tsort -q` ${RANLIB} libtiff_pic.a --- 190,197 ---- ${AR} ${AROPTS} libtiff.@DSOSUF@ shr.o rm -f shr.o touch $@ ! # NetBSD 1.1 or FreeBSD ! NETBSDdso FREEBSDdso: ${OBJS} @rm -f libtiff_pic.a @${AR} cq libtiff_pic.a `lorder ${OBJS} | tsort -q` ${RANLIB} libtiff_pic.a *************** *** 212,221 **** ${OBJS}: ${SRCDIR}/tiffio.h ${SRCDIR}/tiff.h ${SRCDIR}/tif_dir.h ${OBJS}: ${SRCDIR}/tiffcomp.h ${SRCDIR}/tiffiop.h ${SRCDIR}/tiffconf.h ! version.h: ${SRCDIR}/mkversion.c ${CC} -o mkversion ${CFLAGS} ${SRCDIR}/mkversion.c ! rm -f version.h; ./mkversion \ ! @DIST_MAJOR@ @DIST_MINOR@ @DIST_ALPHA@ @DIST_TYPE@ version.h tif_version.o: version.h # --- 212,223 ---- ${OBJS}: ${SRCDIR}/tiffio.h ${SRCDIR}/tiff.h ${SRCDIR}/tif_dir.h ${OBJS}: ${SRCDIR}/tiffcomp.h ${SRCDIR}/tiffiop.h ${SRCDIR}/tiffconf.h ! ALPHA = @ALPHAFILE@ ! VERSION = @VERSIONFILE@ ! ! version.h: ${VERSION} ${ALPHA} ${SRCDIR}/mkversion.c ${CC} -o mkversion ${CFLAGS} ${SRCDIR}/mkversion.c ! rm -f version.h; ./mkversion -v ${VERSION} -a ${ALPHA} version.h tif_version.o: version.h # EOF-EOF-EOF Patch libtiff/mkversion.c<<'EOF-EOF-EOF' *** tiff-v3.4beta034/libtiff/mkversion.c Tue May 21 12:01:26 1996 --- tiff-v3.4beta035/libtiff/mkversion.c Mon Jun 10 15:25:04 1996 *************** *** 1,4 **** ! /* "$Header: /usr/people/sam/tiff/libtiff/RCS/mkversion.c,v 1.5 1996/05/21 18:19:48 sam Exp $ */ /* * Copyright (c) 1995-1996 Sam Leffler --- 1,4 ---- ! /* "$Header: /usr/people/sam/tiff/libtiff/RCS/mkversion.c,v 1.4 1996/01/10 19:34:25 sam Exp $ */ /* * Copyright (c) 1995-1996 Sam Leffler *************** *** 25,63 **** */ /* ! * Generate a library version string. * ! * Syntax: mkversion major minor alpha type [outfile] */ #include #include #include int main(int argc, char* argv[]) { FILE* fd; ! if (argc != 5 && argc != 6) { ! fprintf(stderr, "usage: %s major minor alpha type [outfile]\n", ! argv[0]); exit(-1); } ! if (argc == 6) { ! fd = fopen(argv[5], "w"); if (fd == NULL) { ! fprintf(stderr, "%s: %s: Could not open for writing.\n", ! argv[0], argv[5]); exit(-1); } } else fd = stdout; ! if (strcmp(argv[4], "beta") == 0) ! fprintf(fd, "#define VERSION \"LIBTIFF, Version %s.%sbeta%s\\n", ! argv[1], argv[2], argv[3]); ! else ! fprintf(fd, "#define VERSION \"LIBTIFF, Version %s.%s%s (alpha %s)\\n", ! argv[1], argv[2], argv[4], argv[3]); fprintf(fd, "Copyright (c) 1988-1996 Sam Leffler\\n"); fprintf(fd, "Copyright (c) 1991-1996 Silicon Graphics, Inc.\"\n"); --- 25,128 ---- */ /* ! * Generate a library version string for systems that ! * do not have a shell (by default this is done with ! * awk and echo from the Makefile). * ! * This was written by Peter Greenham for Acorn systems. ! * ! * Syntax: mkversion [-v version-file] [-a alpha-file] [] */ #include #include #include + static void + usage(void) + { + fprintf(stderr, + "usage: mkversion [-v version-file] [-a alpha-file] [outfile]\n"); + exit(-1); + } + + static FILE* + openFile(char* filename) + { + FILE* fd = fopen(filename, "r"); + if (fd == NULL) { + fprintf(stderr, "mkversion: %s: Could not open for reading.\n", + filename); + exit(-1); + } + return (fd); + } + int main(int argc, char* argv[]) { + char* versionFile = "../VERSION"; + char* alphaFile = "../dist/tiff.alpha"; + char version[128]; + char alpha[128]; FILE* fd; + char* cp; ! argc--, argv++; ! while (argc > 0 && argv[0][0] == '-') { ! if (strcmp(argv[0], "-v") == 0) { ! if (argc < 1) ! usage(); ! argc--, argv++; ! versionFile = argv[0]; ! } else if (strcmp(argv[0], "-a") == 0) { ! if (argc < 1) ! usage(); ! argc--, argv++; ! alphaFile = argv[0]; ! } else ! usage(); ! argc--, argv++; ! } ! fd = openFile(versionFile); ! if (fgets(version, sizeof (version)-1, fd) == NULL) { ! fprintf(stderr, "mkversion: No version information in %s.\n", ! versionFile); ! exit(-1); ! } ! cp = strchr(version, '\n'); ! if (cp) ! *cp = '\0'; ! fclose(fd); ! fd = openFile(alphaFile); ! if (fgets(alpha, sizeof (alpha)-1, fd) == NULL) { ! fprintf(stderr, "mkversion: No alpha information in %s.\n", alphaFile); ! exit(-1); ! } ! fclose(fd); ! cp = strchr(alpha, ' '); /* skip to 3rd blank-separated field */ ! if (cp) ! cp = strchr(cp+1, ' '); ! if (cp) { /* append alpha to version */ ! char* tp; ! for (tp = strchr(version, '\0'), cp++; *tp = *cp; tp++, cp++) ! ; ! if (tp[-1] == '\n') ! tp[-1] = '\0'; ! } else { ! fprintf(stderr, "mkversion: Malformed alpha information in %s.\n", ! alphaFile); exit(-1); } ! if (argc > 0) { ! fd = fopen(argv[0], "w"); if (fd == NULL) { ! fprintf(stderr, "mkversion: %s: Could not open for writing.\n", ! argv[0]); exit(-1); } } else fd = stdout; ! fprintf(fd, "#define VERSION \"LIBTIFF, Version %s\\n", version); fprintf(fd, "Copyright (c) 1988-1996 Sam Leffler\\n"); fprintf(fd, "Copyright (c) 1991-1996 Silicon Graphics, Inc.\"\n"); EOF-EOF-EOF Patch libtiff/tif_dirinfo.c<<'EOF-EOF-EOF' *** tiff-v3.4beta034/libtiff/tif_dirinfo.c Tue May 21 12:01:28 1996 --- tiff-v3.4beta035/libtiff/tif_dirinfo.c Mon Jun 10 15:25:07 1996 *************** *** 1,4 **** ! /* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_dirinfo.c,v 1.37 1996/01/10 19:32:58 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler --- 1,4 ---- ! /* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_dirinfo.c,v 1.38 1996/06/04 19:04:41 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler *************** *** 232,238 **** { const TIFFFieldInfo* ta = *(const TIFFFieldInfo**) a; const TIFFFieldInfo* tb = *(const TIFFFieldInfo**) b; ! int c = ta->field_tag - tb->field_tag; return (c != 0 ? c : tb->field_type - ta->field_type); } --- 232,239 ---- { const TIFFFieldInfo* ta = *(const TIFFFieldInfo**) a; const TIFFFieldInfo* tb = *(const TIFFFieldInfo**) b; ! /* NB: width of c must match ttag_t */ ! int32 c = ta->field_tag - tb->field_tag; return (c != 0 ? c : tb->field_type - ta->field_type); } EOF-EOF-EOF Patch libtiff/tif_fax3.h<<'EOF-EOF-EOF' *** tiff-v3.4beta034/libtiff/tif_fax3.h Tue May 21 12:01:30 1996 --- tiff-v3.4beta035/libtiff/tif_fax3.h Mon Jun 10 15:25:10 1996 *************** *** 1,4 **** ! /* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_fax3.h,v 1.30 1996/05/10 14:45:33 sam Exp $ */ /* * Copyright (c) 1990-1996 Sam Leffler --- 1,4 ---- ! /* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_fax3.h,v 1.31 1996/06/04 19:04:41 sam Exp $ */ /* * Copyright (c) 1990-1996 Sam Leffler *************** *** 141,147 **** goto eoflab; \ BitsAvail = (n); /* pad with zeros */ \ } else { \ ! BitAcc |= bitmap[*cp++]<