Update for latest leptonica (1.61)

mistydemeo · Apr 29, 2009 · eee67bd · eee67bd
1 parent a13b7e8
commit eee67bd
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 3 deletions.
diff --git a/LEPTONICA_VERSION b/LEPTONICA_VERSION
@@ -1 +1 @@
-1.58
+1.61
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 CC=g++
-LEPTONICA=../leptonlib-1.58
+LEPTONICA=../leptonlib-1.61
 # For example, a fink MacOSX install:
 # EXTRA=-I/sw/include/ -I/sw/include/libpng -I/sw/include/libjpeg -L/sw/lib
 CFLAGS=-I${LEPTONICA}/src -Wall -I/usr/include -L/usr/lib -O3 ${EXTRA}

diff --git a/jbig2.cc b/jbig2.cc
@@ -21,6 +21,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
 
 #include <allheaders.h>
 #include <pix.h>
@@ -284,7 +286,7 @@ main(int argc, char **argv) {
         return 1;
       }
 
-      if (threshold > 0.9 | threshold < 0.4) {
+      if (threshold > 0.9 || threshold < 0.4) {
         fprintf(stderr, "Invalid value for threshold\n");
         fprintf(stderr, "(must be between 0.4 and 0.9)\n");
         return 10;

diff --git a/jbig2arith.cc b/jbig2arith.cc
@@ -16,8 +16,10 @@
 // limitations under the License.
 
 #include "jbig2arith.h"
+
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #define u64 uint64_t
 #define u32 uint32_t

diff --git a/jbig2enc.cc b/jbig2enc.cc
@@ -19,6 +19,9 @@
 #include <vector>
 #include <algorithm>
 
+#include <stdio.h>
+#include <string.h>
+
 #include <allheaders.h>
 #include <pix.h>
 

diff --git a/jbig2sym.cc b/jbig2sym.cc
@@ -26,6 +26,8 @@
 #define restrict __restrict__
 #endif
 
+#include <stdio.h>
+
 #include <allheaders.h>
 #include <pix.h>