multimedia/ccextractor: Patched for leptonica-1.83.1.

Signed-off-by: bedlam <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
M.Dinslage 2023-03-17 20:32:18 +00:00 committed by Willy Sudiarto Raharjo
parent b583f65d21
commit 78d514145f
No known key found for this signature in database
GPG key ID: 3F617144D7238786
2 changed files with 43 additions and 2 deletions

View file

@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=ccextractor PRGNAM=ccextractor
VERSION=${VERSION:-0.94} VERSION=${VERSION:-0.94}
BUILD=${BUILD:-2} BUILD=${BUILD:-3}
TAG=${TAG:-_SBo} TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz} PKGTYPE=${PKGTYPE:-tgz}
@ -71,7 +71,7 @@ mkdir -p $TMP $PKG $OUTPUT
cd $TMP cd $TMP
rm -rf $PRGNAM-$VERSION rm -rf $PRGNAM-$VERSION
tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION/linux cd $PRGNAM-$VERSION
chown -R root:root . chown -R root:root .
find -L . \ find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@ -79,9 +79,14 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Fix compiling with new leptonica
patch -p1 < $CWD/leptonica-1.83.1.patch
CFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \
cd linux
./autogen.sh ./autogen.sh
sed -i 's/-llept/-lleptonica/g' configure
./configure \ ./configure \
--prefix=/usr \ --prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \ --libdir=/usr/lib${LIBDIRSUFFIX} \

View file

@ -0,0 +1,36 @@
diff -up ccextractor-0.94/src/lib_ccx/ocr.c.orig ccextractor-0.94/src/lib_ccx/ocr.c
--- ccextractor-0.94/src/lib_ccx/ocr.c.orig 2023-03-16 18:58:34.902356675 -0500
+++ ccextractor-0.94/src/lib_ccx/ocr.c 2023-03-16 19:00:33.481092541 -0500
@@ -1,10 +1,10 @@
#include <math.h>
-#include "png.h"
+#include <png.h>
#include "lib_ccx.h"
#ifdef ENABLE_OCR
#include <tesseract/capi.h>
-#include "ccx_common_constants.h"
#include <leptonica/allheaders.h>
+#include "ccx_common_constants.h"
#include <dirent.h>
#include "ccx_encoders_helpers.h"
#include "ocr.h"
@@ -331,6 +331,8 @@ char *ocr_bitmap(void *arg, png_color *p
}
BOX *crop_points = ignore_alpha_at_edge(copy->alpha, copy->data, w, h, color_pix, &color_pix_out);
+ l_int32 x, y, _w, _h;
+ boxGetGeometry(crop_points, &x, &y, &_w, &_h);
// Converting image to grayscale for OCR to avoid issues with transparency
cpix_gs = pixConvertRGBToGray(cpix, 0.0, 0.0, 0.0);
@@ -426,8 +428,8 @@ char *ocr_bitmap(void *arg, png_color *p
{
for (int j = x1; j <= x2; j++)
{
- if (copy->data[(crop_points->y + i) * w + (crop_points->x + j)] != firstpixel)
- histogram[copy->data[(crop_points->y + i) * w + (crop_points->x + j)]]++;
+ if (copy->data[(y + i) * w + (x + j)] != firstpixel)
+ histogram[copy->data[(y + i) * w + (x + j)]]++;
}
}
/* sorted in increasing order of intensity */