Wed, 19 Feb 2003 10:14:49 +0000
rename br.c to bitblt_table_gen.c, and integrate use of it into build process
| Makefile | file | annotate | diff | revisions | |
| bitblt.c | file | annotate | diff | revisions | |
| bitblt.h | file | annotate | diff | revisions | |
| bitblt_table_gen.c | file | annotate | diff | revisions | |
| br.c | file | annotate | diff | revisions |
1.1 diff -r 7a996a86036d -r bb180150e603 Makefile 1.2 --- a/Makefile Wed Feb 19 10:15:16 2003 +0000 1.3 +++ b/Makefile Wed Feb 19 10:14:49 2003 +0000 1.4 @@ -1,6 +1,6 @@ 1.5 # t2p: build a PDF file out of one or more TIFF Class F Group 4 files 1.6 # Makefile 1.7 -# $Id: Makefile,v 1.11 2003/01/21 10:53:48 eric Exp $ 1.8 +# $Id: Makefile,v 1.12 2003/02/19 02:14:49 eric Exp $ 1.9 # Copyright 2001 Eric Smith <eric@brouhaha.com> 1.10 # 1.11 # This program is free software; you can redistribute it and/or modify 1.12 @@ -20,24 +20,31 @@ 1.13 1.14 1.15 CFLAGS = -Wall -g -I/usr/local/include/panda 1.16 -LDLIBS = -g -ltiff -lm -L/usr/local/lib/panda -lpanda -lpng 1.17 + 1.18 +# Panda is not all that common, so we'll statically link it in order to 1.19 +# make the t2p binary more portable. 1.20 + 1.21 +LDFLAGS = -g 1.22 +LDLIBS = -Wl,-static -lpanda -Wl,-dy -lpng -ltiff -ljpeg -lz -lm -L/usr/local/lib/panda 1.23 + 1.24 YACC = bison 1.25 YFLAGS = -d -v 1.26 1.27 + 1.28 # ----------------------------------------------------------------------------- 1.29 # You shouldn't have to change anything below this point, but if you do please 1.30 # let me know why so I can improve this Makefile. 1.31 # ----------------------------------------------------------------------------- 1.32 1.33 -VERSION = 0.1 1.34 +VERSION = 0.10 1.35 1.36 PACKAGE = t2p 1.37 1.38 TARGETS = t2p bitblt_test 1.39 1.40 -CSRCS = t2p.c semantics.c bitblt.c bitblt_test.c 1.41 +CSRCS = t2p.c semantics.c bitblt.c bitblt_test.c bitblt_table_gen.c 1.42 OSRCS = scanner.l parser.y 1.43 -HDRS = t2p.h semantics.h bitblt.h 1.44 +HDRS = t2p.h semantics.h bitblt.h 1.45 MISC = COPYING Makefile 1.46 1.47 DISTFILES = $(MISC) $(HDRS) $(CSRCS) $(OSRCS) 1.48 @@ -45,13 +52,23 @@ 1.49 1.50 1.51 AUTO_CSRCS = scanner.c parser.tab.c 1.52 -AUTO_HDRS = parser.tab.h 1.53 +AUTO_HDRS = parser.tab.h bitblt_tables.h 1.54 AUTO_MISC = parser.output 1.55 1.56 1.57 all: $(TARGETS) 1.58 1.59 1.60 +t2p: t2p.o scanner.o semantics.o parser.tab.o bitblt.o 1.61 + 1.62 +bitblt_tables.h: bitblt_table_gen 1.63 + ./bitblt_table_gen >bitblt_tables.h 1.64 + 1.65 +bitblt_table_gen: bitblt_table_gen.o 1.66 + 1.67 +bitblt_test: bitblt_test.o bitblt.o 1.68 + 1.69 + 1.70 dist: $(DISTFILES) 1.71 -rm -rf $(DISTNAME) 1.72 mkdir $(DISTNAME) 1.73 @@ -60,16 +77,11 @@ 1.74 -rm -rf $(DISTNAME) 1.75 1.76 1.77 -t2p: t2p.o scanner.o semantics.o parser.tab.o bitblt.o 1.78 - 1.79 -bitblt_test: bitblt_test.o bitblt.o 1.80 - 1.81 - 1.82 clean: 1.83 - rm -f *.o *.d $(TARGETS) $(AUTO_SRCS) $(AUTO_HDRS) $(AUTO_MISC) 1.84 + rm -f *.o *.d $(TARGETS) $(AUTO_CSRCS) $(AUTO_HDRS) $(AUTO_MISC) 1.85 1.86 very_clean: 1.87 - rm -f *.o *.d $(TARGETS) $(AUTO_SRCS) $(AUTO_HDRS) $(AUTO_MISC) \ 1.88 + rm -f *.o *.d $(TARGETS) $(AUTO_CSRCS) $(AUTO_HDRS) $(AUTO_MISC) \ 1.89 *~ *.pdf 1.90 1.91 wc: 1.92 @@ -82,9 +94,6 @@ 1.93 %.tab.c %.tab.h %.output: %.y 1.94 $(YACC) $(YFLAGS) $< 1.95 1.96 -# %.c: %.l 1.97 -# $(LEX) $(LFLAGS) $< 1.98 - 1.99 1.100 ALL_CSRCS = $(CSRCS) $(AUTO_CSRCS) 1.101
2.1 diff -r 7a996a86036d -r bb180150e603 bitblt.c 2.2 --- a/bitblt.c Wed Feb 19 10:15:16 2003 +0000 2.3 +++ b/bitblt.c Wed Feb 19 10:14:49 2003 +0000 2.4 @@ -1,3 +1,29 @@ 2.5 +/* 2.6 + * t2p: Create a PDF file from the contents of one or more TIFF 2.7 + * bilevel image files. The images in the resulting PDF file 2.8 + * will be compressed using ITU-T T.6 (G4) fax encoding. 2.9 + * 2.10 + * bitblt routines 2.11 + * $Id: bitblt.c,v 1.11 2003/02/19 02:14:44 eric Exp $ 2.12 + * Copyright 2001, 2002, 2003 Eric Smith <eric@brouhaha.com> 2.13 + * 2.14 + * This program is free software; you can redistribute it and/or modify 2.15 + * it under the terms of the GNU General Public License version 2 as 2.16 + * published by the Free Software Foundation. Note that permission is 2.17 + * not granted to redistribute this program under the terms of any 2.18 + * other version of the General Public License. 2.19 + * 2.20 + * This program is distributed in the hope that it will be useful, 2.21 + * but WITHOUT ANY WARRANTY; without even the implied warranty of 2.22 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 2.23 + * GNU General Public License for more details. 2.24 + * 2.25 + * You should have received a copy of the GNU General Public License 2.26 + * along with this program; if not, write to the Free Software 2.27 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA 2.28 + */ 2.29 + 2.30 + 2.31 #include <stdbool.h> 2.32 #include <stdint.h> 2.33 #include <assert.h> 2.34 @@ -7,45 +33,10 @@ 2.35 2.36 #include "bitblt.h" 2.37 2.38 - 2.39 -#define DIV_ROUND_UP(count,pow2) (((count) - 1) / (pow2) + 1) 2.40 +#include "bitblt_tables.h" 2.41 2.42 2.43 -static const uint8_t bit_reverse_byte [0x100] = 2.44 -{ 2.45 - 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, 2.46 - 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0, 2.47 - 0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8, 2.48 - 0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8, 2.49 - 0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4, 2.50 - 0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4, 2.51 - 0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec, 2.52 - 0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc, 2.53 - 0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2, 2.54 - 0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2, 2.55 - 0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea, 2.56 - 0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa, 2.57 - 0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6, 2.58 - 0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6, 2.59 - 0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee, 2.60 - 0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe, 2.61 - 0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1, 2.62 - 0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1, 2.63 - 0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9, 2.64 - 0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9, 2.65 - 0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5, 2.66 - 0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5, 2.67 - 0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed, 2.68 - 0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd, 2.69 - 0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3, 2.70 - 0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3, 2.71 - 0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb, 2.72 - 0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb, 2.73 - 0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7, 2.74 - 0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7, 2.75 - 0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef, 2.76 - 0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff 2.77 -}; 2.78 +#define DIV_ROUND_UP(count,pow2) (((count) - 1) / (pow2) + 1) 2.79 2.80 2.81 void reverse_bits (uint8_t *p, int byte_count) 2.82 @@ -733,3 +724,8 @@ 2.83 transpose (src); 2.84 flip_v (src); 2.85 } 2.86 + 2.87 + 2.88 +void bitblt_init (void) 2.89 +{ 2.90 +}
3.1 diff -r 7a996a86036d -r bb180150e603 bitblt.h 3.2 --- a/bitblt.h Wed Feb 19 10:15:16 2003 +0000 3.3 +++ b/bitblt.h Wed Feb 19 10:14:49 2003 +0000 3.4 @@ -1,3 +1,29 @@ 3.5 +/* 3.6 + * t2p: Create a PDF file from the contents of one or more TIFF 3.7 + * bilevel image files. The images in the resulting PDF file 3.8 + * will be compressed using ITU-T T.6 (G4) fax encoding. 3.9 + * 3.10 + * bitblt routines 3.11 + * $Id: bitblt.h,v 1.10 2003/02/19 02:14:44 eric Exp $ 3.12 + * Copyright 2001, 2002, 2003 Eric Smith <eric@brouhaha.com> 3.13 + * 3.14 + * This program is free software; you can redistribute it and/or modify 3.15 + * it under the terms of the GNU General Public License version 2 as 3.16 + * published by the Free Software Foundation. Note that permission is 3.17 + * not granted to redistribute this program under the terms of any 3.18 + * other version of the General Public License. 3.19 + * 3.20 + * This program is distributed in the hope that it will be useful, 3.21 + * but WITHOUT ANY WARRANTY; without even the implied warranty of 3.22 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 3.23 + * GNU General Public License for more details. 3.24 + * 3.25 + * You should have received a copy of the GNU General Public License 3.26 + * along with this program; if not, write to the Free Software 3.27 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA 3.28 + */ 3.29 + 3.30 + 3.31 typedef struct Point 3.32 { 3.33 int32_t x; 3.34 @@ -40,6 +66,9 @@ 3.35 #define TF_XOR 0x6 3.36 3.37 3.38 +void bitblt_init (void); 3.39 + 3.40 + 3.41 Bitmap *create_bitmap (Rect *rect); 3.42 void free_bitmap (Bitmap *bitmap); 3.43
4.1 diff -r 7a996a86036d -r bb180150e603 bitblt_table_gen.c 4.2 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 +++ b/bitblt_table_gen.c Wed Feb 19 10:14:49 2003 +0000 4.4 @@ -0,0 +1,59 @@ 4.5 +/* 4.6 + * t2p: Create a PDF file from the contents of one or more TIFF 4.7 + * bilevel image files. The images in the resulting PDF file 4.8 + * will be compressed using ITU-T T.6 (G4) fax encoding. 4.9 + * 4.10 + * bitblt table generator 4.11 + * $Id: bitblt_table_gen.c,v 1.1 2003/02/19 02:14:44 eric Exp $ 4.12 + * Copyright 2001, 2002, 2003 Eric Smith <eric@brouhaha.com> 4.13 + * 4.14 + * This program is free software; you can redistribute it and/or modify 4.15 + * it under the terms of the GNU General Public License version 2 as 4.16 + * published by the Free Software Foundation. Note that permission is 4.17 + * not granted to redistribute this program under the terms of any 4.18 + * other version of the General Public License. 4.19 + * 4.20 + * This program is distributed in the hope that it will be useful, 4.21 + * but WITHOUT ANY WARRANTY; without even the implied warranty of 4.22 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 4.23 + * GNU General Public License for more details. 4.24 + * 4.25 + * You should have received a copy of the GNU General Public License 4.26 + * along with this program; if not, write to the Free Software 4.27 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA 4.28 + */ 4.29 + 4.30 + 4.31 +#include <stdio.h> 4.32 + 4.33 +int main (int argc, char *argv[]) 4.34 +{ 4.35 + int i, j; 4.36 + 4.37 + printf ("/* This file is automatically generated; do not edit */\n"); 4.38 + printf ("\n"); 4.39 + printf ("static const uint8_t bit_reverse_byte [0x100] =\n"); 4.40 + printf ("{\n"); 4.41 + for (i = 0; i < 0x100; i++) 4.42 + { 4.43 + if ((i & 7) == 0) 4.44 + printf (" "); 4.45 + j = (((i & 0x01) << 7) | 4.46 + ((i & 0x02) << 5) | 4.47 + ((i & 0x04) << 3) | 4.48 + ((i & 0x08) << 1) | 4.49 + ((i & 0x10) >> 1) | 4.50 + ((i & 0x20) >> 3) | 4.51 + ((i & 0x40) >> 5) | 4.52 + ((i & 0x80) >> 7)); 4.53 + printf ("0x%02x", j); 4.54 + if (i != 0xff) 4.55 + printf (","); 4.56 + if ((i & 7) == 7) 4.57 + printf ("\n"); 4.58 + else 4.59 + printf (" "); 4.60 + } 4.61 + printf ("};\n"); 4.62 + return (0); 4.63 +}
5.1 diff -r 7a996a86036d -r bb180150e603 br.c 5.2 --- a/br.c Wed Feb 19 10:15:16 2003 +0000 5.3 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 5.4 @@ -1,31 +0,0 @@ 5.5 -#include <stdio.h> 5.6 - 5.7 -int main (int argc, char *argv[]) 5.8 -{ 5.9 - int i, j; 5.10 - 5.11 - printf ("static const u8 bit_reverse_byte [0x100] =\n"); 5.12 - printf ("{\n"); 5.13 - for (i = 0; i < 0x100; i++) 5.14 - { 5.15 - if ((i & 7) == 0) 5.16 - printf (" "); 5.17 - j = (((i & 0x01) << 7) | 5.18 - ((i & 0x02) << 5) | 5.19 - ((i & 0x04) << 3) | 5.20 - ((i & 0x08) << 1) | 5.21 - ((i & 0x10) >> 1) | 5.22 - ((i & 0x20) >> 3) | 5.23 - ((i & 0x40) >> 5) | 5.24 - ((i & 0x80) >> 7)); 5.25 - printf ("0x%02x", j); 5.26 - if (i != 0xff) 5.27 - printf (","); 5.28 - if ((i & 7) == 7) 5.29 - printf ("\n"); 5.30 - else 5.31 - printf (" "); 5.32 - } 5.33 - printf ("};\n"); 5.34 - return (0); 5.35 -}