Merge branch 'master' of https://github.com/tesseract-ocr/tesseract

cppan.yml

@@ -25,7 +25,7 @@ common_settings:
 
     options:
         any:
-            compiler_options:
+            compile_options:
                 msvc:
                     private:
                         - /openmp

doc/tesseract.1.asc

@@ -8,7 +8,7 @@ tesseract - command-line OCR engine
 
 SYNOPSIS
 --------
-*tesseract* 'imagename'|'stdin' 'outputbase'|'stdout' [options...] [configfile...]
+*tesseract* 'imagename'|'listname'|'stdin' 'outputbase'|'stdout' [options...] [configfile...]
 
 DESCRIPTION
 -----------
@@ -24,6 +24,11 @@ IN/OUT ARGUMENTS
 	The name of the input image.  Most image file formats (anything
 	readable by Leptonica) are supported.
 
+'listname'::
+	The name of a text file which lists the names of all input images
+	(one image name per line). The results will be combined in a
+	single file for each output file format (txt, pdf, hocr).
+
 'stdin'::
 	Instruction to read data from standard input
 

src/ccutil/params.cpp

@@ -79,8 +79,7 @@ bool ParamUtils::ReadParamsFromFp(SetParamConstraint constraint, TFile *fp,
 
       if (!foundit) {
         anyerr = true;         // had an error
-        tprintf("read_params_file: parameter not found: %s\n", line);
-        exit(1);
+        tprintf("Warning: Parameter not found: %s\n", line);
       }
     }
   }

src/viewer/svutil.cpp

@@ -37,8 +37,6 @@ struct addrinfo {
 #include <pthread.h>
 #include <semaphore.h>
 #include <csignal>
-#include <cstdlib>
-#include <cstring>
 #include <sys/select.h>
 #include <sys/socket.h>
 #ifdef __linux__