pinkbyte 14/08/12 08:28:49 Added: jbig2enc-0.28-leptonica-1.70.patch Log: Revision bump: add compatibility patch for >=media-libs/leptonica-1.70, wrt bug #513954 (Portage version: 2.2.11-r1/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
Revision Changes Path 1.1 media-libs/jbig2enc/files/jbig2enc-0.28-leptonica-1.70.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jbig2enc/files/jbig2enc-0.28-leptonica-1.70.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jbig2enc/files/jbig2enc-0.28-leptonica-1.70.patch?rev=1.1&content-type=text/plain Index: jbig2enc-0.28-leptonica-1.70.patch =================================================================== >From 53ce5fe7e73d7ed95c9e12b52dd4984723f865fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zdenko=20Podobn=C3=BD?= <[email protected]> Date: Sun, 6 Apr 2014 21:25:27 +0200 Subject: [PATCH] fix build with leptonica 1.70 Merged upstream --- configure.ac | 1 + src/jbig2.cc | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index fe37c22..753a607 100644 --- a/configure.ac +++ b/configure.ac @@ -55,6 +55,7 @@ AC_CHECK_LIB([lept], [findFileFormatStream], [], [ echo "Error! Leptonica not detected." exit -1 ]) +AC_CHECK_FUNCS(expandBinaryPower2Low,,) # test for function - it should detect leptonica dependecies # Check for possible dependancies of leptonica. diff --git a/src/jbig2.cc b/src/jbig2.cc index e10f042..515c1ef 100644 --- a/src/jbig2.cc +++ b/src/jbig2.cc @@ -130,11 +130,16 @@ segment_image(PIX *pixb, PIX *piximg) { // input color image, so we have to do it this way... // is there a better way? // PIX *pixd = pixExpandBinary(pixd4, 4); - PIX *pixd = pixCreate(piximg->w, piximg->h, 1); - pixCopyResolution(pixd, piximg); - if (verbose) pixInfo(pixd, "mask image: "); - expandBinaryPower2Low(pixd->data, pixd->w, pixd->h, pixd->wpl, + PIX *pixd; +#ifdef HAVE_EXPANDBINARYPOWER2LOW + pixd = pixCreate(piximg->w, piximg->h, 1); + pixCopyResolution(pixd, piximg); + expandBinaryPower2Low(pixd->data, pixd->w, pixd->h, pixd->wpl, pixd4->data, pixd4->w, pixd4->h, pixd4->wpl, 4); +#else + pixd = pixExpandBinaryPower2(pixd4, 4); +#endif + if (verbose) pixInfo(pixd, "mask image: "); pixDestroy(&pixd4); pixDestroy(&pixsf4); -- 2.0.3
