summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Deranek <marcin.deranek@slonko.net>2024-08-31 11:55:21 +0200
committerMarcin Deranek <marcin.deranek@slonko.net>2024-08-31 11:55:21 +0200
commit941aaf2833348ff134262801287b62bf3359327d (patch)
tree6f5393358c71e6b091b19db6ad2abd1faa146ac8
parent9189bd1c4b9baf36c9b404aa6869e07d72bacaf9 (diff)
downloadportage-941aaf2833348ff134262801287b62bf3359327d.tar.gz
portage-941aaf2833348ff134262801287b62bf3359327d.tar.bz2
portage-941aaf2833348ff134262801287b62bf3359327d.zip
app-text/OCRmyPDF Address issue #1377
-rw-r--r--app-text/OCRmyPDF/Manifest3
-rw-r--r--app-text/OCRmyPDF/OCRmyPDF-16.4.3.ebuild2
-rw-r--r--app-text/OCRmyPDF/files/OCRmyPDF-16.4.3-mask.patch29
3 files changed, 33 insertions, 1 deletions
diff --git a/app-text/OCRmyPDF/Manifest b/app-text/OCRmyPDF/Manifest
index 857b581..ed7981f 100644
--- a/app-text/OCRmyPDF/Manifest
+++ b/app-text/OCRmyPDF/Manifest
@@ -1,5 +1,6 @@
+AUX OCRmyPDF-16.4.3-mask.patch 1387 BLAKE2B 97da69148f4bd3bb319842bc084ef08084b3c669911e3c70ffcd404b27cd158ef96e7d4b6b546f710db7dd2bb5c0e792e770ecee1cfdd3b585bb012050844710 SHA512 42d34d309f53e59718272dd6204e9311363b8335a9af401bff5497d18a872752d729267fc52d3937830cf6380a0ce43848fb8a06e15d1b6d5c50beaf9193c034
DIST OCRmyPDF-16.3.1.tar.gz 6691988 BLAKE2B 82fb80b18df2ddfa79314958e8e54366a6886b4a96cdfcb7a54cc87c9f380c86fa89cbe1e3039169c2bbdc9d1835ba1cbe86e3e44015d5b50b1b90e0cf7a1904 SHA512 fbd6b0d1a8fc11361c0c0548f625629a64042866618009729c3adcf66ab7ac612ad58d4f3ba419c577d9c11ea6f8b14be8918c704e86ea96a05c461c0939242d
DIST OCRmyPDF-16.4.3.tar.gz 6693677 BLAKE2B f75aa10ae857060f99b3beb0dc77d2f56e37e787b89cd74044f9d6df9333c7c6f512e2722afe4240309f1a7043a0f9e051a9d106f5d59923ad53c5415e29d6ea SHA512 4ab74d37a95ac45bd9711d9439e619471aae5dd6a75c6d7760531446f0d147c6a2d01317307c2678248c66fbd06b424df354f199d78455909af43a60c66127a5
EBUILD OCRmyPDF-16.3.1.ebuild 2275 BLAKE2B 3594b0631ce9b3b6801f992c5592601cbdd8aa5dd086328adef8e2cc7b01e156a89e1e930803f6804b2e764deeae21a7aae321c30dc2a1c75b9a0cb060cdc15a SHA512 6d8d297e094657018b06d031bca3708ea09785ac869f2c45ffe0949bf0fda86f86f9f8b410ea4602fdcf7cff210d7d88fbaf48296cb2df6b2843109ec320c594
-EBUILD OCRmyPDF-16.4.3.ebuild 2275 BLAKE2B 3594b0631ce9b3b6801f992c5592601cbdd8aa5dd086328adef8e2cc7b01e156a89e1e930803f6804b2e764deeae21a7aae321c30dc2a1c75b9a0cb060cdc15a SHA512 6d8d297e094657018b06d031bca3708ea09785ac869f2c45ffe0949bf0fda86f86f9f8b410ea4602fdcf7cff210d7d88fbaf48296cb2df6b2843109ec320c594
+EBUILD OCRmyPDF-16.4.3.ebuild 2329 BLAKE2B 361151a592c046e192df91843ca8efddd1483b45d02ccafc5cc14728b3fe0d68440a3f1396ad311d8b9475772f8da2182cf2d0715fc86c4785ff64e0eb57ded8 SHA512 6f0aec2bc902bf7121e02a7905f4346289a1bd187b60b5bea4f2c245b988625c1444153fa8a5d076e35604a75380730fb3e97f10b6cd90036d3cf30aa7c2cdc5
MISC metadata.xml 487 BLAKE2B ff83beac62a69edac41d4b7f72db5a9e2d318ca7a3aa1aceec924f3bcae7767b9a00fc29e6227371d36123c57d4ef19ebc1996789acfcf1428600076986579d1 SHA512 8677c9314d5586205d93045efb49f1495957e99bdfe69208c12dce0fd72a9261b4bfdcb05d05ffb897f0c5f6827c2ec327a569b970ac0ef9b293df2801d72fb9
diff --git a/app-text/OCRmyPDF/OCRmyPDF-16.4.3.ebuild b/app-text/OCRmyPDF/OCRmyPDF-16.4.3.ebuild
index 6ec30ad..0bb54d3 100644
--- a/app-text/OCRmyPDF/OCRmyPDF-16.4.3.ebuild
+++ b/app-text/OCRmyPDF/OCRmyPDF-16.4.3.ebuild
@@ -50,6 +50,8 @@ BDEPEND="
)
"
+PATCHES=( "${FILESDIR}/OCRmyPDF-16.4.3-mask.patch" )
+
distutils_enable_tests pytest
distutils_enable_sphinx docs \
dev-python/sphinx-issues \
diff --git a/app-text/OCRmyPDF/files/OCRmyPDF-16.4.3-mask.patch b/app-text/OCRmyPDF/files/OCRmyPDF-16.4.3-mask.patch
new file mode 100644
index 0000000..e46ae04
--- /dev/null
+++ b/app-text/OCRmyPDF/files/OCRmyPDF-16.4.3-mask.patch
@@ -0,0 +1,29 @@
+From b3324c3b4e8052176f5ec86eda1ea726894fd510 Mon Sep 17 00:00:00 2001
+From: "James R. Barlow" <james@purplerock.ca>
+Date: Sat, 31 Aug 2024 00:37:52 -0700
+Subject: [PATCH] Don't assume /Mask is always a Stream
+
+Fixes #1377
+---
+ src/ocrmypdf/pdfinfo/info.py | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/ocrmypdf/pdfinfo/info.py b/src/ocrmypdf/pdfinfo/info.py
+index 7c946906b..953af9cd5 100644
+--- a/src/ocrmypdf/pdfinfo/info.py
++++ b/src/ocrmypdf/pdfinfo/info.py
+@@ -382,8 +382,12 @@ def __init__(
+ self._height = max(smask.get(Name.Height, 0), self._height)
+ if (mask := pim.obj.get(Name.Mask, None)) is not None:
+ # If the image has a /Mask entry, it has an explicit mask.
+- self._width = max(mask.get(Name.Width, 0), self._width)
+- self._height = max(mask.get(Name.Height, 0), self._height)
++ # /Mask can be a Stream or an Array. If it's a Stream,
++ # use its /Width and /Height if they are larger than the main
++ # image's.
++ if isinstance(mask, Stream):
++ self._width = max(mask.get(Name.Width, 0), self._width)
++ self._height = max(mask.get(Name.Height, 0), self._height)
+
+ # If /ImageMask is true, then this image is a stencil mask
+ # (Images that draw with this stencil mask will have a reference to