Skip to content

Commit

Permalink
Update leptonica versioning to 1.74-3, in prep for a new version on g…
Browse files Browse the repository at this point in the history
…ithub
  • Loading branch information
DanBloomberg committed Jun 9, 2017
1 parent b54c6ce commit d4a61eb
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 28 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
41 changes: 18 additions & 23 deletions README.html
Original file line number Diff line number Diff line change
Expand Up @@ -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

</pre>

Expand Down Expand Up @@ -115,7 +115,7 @@ <h2> <A NAME="BUILDING">
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.
Expand Down Expand Up @@ -228,7 +228,7 @@ <h2> <A NAME="BUILDING">
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
Expand All @@ -250,7 +250,7 @@ <h2> <A NAME="BUILDING">
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
Expand Down Expand Up @@ -964,21 +964,16 @@ <h2> <A NAME="CONTENTS">

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

Expand Down Expand Up @@ -1085,8 +1080,8 @@ <h2> <A NAME="CONTENTS">
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
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -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])
Expand Down
2 changes: 1 addition & 1 deletion src/allheaders.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion src/allheaders_top.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion src/makefile.static
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ LIBRARIAN_SHARED = gcc -shared
# <libname>.X, and <libname>, where Y is the minor revision number.
MAJOR_REV = 1
MINOR_REV = 74
PATCH_REV = 2
PATCH_REV = 3

#########################################################

Expand Down
8 changes: 8 additions & 0 deletions version-notes.html
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,14 @@ <h2 align=center> <IMG SRC="moller52.jpg" border=1 ALIGN_MIDDLE> </h2>

<pre>

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
Expand Down

0 comments on commit d4a61eb

Please sign in to comment.