From 44a5e3da40d1e7445121f6ea1d9c9bf14b1f6236 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Mon, 5 Jun 2017 10:31:04 +0200 Subject: [PATCH 1/2] Update from Leptonica 1.74.1 to 1.74.2 The newer version contains fixes for the pixUnsharpMaskingGray* functions which are relevant for Tesseract (used in ImageData::PreScale which calls pixScale). Signed-off-by: Stefan Weil --- .travis.yml | 2 +- snap/snapcraft.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6a035b250..8fe92f17c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ language: cpp dist: trusty env: - - LEPT_VER=1.74.1 + - LEPT_VER=1.74.2 notifications: email: false diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 4dd68d4a4..3fc88de56 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -30,5 +30,5 @@ parts: - libcairo2-dev after: [leptonica] leptonica: - source: http://www.leptonica.org/source/leptonica-1.74.1.tar.gz + source: http://www.leptonica.org/source/leptonica-1.74.2.tar.gz plugin: autotools From a2404ae7354f88a0e2b2abe4493362bf30a1183f Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Mon, 5 Jun 2017 13:30:49 +0200 Subject: [PATCH 2/2] Fix Travis CI for Leptonica 1.74.2 Signed-off-by: Stefan Weil --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8fe92f17c..4369e622f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,8 +45,8 @@ before_install: install: #- if [[ $LINUX && "$CXX" = "g++" ]]; then export CXX="g++-6" CC="gcc-6"; fi - if test ! -d leptonica-$LEPT_VER/src; then curl -Ls https://github.com/DanBloomberg/leptonica/archive/$LEPT_VER.tar.gz | tar -xz; fi - - if test ! -d leptonica-$LEPT_VER/build/src; then cmake -Hleptonica-$LEPT_VER -Bleptonica-$LEPT_VER/build; fi - - if test ! -e leptonica-$LEPT_VER/build/src/libleptonica.so; then make -C leptonica-$LEPT_VER/build; fi + - if test ! -d leptonica-$LEPT_VER/usr; then cmake -Hleptonica-$LEPT_VER -Bleptonica-$LEPT_VER/build -DCMAKE_INSTALL_PREFIX=leptonica-$LEPT_VER/usr; fi + - if test ! -e leptonica-$LEPT_VER/usr/lib/libleptonica.so; then make -C leptonica-$LEPT_VER/build install; fi script: - mkdir build