diff --git a/Makefile b/Makefile index d8afb1d..ea32ef3 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # t2p: build a PDF file out of one or more TIFF Class F Group 4 files # Makefile -# $Id: Makefile,v 1.11 2003/01/21 10:53:48 eric Exp $ +# $Id: Makefile,v 1.12 2003/02/19 02:14:49 eric Exp $ # Copyright 2001 Eric Smith # # This program is free software; you can redistribute it and/or modify @@ -20,24 +20,31 @@ CFLAGS = -Wall -g -I/usr/local/include/panda -LDLIBS = -g -ltiff -lm -L/usr/local/lib/panda -lpanda -lpng + +# Panda is not all that common, so we'll statically link it in order to +# make the t2p binary more portable. + +LDFLAGS = -g +LDLIBS = -Wl,-static -lpanda -Wl,-dy -lpng -ltiff -ljpeg -lz -lm -L/usr/local/lib/panda + YACC = bison YFLAGS = -d -v + # ----------------------------------------------------------------------------- # You shouldn't have to change anything below this point, but if you do please # let me know why so I can improve this Makefile. # ----------------------------------------------------------------------------- -VERSION = 0.1 +VERSION = 0.10 PACKAGE = t2p TARGETS = t2p bitblt_test -CSRCS = t2p.c semantics.c bitblt.c bitblt_test.c +CSRCS = t2p.c semantics.c bitblt.c bitblt_test.c bitblt_table_gen.c OSRCS = scanner.l parser.y -HDRS = t2p.h semantics.h bitblt.h +HDRS = t2p.h semantics.h bitblt.h MISC = COPYING Makefile DISTFILES = $(MISC) $(HDRS) $(CSRCS) $(OSRCS) @@ -45,13 +52,23 @@ DISTNAME = $(PACKAGE)-$(VERSION) AUTO_CSRCS = scanner.c parser.tab.c -AUTO_HDRS = parser.tab.h +AUTO_HDRS = parser.tab.h bitblt_tables.h AUTO_MISC = parser.output all: $(TARGETS) +t2p: t2p.o scanner.o semantics.o parser.tab.o bitblt.o + +bitblt_tables.h: bitblt_table_gen + ./bitblt_table_gen >bitblt_tables.h + +bitblt_table_gen: bitblt_table_gen.o + +bitblt_test: bitblt_test.o bitblt.o + + dist: $(DISTFILES) -rm -rf $(DISTNAME) mkdir $(DISTNAME) @@ -60,16 +77,11 @@ dist: $(DISTFILES) -rm -rf $(DISTNAME) -t2p: t2p.o scanner.o semantics.o parser.tab.o bitblt.o - -bitblt_test: bitblt_test.o bitblt.o - - clean: - rm -f *.o *.d $(TARGETS) $(AUTO_SRCS) $(AUTO_HDRS) $(AUTO_MISC) + rm -f *.o *.d $(TARGETS) $(AUTO_CSRCS) $(AUTO_HDRS) $(AUTO_MISC) very_clean: - rm -f *.o *.d $(TARGETS) $(AUTO_SRCS) $(AUTO_HDRS) $(AUTO_MISC) \ + rm -f *.o *.d $(TARGETS) $(AUTO_CSRCS) $(AUTO_HDRS) $(AUTO_MISC) \ *~ *.pdf wc: @@ -82,9 +94,6 @@ ls-lt: %.tab.c %.tab.h %.output: %.y $(YACC) $(YFLAGS) $< -# %.c: %.l -# $(LEX) $(LFLAGS) $< - ALL_CSRCS = $(CSRCS) $(AUTO_CSRCS) diff --git a/bitblt.c b/bitblt.c index bb2be60..8c3339a 100644 --- a/bitblt.c +++ b/bitblt.c @@ -1,3 +1,29 @@ +/* + * t2p: Create a PDF file from the contents of one or more TIFF + * bilevel image files. The images in the resulting PDF file + * will be compressed using ITU-T T.6 (G4) fax encoding. + * + * bitblt routines + * $Id: bitblt.c,v 1.11 2003/02/19 02:14:44 eric Exp $ + * Copyright 2001, 2002, 2003 Eric Smith + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. Note that permission is + * not granted to redistribute this program under the terms of any + * other version of the General Public License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA + */ + + #include #include #include @@ -7,47 +33,12 @@ #include "bitblt.h" +#include "bitblt_tables.h" + #define DIV_ROUND_UP(count,pow2) (((count) - 1) / (pow2) + 1) -static const uint8_t bit_reverse_byte [0x100] = -{ - 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, - 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0, - 0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8, - 0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8, - 0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4, - 0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4, - 0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec, - 0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc, - 0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2, - 0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2, - 0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea, - 0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa, - 0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6, - 0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6, - 0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee, - 0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe, - 0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1, - 0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1, - 0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9, - 0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9, - 0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5, - 0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5, - 0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed, - 0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd, - 0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3, - 0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3, - 0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb, - 0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb, - 0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7, - 0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7, - 0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef, - 0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff -}; - - void reverse_bits (uint8_t *p, int byte_count) { while (byte_count--) @@ -733,3 +724,8 @@ void rot_270 (Bitmap *src) /* transpose + flip_v */ transpose (src); flip_v (src); } + + +void bitblt_init (void) +{ +} diff --git a/bitblt.h b/bitblt.h index 1b40c0e..8c39ab3 100644 --- a/bitblt.h +++ b/bitblt.h @@ -1,3 +1,29 @@ +/* + * t2p: Create a PDF file from the contents of one or more TIFF + * bilevel image files. The images in the resulting PDF file + * will be compressed using ITU-T T.6 (G4) fax encoding. + * + * bitblt routines + * $Id: bitblt.h,v 1.10 2003/02/19 02:14:44 eric Exp $ + * Copyright 2001, 2002, 2003 Eric Smith + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. Note that permission is + * not granted to redistribute this program under the terms of any + * other version of the General Public License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA + */ + + typedef struct Point { int32_t x; @@ -40,6 +66,9 @@ typedef struct Bitmap #define TF_XOR 0x6 +void bitblt_init (void); + + Bitmap *create_bitmap (Rect *rect); void free_bitmap (Bitmap *bitmap); diff --git a/bitblt_table_gen.c b/bitblt_table_gen.c new file mode 100644 index 0000000..016145b --- /dev/null +++ b/bitblt_table_gen.c @@ -0,0 +1,59 @@ +/* + * t2p: Create a PDF file from the contents of one or more TIFF + * bilevel image files. The images in the resulting PDF file + * will be compressed using ITU-T T.6 (G4) fax encoding. + * + * bitblt table generator + * $Id: bitblt_table_gen.c,v 1.1 2003/02/19 02:14:44 eric Exp $ + * Copyright 2001, 2002, 2003 Eric Smith + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. Note that permission is + * not granted to redistribute this program under the terms of any + * other version of the General Public License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA + */ + + +#include + +int main (int argc, char *argv[]) +{ + int i, j; + + printf ("/* This file is automatically generated; do not edit */\n"); + printf ("\n"); + printf ("static const uint8_t bit_reverse_byte [0x100] =\n"); + printf ("{\n"); + for (i = 0; i < 0x100; i++) + { + if ((i & 7) == 0) + printf (" "); + j = (((i & 0x01) << 7) | + ((i & 0x02) << 5) | + ((i & 0x04) << 3) | + ((i & 0x08) << 1) | + ((i & 0x10) >> 1) | + ((i & 0x20) >> 3) | + ((i & 0x40) >> 5) | + ((i & 0x80) >> 7)); + printf ("0x%02x", j); + if (i != 0xff) + printf (","); + if ((i & 7) == 7) + printf ("\n"); + else + printf (" "); + } + printf ("};\n"); + return (0); +} diff --git a/br.c b/br.c deleted file mode 100644 index 62a4ab0..0000000 --- a/br.c +++ /dev/null @@ -1,31 +0,0 @@ -#include - -int main (int argc, char *argv[]) -{ - int i, j; - - printf ("static const u8 bit_reverse_byte [0x100] =\n"); - printf ("{\n"); - for (i = 0; i < 0x100; i++) - { - if ((i & 7) == 0) - printf (" "); - j = (((i & 0x01) << 7) | - ((i & 0x02) << 5) | - ((i & 0x04) << 3) | - ((i & 0x08) << 1) | - ((i & 0x10) >> 1) | - ((i & 0x20) >> 3) | - ((i & 0x40) >> 5) | - ((i & 0x80) >> 7)); - printf ("0x%02x", j); - if (i != 0xff) - printf (","); - if ((i & 7) == 7) - printf ("\n"); - else - printf (" "); - } - printf ("};\n"); - return (0); -}