Permalink
Browse files

Updated Leptonica references to 1.63

Fixed Leptonica 1.63 API change in jbig2.cc
  • Loading branch information...
1 parent dc006c0 commit 622034c9be629b783b60f3acb4278a3212fa6ef5 dkelly committed with Dec 3, 2009
Showing with 13 additions and 10 deletions.
  1. +1 −1 LEPTONICA_VERSION
  2. +0 −3 Makefile
  3. +1 −1 README
  4. +2 −1 jbig2.cc
  5. +9 −4 jbig2structs.h
View
@@ -1 +1 @@
-1.62
+1.63
View
@@ -17,8 +17,5 @@ jbig2arith.o: jbig2arith.cc jbig2arith.h
jbig2sym.o: jbig2sym.cc jbig2arith.h
$(CC) -c jbig2sym.cc -DUSE_EXT $(CFLAGS)
-delta: delta.c
- $(CC) -o delta delta.c $(CFLAGS) ${LEPTONICA}/src/liblept.a -lpng -ljpeg -ltiff -lm
-
clean:
rm -f *.o jbig2 libjbig2enc.a
View
2 README
@@ -14,7 +14,7 @@ better compression than G4. This encoder can:
It uses the (Apache-ish licensed) Leptonica library:
http://www.leptonica.com/
-You'll need version 1.58 - which is included with the distribution tarball.
+You'll need version 1.63 - which is included with the distribution tarball.
KNOWN BUGS:
View
@@ -348,7 +348,8 @@ main(int argc, char **argv) {
fprintf(stderr, "Unable to open \"%s\"", argv[i]);
return 1;
}
- int filetype = findFileFormat(fp);
+ l_int32 filetype;
+ findFileFormat(fp, &filetype);
if (filetype==IFF_TIFF && tiffGetCount(fp, &numsubimages)) {
return 1;
}
View
@@ -137,7 +137,7 @@ struct jbig2_symbol_dict {
u32 exsyms;
u32 newsyms;
-} __attribute__((packed));
+} PACKED;
struct jbig2_text_region {
u32 width;
@@ -171,15 +171,20 @@ struct jbig2_text_region {
#endif
// huffman flags omitted
-} __attribute__((packed));
+} PACKED;
+
struct jbig2_text_region_atflags {
signed char a1x, a1y, a2x, a2y;
-} __attribute__((packed));
+} PACKED;
struct jbig2_text_region_syminsts {
u32 sbnuminstances;
// huffman decoding table omitted
-} __attribute__((packed));
+} PACKED;
+
+#if defined(WIN32)
+#pragma pack()
+#endif
#endif // JBIG2ENC_JBIG2STRUCTS_H__

0 comments on commit 622034c

Please sign in to comment.