From d4a61eb03ad2d091a6d8ed1d880bcbcf03ba6b44 Mon Sep 17 00:00:00 2001 From: Dan Bloomberg Date: Thu, 8 Jun 2017 17:51:45 -0700 Subject: [PATCH] Update leptonica versioning to 1.74-3, in prep for a new version on github --- CMakeLists.txt | 2 +- README.html | 41 ++++++++++++++++++----------------------- configure.ac | 2 +- src/allheaders.h | 2 +- src/allheaders_top.txt | 2 +- src/makefile.static | 2 +- version-notes.html | 8 ++++++++ 7 files changed, 31 insertions(+), 28 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 78f66d0d0..7953c15d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,7 @@ project(leptonica C CXX) set(VERSION_MAJOR 1) set(VERSION_MINOR 74) -set(VERSION_PATCH 2) +set(VERSION_PATCH 3) set(VERSION_PLAIN ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) option(BUILD_PROG "Build utility programs" OFF) diff --git a/README.html b/README.html index 520fe2558..29498886e 100644 --- a/README.html +++ b/README.html @@ -75,11 +75,11 @@ - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *====================================================================*/ -README (1.74.2: 19 May 2017) +README (1.74.3: 8 Jun 2017) --------------------------- -gunzip leptonica-1.74.2.tar.gz -tar -xvf leptonica-1.74.2.tar +gunzip leptonica-1.74.3.tar.gz +tar -xvf leptonica-1.74.3.tar @@ -115,7 +115,7 @@

Libraries, executables and prototypes are easily made, as described below. When you extract from the archive, all files are put in a - subdirectory 'leptonica-1.74.2'. In that directory you will + subdirectory 'leptonica-1.74.3'. In that directory you will find a src directory containing the source files for the library, and a prog directory containing source files for various testing and example programs. @@ -228,7 +228,7 @@

make [builds the library and shared library versions of all the progs] make install [as root; this puts liblept.a into /usr/local/lib/ - and 13 of the the progs into /usr/local/bin/ ] + and 13 of the progs into /usr/local/bin/ ] make [-j2] check [runs the alltests_reg set of regression tests. This works even if you build in a different place from the distribution. The -j parameter @@ -250,7 +250,7 @@

make install Configure also supports building in a separate directory from the - source. Run "/(path-to)/leptonica-1.74.2/configure" and then "make" + source. Run "/(path-to)/leptonica-1.74.3/configure" and then "make" from the desired build directory. Configure has a number of useful options; run "configure --help" for @@ -964,21 +964,16 @@

11. Programmatic image display - For debugging, several pixDisplay* functions in writefile.c are given. - Two (pixDisplay and pixDisplayWithTitle) can be called to display - an image using one of several display programs (xzgv, xli, xv, l_view). - If necessary to fit on the screen, the image is reduced in size, - with 1 bpp images being converted to grayscale for readability. - (This is much better than letting xv do the reduction, for example). - Another function, pixDisplayWrite(), writes images to disk under - control of a reduction/disable flag, which then allows - either viewing with pixDisplayMultiple(), or the generation - of a composite image using, for example, pixaDisplayTiledAndScaled(). - These files can also be gathered up into a compressed PDF or PostScript - file and viewed with evince. Common image display programs are: xzgv, - xli, xv, display, gthumb, gqview, evince, gv and acroread. Finally, - a set of images can be saved into a pixa (array of pix), specifying the - eventual layout into a single pix, using pixaDisplay*(). + For debugging, pixDisplay() and pixDisplayWithTitle() in writefile.c + can be called to display an image using one of several display + programs (xzgv, xli, xv, l_view). If necessary to fit on the screen, + the image is reduced in size, with 1 bpp images being converted + to grayscale for readability. Another common debug method is to + accumulate intermediate images in a pixa, and then either view these + as a mosaic (using functions in pixafunc2.c), or gather them into + a compressed PDF or PostScript file for viewing with evince. Common + image display programs are: xzgv, xli, xv, display, gthumb, gqview, + evince, gv and acroread. 12. Document image analysis @@ -1085,8 +1080,8 @@

http://code.google.com/p/leptonica, as well as all versions after 1.60. These have now been transferred by Egor Pugin to github: github.com/danbloomberg/leptonica - where all releases (1.42 - 1.74.2) are available; e.g., - https://github.com/DanBloomberg/leptonica/releases/tag/v1.74.2 + where all releases (1.42 - 1.74.3) are available; e.g., + https://github.com/DanBloomberg/leptonica/releases/tag/v1.74.3 Most recent releases from 1.67 are also available at leptonica.org/download.html Note that if you are downloading from github, the releases are more diff --git a/configure.ac b/configure.ac index 889dd69b7..745561a18 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.50]) -AC_INIT([leptonica], [1.74.2]) +AC_INIT([leptonica], [1.74.3]) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_HEADERS([config_auto.h:config/config.h.in]) AC_CONFIG_SRCDIR([src/adaptmap.c]) diff --git a/src/allheaders.h b/src/allheaders.h index adb7791a4..6abe1480b 100644 --- a/src/allheaders.h +++ b/src/allheaders.h @@ -30,7 +30,7 @@ #define LIBLEPT_MAJOR_VERSION 1 #define LIBLEPT_MINOR_VERSION 74 -#define LIBLEPT_PATCH_VERSION 2 +#define LIBLEPT_PATCH_VERSION 3 #include "alltypes.h" diff --git a/src/allheaders_top.txt b/src/allheaders_top.txt index 663289328..ca6f4ae0d 100644 --- a/src/allheaders_top.txt +++ b/src/allheaders_top.txt @@ -30,7 +30,7 @@ #define LIBLEPT_MAJOR_VERSION 1 #define LIBLEPT_MINOR_VERSION 74 -#define LIBLEPT_PATCH_VERSION 2 +#define LIBLEPT_PATCH_VERSION 3 #include "alltypes.h" diff --git a/src/makefile.static b/src/makefile.static index 505df1790..05a8eff5d 100644 --- a/src/makefile.static +++ b/src/makefile.static @@ -149,7 +149,7 @@ LIBRARIAN_SHARED = gcc -shared # .X, and , where Y is the minor revision number. MAJOR_REV = 1 MINOR_REV = 74 -PATCH_REV = 2 +PATCH_REV = 3 ######################################################### diff --git a/version-notes.html b/version-notes.html index 064723cf0..94191372e 100644 --- a/version-notes.html +++ b/version-notes.html @@ -89,6 +89,14 @@ 

 
+1.74.3  9 Jun 17
+        Coverity scan fixes.
+        Several fixes for running on Windows, including subtle one with tiff
+        encoding depending on pad bits.
+        Utility and test if a page image likely has a table.
+        Remove use of pixCreateTemplateNoInit() where it may cause problems.
+        Make release 'configure-make ready'
+
 1.74.2  19 May 17
         Many simplifications and improvements to recognizer.
         Cleanup of doxygen comments