[gentoo-commits] repo/gentoo:master commit in: media-libs/libharu/

[Yixun Lan]

commit: 05d951037a8f736a03970b006d27f9addd6d013b
Author: Yixun Lan  gentoo  org>
AuthorDate: Mon Jan 16 05:49:49 2023 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Mon Jan 16 05:51:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05d95103

media-libs/libharu: keyword 2.4.2-r1 for ~riscv

Signed-off-by: Yixun Lan  gentoo.org>

 media-libs/libharu/libharu-2.4.2-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/libharu/libharu-2.4.2-r1.ebuild 
b/media-libs/libharu/libharu-2.4.2-r1.ebuild
index 87d12f16350b..43e42b04abad 100644
--- a/media-libs/libharu/libharu-2.4.2-r1.ebuild
+++ b/media-libs/libharu/libharu-2.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
media-libs/libpng:=

[gentoo-commits] repo/gentoo:master commit in: media-libs/libharu/, media-libs/libharu/files/

[Andreas Sturmlechner]

commit: a78e7d2c89119f5e2a61ee23b2d9107a4884418f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec 21 08:11:13 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Dec 22 20:04:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a78e7d2c

media-libs/libharu: drop 2.3.0-r3

Closes: https://bugs.gentoo.org/887565
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-libs/libharu/Manifest|   1 -
 ...void-issue-with-libtiff-duplicate-symbols.patch |  89 
 .../files/libharu-2.3.0-3-cmake-fixes.patch| 177 ---
 ...rt-for-free-form-triangle-Shading-objects.patch | 530 -
 media-libs/libharu/libharu-2.3.0-r3.ebuild |  38 --
 5 files changed, 835 deletions(-)

diff --git a/media-libs/libharu/Manifest b/media-libs/libharu/Manifest
index 646b79914b60..67053a4772dc 100644
--- a/media-libs/libharu/Manifest
+++ b/media-libs/libharu/Manifest
@@ -1,2 +1 @@
-DIST libharu-2.3.0.tar.gz 1396413 BLAKE2B 
7f0c819f17740f12f9bf6c7a7c749eb8c6ada326d98985daeac4d3250733cfc8e085b540e0969cb1b4c3b1055f4d1e148a2ed010d9371685fd265b62a879be9c
 SHA512 
ebcabf1e8488e21185a231e97b4c16f9de742ae0ac2ebc7535b72b6b8e2045c2619bc6a94a820f7f923b0dfeceb217408f4e4c613ef3602104373cdf000d3f41
 DIST libharu-2.4.2.tar.gz 1411029 BLAKE2B 
8618803022cc2c745d2517f71cf9da49eeefe16b05c486a5ecaa6ec09f6fb7e0dbe3af6d12018bf1c81d3a06c3be1446617e634ab21ea25a68ee9f9d645b65cb
 SHA512 
faa5c0390f22ae8bbe3dbc2b49e49b475257a70c5772e456cc34df3f98b26e39b65b17b0f982dd844b9774a4217a621337a1a8a810d7be09569a7bffe4ea1f15

diff --git 
a/media-libs/libharu/files/libharu-2.3.0-2-Avoid-issue-with-libtiff-duplicate-symbols.patch
 
b/media-libs/libharu/files/libharu-2.3.0-2-Avoid-issue-with-libtiff-duplicate-symbols.patch
deleted file mode 100644
index 78a56f6eb33c..
--- 
a/media-libs/libharu/files/libharu-2.3.0-2-Avoid-issue-with-libtiff-duplicate-symbols.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From c1ecbf1bd286e26572fc0fd7a49d06774d6436f7 Mon Sep 17 00:00:00 2001
-From: Bruno Virlet 
-Date: Thu, 30 Nov 2017 12:19:37 +0100
-Subject: [PATCH 2/4] Avoid issue with libtiff duplicate symbols
-
-To achieve this, I move the G3CODES #define to pdf_conf.h so that anyone
-who builds the project has more control.

- include/hpdf_conf.h| 3 ++-
- src/hpdf_image_ccitt.c | 9 -
- src/t4.h   | 6 --
- 3 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/include/hpdf_conf.h b/include/hpdf_conf.h
-index d25b464..27d1dff 100644
 a/include/hpdf_conf.h
-+++ b/include/hpdf_conf.h
-@@ -78,8 +78,9 @@
- 
- /* alignment size of memory-pool-object
-  */
--#define HPDF_ALIGN_SIZ  sizeof int;
-+#define HPDF_ALINMENT_SIZ  sizeof(int)
- 
-+#define G3CODES
- 
- #endif /* _HPDF_CONF_H */
- 
-diff --git a/src/hpdf_image_ccitt.c b/src/hpdf_image_ccitt.c
-index 8672763..939b0b5 100644
 a/src/hpdf_image_ccitt.c
-+++ b/src/hpdf_image_ccitt.c
-@@ -21,7 +21,6 @@
- #include 
- #include 
- 
--#define   G3CODES
- #include "t4.h"
- 
- typedef unsigned int uint32;
-@@ -578,11 +577,11 @@ HPDF_Fax3Encode2DRow(struct _HPDF_CCITT_Data *pData, 
unsigned char* bp, unsigned
-   a2 = finddiff2(bp, a1, bits, PIXEL(bp,a1));
-   putcode(pData, );
-   if (a0+a1 == 0 || PIXEL(bp, a0) == 0) {
--  putspan(pData, a1-a0, 
TIFFFaxWhiteCodes);
--  putspan(pData, a2-a1, 
TIFFFaxBlackCodes);
-+  putspan(pData, a1-a0, 
HPDF_TIFFFaxWhiteCodes);
-+  putspan(pData, a2-a1, 
HPDF_TIFFFaxBlackCodes);
-   } else {
--  putspan(pData, a1-a0, 
TIFFFaxBlackCodes);
--  putspan(pData, a2-a1, 
TIFFFaxWhiteCodes);
-+  putspan(pData, a1-a0, 
HPDF_TIFFFaxBlackCodes);
-+  putspan(pData, a2-a1, 
HPDF_TIFFFaxWhiteCodes);
-   }
-   a0 = a2;
-   } else {/* vertical mode */
-diff --git a/src/t4.h b/src/t4.h
-index f306e15..c4c8c0d 100644
 a/src/t4.h
-+++ b/src/t4.h
-@@ -55,7 +55,7 @@ typedef struct tableentry {
-  * during state generation (see mkg3states.c).
-  */
- #ifdef G3CODES
--const tableentry TIFFFaxWhiteCodes[] = {
-+const tableentry HPDF_TIFFFaxWhiteCodes[] = {
- { 8, 0x35, 0 },   /* 0011 0101 */
- { 6, 0x7, 1 },/* 0001 11 */
- { 4, 0x7, 2 },/* 0111 */
-@@ -167,7 +167,7 @@ const tableentry TIFFFaxWhiteCodes[] = {
- { 12, 0x0, G3CODE_INVALID },  /*    */
- };
- 
--const tableentry TIFFFaxBlackCodes[] = {
-+const tableentry HPDF_TIFFFaxBlackCodes[] = {
- { 10, 0x37, 0 },  /*  1101 11 */
- 

[gentoo-commits] repo/gentoo:master commit in: media-libs/libharu/

[Sam James]

commit: 2dfc3ef256d8e65ad623a158b3355418b272eb01
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 20 23:30:03 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 20 23:30:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dfc3ef2

media-libs/libharu: Stabilize 2.4.2-r1 x86, #887565

Signed-off-by: Sam James  gentoo.org>

 media-libs/libharu/libharu-2.4.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libharu/libharu-2.4.2-r1.ebuild 
b/media-libs/libharu/libharu-2.4.2-r1.ebuild
index 005f7d049d05..87d12f16350b 100644
--- a/media-libs/libharu/libharu-2.4.2-r1.ebuild
+++ b/media-libs/libharu/libharu-2.4.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
media-libs/libpng:=

[gentoo-commits] repo/gentoo:master commit in: media-libs/libharu/

[Sam James]

commit: 79752190d705242782a27116815ceaae450a110c
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 20 23:29:14 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 20 23:29:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79752190

media-libs/libharu: Stabilize 2.4.2-r1 amd64, #887565

Signed-off-by: Sam James  gentoo.org>

 media-libs/libharu/libharu-2.4.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libharu/libharu-2.4.2-r1.ebuild 
b/media-libs/libharu/libharu-2.4.2-r1.ebuild
index f2b0b6e75843..005f7d049d05 100644
--- a/media-libs/libharu/libharu-2.4.2-r1.ebuild
+++ b/media-libs/libharu/libharu-2.4.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
media-libs/libpng:=

[gentoo-commits] repo/gentoo:master commit in: media-libs/libharu/

[Sam James]

commit: 97dcd74cbe91d7baf7db793290943b943cbc33d7
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 20 23:27:49 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 20 23:27:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97dcd74c

media-libs/libharu: Stabilize 2.4.2-r1 ppc, #887565

Signed-off-by: Sam James  gentoo.org>

 media-libs/libharu/libharu-2.4.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libharu/libharu-2.4.2-r1.ebuild 
b/media-libs/libharu/libharu-2.4.2-r1.ebuild
index 92b8e3624a99..f2b0b6e75843 100644
--- a/media-libs/libharu/libharu-2.4.2-r1.ebuild
+++ b/media-libs/libharu/libharu-2.4.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
media-libs/libpng:=

[gentoo-commits] repo/gentoo:master commit in: media-libs/libharu/

[Sam James]

commit: 19fb0caa1850b23a25c3e693d52ae178c9912d7d
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 19:06:25 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 19:06:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19fb0caa

media-libs/libharu: drop multilib

No multilib reverse dependencies.

Signed-off-by: Sam James  gentoo.org>

 .../libharu/{libharu-2.3.0-r2.ebuild => libharu-2.3.0-r3.ebuild} | 9 -
 .../libharu/{libharu-2.4.2.ebuild => libharu-2.4.2-r1.ebuild}| 9 -
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/media-libs/libharu/libharu-2.3.0-r2.ebuild 
b/media-libs/libharu/libharu-2.3.0-r3.ebuild
similarity index 86%
rename from media-libs/libharu/libharu-2.3.0-r2.ebuild
rename to media-libs/libharu/libharu-2.3.0-r3.ebuild
index 5e62094e2a17..60153140f9a5 100644
--- a/media-libs/libharu/libharu-2.3.0-r2.ebuild
+++ b/media-libs/libharu/libharu-2.3.0-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 MYP=RELEASE_${PV//./_}
-inherit cmake-multilib
+inherit cmake
 
 DESCRIPTION="C/C++ library for PDF generation"
 HOMEPAGE="http://www.libharu.org/;
@@ -13,11 +13,10 @@ 
SRC_URI="https://github.com/${PN}/${PN}/archive/${MYP}.tar.gz -> ${P}.tar.gz"
 LICENSE="ZLIB"
 SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 DEPEND="
-   media-libs/libpng:0=[${MULTILIB_USEDEP}]
-   sys-libs/zlib:=[${MULTILIB_USEDEP}]
+   media-libs/libpng:=
+   sys-libs/zlib:=
 "
 RDEPEND="${DEPEND}"
 
@@ -30,7 +29,7 @@ PATCHES=(

"${FILESDIR}"/${P}-4-Add-support-for-free-form-triangle-Shading-objects.patch
 )
 
-multilib_src_configure() {
+src_configure() {
local mycmakeargs=(
-DLIBHPDF_EXAMPLES=NO # Doesn't work
-DLIBHPDF_STATIC=NO

diff --git a/media-libs/libharu/libharu-2.4.2.ebuild 
b/media-libs/libharu/libharu-2.4.2-r1.ebuild
similarity index 81%
rename from media-libs/libharu/libharu-2.4.2.ebuild
rename to media-libs/libharu/libharu-2.4.2-r1.ebuild
index 87d3e0fccb63..92b8e3624a99 100644
--- a/media-libs/libharu/libharu-2.4.2.ebuild
+++ b/media-libs/libharu/libharu-2.4.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake-multilib
+inherit cmake
 
 DESCRIPTION="C/C++ library for PDF generation"
 HOMEPAGE="http://www.libharu.org/;
@@ -12,11 +12,10 @@ 
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="ZLIB"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 DEPEND="
-   media-libs/libpng:0=[${MULTILIB_USEDEP}]
-   sys-libs/zlib:=[${MULTILIB_USEDEP}]
+   media-libs/libpng:=
+   sys-libs/zlib:=
 "
 RDEPEND="${DEPEND}"
 
@@ -24,7 +23,7 @@ PATCHES=(

"${FILESDIR}"/${PN}-2.3.0-1-Included-necessary-char-widths-in-generated-PDF.patch
 )
 
-multilib_src_configure() {
+src_configure() {
local mycmakeargs=(
-DLIBHPDF_EXAMPLES=NO # Doesn't work
-DLIBHPDF_STATIC=NO

[gentoo-commits] repo/gentoo:master commit in: media-libs/libharu/

[Andrew Ammerlaan]

commit: 4dd26c1de415c8aeb46632ad362866c2386a988e
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Oct  5 13:53:21 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Wed Oct  5 13:53:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dd26c1d

media-libs/libharu: add 2.4.2

Closes: https://bugs.gentoo.org/875140
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 media-libs/libharu/Manifest |  1 +
 media-libs/libharu/libharu-2.4.2.ebuild | 33 +
 2 files changed, 34 insertions(+)

diff --git a/media-libs/libharu/Manifest b/media-libs/libharu/Manifest
index 0527ce9fcfab..646b79914b60 100644
--- a/media-libs/libharu/Manifest
+++ b/media-libs/libharu/Manifest
@@ -1 +1,2 @@
 DIST libharu-2.3.0.tar.gz 1396413 BLAKE2B 
7f0c819f17740f12f9bf6c7a7c749eb8c6ada326d98985daeac4d3250733cfc8e085b540e0969cb1b4c3b1055f4d1e148a2ed010d9371685fd265b62a879be9c
 SHA512 
ebcabf1e8488e21185a231e97b4c16f9de742ae0ac2ebc7535b72b6b8e2045c2619bc6a94a820f7f923b0dfeceb217408f4e4c613ef3602104373cdf000d3f41
+DIST libharu-2.4.2.tar.gz 1411029 BLAKE2B 
8618803022cc2c745d2517f71cf9da49eeefe16b05c486a5ecaa6ec09f6fb7e0dbe3af6d12018bf1c81d3a06c3be1446617e634ab21ea25a68ee9f9d645b65cb
 SHA512 
faa5c0390f22ae8bbe3dbc2b49e49b475257a70c5772e456cc34df3f98b26e39b65b17b0f982dd844b9774a4217a621337a1a8a810d7be09569a7bffe4ea1f15

diff --git a/media-libs/libharu/libharu-2.4.2.ebuild 
b/media-libs/libharu/libharu-2.4.2.ebuild
new file mode 100644
index ..87d3e0fccb63
--- /dev/null
+++ b/media-libs/libharu/libharu-2.4.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="C/C++ library for PDF generation"
+HOMEPAGE="http://www.libharu.org/;
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="
+   media-libs/libpng:0=[${MULTILIB_USEDEP}]
+   sys-libs/zlib:=[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   
"${FILESDIR}"/${PN}-2.3.0-1-Included-necessary-char-widths-in-generated-PDF.patch
+)
+
+multilib_src_configure() {
+   local mycmakeargs=(
+   -DLIBHPDF_EXAMPLES=NO # Doesn't work
+   -DLIBHPDF_STATIC=NO
+   )
+   cmake_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: media-libs/libharu/

[Sam James]

commit: 6b7e90b30d4c2e479ddd6df22b481cc41d2e51a3
Author: Roy Bamford  gentoo  org>
AuthorDate: Sun Feb 14 22:05:54 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 22 18:55:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b7e90b3

media-libs/libharu: added ~arm64

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Roy Bamford  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 media-libs/libharu/libharu-2.3.0-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/libharu/libharu-2.3.0-r2.ebuild 
b/media-libs/libharu/libharu-2.3.0-r2.ebuild
index 7542d93ed89..5e6deb88198 100644
--- a/media-libs/libharu/libharu-2.3.0-r2.ebuild
+++ b/media-libs/libharu/libharu-2.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${MYP}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/libharu/

[Sam James]

commit: f784ad34d0e9eef84499424e6753239a379e1eb1
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 16 01:00:17 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 16 01:01:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f784ad34

media-libs/libharu: arm keyworded (bug #649054)

Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 media-libs/libharu/libharu-2.3.0-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/libharu/libharu-2.3.0-r2.ebuild 
b/media-libs/libharu/libharu-2.3.0-r2.ebuild
index 0a5c2ae4ad1..7542d93ed89 100644
--- a/media-libs/libharu/libharu-2.3.0-r2.ebuild
+++ b/media-libs/libharu/libharu-2.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${MYP}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/libharu/

[Andreas Sturmlechner]

commit: 9e5836d54ba3be74788c613b3dc1371aa11d5e0a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Nov 29 10:02:07 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Nov 29 10:04:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e5836d5

media-libs/libharu: Actually call multilib_src_configure

Package-Manager: Portage-2.3.80, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-libs/libharu/libharu-2.3.0-r2.ebuild | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/media-libs/libharu/libharu-2.3.0-r2.ebuild 
b/media-libs/libharu/libharu-2.3.0-r2.ebuild
index aec8e3bf620..0d2427edfda 100644
--- a/media-libs/libharu/libharu-2.3.0-r2.ebuild
+++ b/media-libs/libharu/libharu-2.3.0-r2.ebuild
@@ -31,7 +31,10 @@ PATCHES=(

"${FILESDIR}"/${P}-4-Add-support-for-free-form-triangle-Shading-objects.patch
 )
 
-mycmakeargs=(
-   -DLIBHPDF_EXAMPLES=NO # Doesn't work
-   -DLIBHPDF_STATIC=NO
-)
+multilib_src_configure() {
+   local mycmakeargs=(
+   -DLIBHPDF_EXAMPLES=NO # Doesn't work
+   -DLIBHPDF_STATIC=NO
+   )
+   cmake-utils_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: media-libs/libharu/

[Andreas Sturmlechner]

commit: 0b1826530b1060d6754af2d8c8b983d58283321e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Nov 29 09:52:45 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Nov 29 09:53:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b182653

media-libs/libharu: EAPI-7 bump

Package-Manager: Portage-2.3.80, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-libs/libharu/libharu-2.3.0-r2.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-libs/libharu/libharu-2.3.0-r2.ebuild 
b/media-libs/libharu/libharu-2.3.0-r2.ebuild
index 057e405312a..aec8e3bf620 100644
--- a/media-libs/libharu/libharu-2.3.0-r2.ebuild
+++ b/media-libs/libharu/libharu-2.3.0-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-multilib
 
@@ -18,7 +18,8 @@ IUSE=""
 
 DEPEND="
media-libs/libpng:0=[${MULTILIB_USEDEP}]
-   sys-libs/zlib:=[${MULTILIB_USEDEP}]"
+   sys-libs/zlib:=[${MULTILIB_USEDEP}]
+"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-${MYP}"
@@ -33,5 +34,4 @@ PATCHES=(
 mycmakeargs=(
-DLIBHPDF_EXAMPLES=NO # Doesn't work
-DLIBHPDF_STATIC=NO
-   -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
 )

[gentoo-commits] repo/gentoo:master commit in: media-libs/libharu/, media-libs/libharu/files/

[Andreas Sturmlechner]

commit: 9626991db1a7cf7ebaa8747965fc0dce71847b08
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jun 12 11:11:48 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun 12 12:09:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9626991d

media-libs/libharu: Drop 2.3.0-r1

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/libharu-2.3.0-dont-force-strip.patch | 22 -
 media-libs/libharu/libharu-2.3.0-r1.ebuild | 36 --
 2 files changed, 58 deletions(-)

diff --git a/media-libs/libharu/files/libharu-2.3.0-dont-force-strip.patch 
b/media-libs/libharu/files/libharu-2.3.0-dont-force-strip.patch
deleted file mode 100644
index 393302bce23..000
--- a/media-libs/libharu/files/libharu-2.3.0-dont-force-strip.patch
+++ /dev/null
@@ -1,22 +0,0 @@
 configure.in.orig  2014-02-19 12:22:46.954651117 -0800
-+++ configure.in   2014-02-19 12:22:37.211604308 -0800
-@@ -171,11 +171,6 @@
- 
-   fi
- 
--  dnl Do not strip symbols from developer object files.
--  INSTALL_STRIP_FLAG=""
--else
--  dnl Make sure to strip symbols from non-developer object files.
--  INSTALL_STRIP_FLAG="-s"
- fi
- dnl }}}
- 
-@@ -322,7 +317,6 @@
- 
- dnl link against libm
- LIBS="$LIBS -lm"
--AC_SUBST(INSTALL_STRIP_FLAG)
- 
- AC_CONFIG_FILES([Makefile src/Makefile include/Makefile])
- AC_OUTPUT

diff --git a/media-libs/libharu/libharu-2.3.0-r1.ebuild 
b/media-libs/libharu/libharu-2.3.0-r1.ebuild
deleted file mode 100644
index 1f1764eb687..000
--- a/media-libs/libharu/libharu-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils multilib-minimal
-
-MYP=RELEASE_${PV//./_}
-
-DESCRIPTION="C/C++ library for PDF generation"
-HOMEPAGE="http://www.libharu.org/;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MYP}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="png static-libs zlib"
-
-DEPEND="
-   png? ( >=media-libs/libpng-1.2.51[${MULTILIB_USEDEP}] )
-   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MYP}"
-
-PATCHES=( "${FILESDIR}"/${P}-dont-force-strip.patch )
-
-multilib_src_configure() {
-   local myeconfargs=(
-   $(use_with png png "${EPREFIX}"/usr)
-   $(use_with zlib)
-   )
-   autotools-utils_src_configure
-}

[gentoo-commits] repo/gentoo:master commit in: media-libs/libharu/

[Thomas Deutschmann]

commit: 78962f2f7323bb008cb69d7ddc86d1c13720be23
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun May 19 15:05:44 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun May 19 15:05:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78962f2f

media-libs/libharu: x86 stable (bug #681530)

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-libs/libharu/libharu-2.3.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libharu/libharu-2.3.0-r2.ebuild 
b/media-libs/libharu/libharu-2.3.0-r2.ebuild
index 093e5baba57..057e405312a 100644
--- a/media-libs/libharu/libharu-2.3.0-r2.ebuild
+++ b/media-libs/libharu/libharu-2.3.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${MYP}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/libharu/

[Agostino Sarubbo]

commit: 9971df14b7297a9b20df5509f4130cf58f4af1ca
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Apr 13 19:09:47 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Apr 13 19:09:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9971df14

media-libs/libharu: amd64 stable wrt bug #681530

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 media-libs/libharu/libharu-2.3.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libharu/libharu-2.3.0-r2.ebuild 
b/media-libs/libharu/libharu-2.3.0-r2.ebuild
index 5a8a1a39564..f5e6b9f275f 100644
--- a/media-libs/libharu/libharu-2.3.0-r2.ebuild
+++ b/media-libs/libharu/libharu-2.3.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${MYP}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/libharu/

[Sergei Trofimovich]

commit: 2cef358e896f3831f16b32b40c3b621763c14b3e
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Feb 17 17:41:39 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Feb 17 17:46:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cef358e

media-libs/libharu: keyworded 2.3.0-r2 for ppc64, bug #674736

Tested-by: ernsteiswuerfel
Package-Manager: Portage-2.3.60, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-libs/libharu/libharu-2.3.0-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/libharu/libharu-2.3.0-r2.ebuild 
b/media-libs/libharu/libharu-2.3.0-r2.ebuild
index 37c65b82687..5a8a1a39564 100644
--- a/media-libs/libharu/libharu-2.3.0-r2.ebuild
+++ b/media-libs/libharu/libharu-2.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${MYP}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/libharu/files/, media-libs/libharu/

[David Seifert]

commit: d4933b130cf9f278279e18d99ccbecd121b0e733
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Wed Jan 24 09:13:19 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Jan 24 19:52:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4933b13

media-libs/libharu: Add vtk compat patch

VTK 8.1.0 and above need support for free form triangle shading.
This patch helps prevent having two different copies of libharu
installed on a system

Add GNUInstallDirs fixes
Make generated PDF size smaller
Avoid issues with tiff duplicate symbols
Closes: https://github.com/gentoo/gentoo/pull/6932

 ...ed-necessary-char-widths-in-generated-PDF.patch | 248 ++
 ...void-issue-with-libtiff-duplicate-symbols.patch |  89 
 .../files/libharu-2.3.0-3-cmake-fixes.patch| 177 +++
 ...rt-for-free-form-triangle-Shading-objects.patch | 530 +
 media-libs/libharu/libharu-2.3.0-r2.ebuild |  37 ++
 5 files changed, 1081 insertions(+)

diff --git 
a/media-libs/libharu/files/libharu-2.3.0-1-Included-necessary-char-widths-in-generated-PDF.patch
 
b/media-libs/libharu/files/libharu-2.3.0-1-Included-necessary-char-widths-in-generated-PDF.patch
new file mode 100644
index 000..83ce9ca93e9
--- /dev/null
+++ 
b/media-libs/libharu/files/libharu-2.3.0-1-Included-necessary-char-widths-in-generated-PDF.patch
@@ -0,0 +1,248 @@
+From 16c09856508abbf059ed94b9234b28143025318b Mon Sep 17 00:00:00 2001
+From: Jonathan Scruggs 
+Date: Wed, 24 Jan 2018 10:09:02 +
+Subject: [PATCH 1/4] Included necessary char widths in generated PDF
+
+* /W and /CIDToGIDMap can be created in the before_write_fn
+
+* Only add width for actually used glyphs to the /W array
+
+* Try reducing the size of the /CIDToGIDMap.
+
+Only care about actually used glyphs, so that
+a) the length of the array can be reduced,
+b) unused entries can be easily compressed as they are
+   zeroed out.
+---
+ src/hpdf_font_cid.c | 139 
+ 1 file changed, 75 insertions(+), 64 deletions(-)
+
+diff --git a/src/hpdf_font_cid.c b/src/hpdf_font_cid.c
+index d1c1a82..5ab3b28 100644
+--- a/src/hpdf_font_cid.c
 b/src/hpdf_font_cid.c
+@@ -346,19 +346,14 @@ CIDFontType2_New (HPDF_Font parent, HPDF_Xref xref)
+ HPDF_STATUS ret = HPDF_OK;
+ HPDF_FontAttr attr = (HPDF_FontAttr)parent->attr;
+ HPDF_FontDef fontdef = attr->fontdef;
+-HPDF_TTFontDefAttr fontdef_attr = (HPDF_TTFontDefAttr)fontdef->attr;
+ HPDF_Encoder encoder = attr->encoder;
+ HPDF_CMapEncoderAttr encoder_attr =
+ (HPDF_CMapEncoderAttr)encoder->attr;
+ 
+ HPDF_Font font;
+ HPDF_Array array;
+-HPDF_UINT i;
+-HPDF_UNICODE tmp_map[65536];
+ HPDF_Dict cid_system_info;
+ 
+-HPDF_UINT16 max = 0;
+-
+ HPDF_PTRACE ((" HPDF_CIDFontType2_New\n"));
+ 
+ font = HPDF_Dict_New (parent->mmgr);
+@@ -388,11 +383,55 @@ CIDFontType2_New (HPDF_Font parent, HPDF_Xref xref)
+ ret += HPDF_Array_AddNumber (array, 
(HPDF_INT32)(fontdef->font_bbox.bottom -
+ fontdef->font_bbox.top));
+ 
+-HPDF_MemSet (tmp_map, 0, sizeof(HPDF_UNICODE) * 65536);
++/* create CIDSystemInfo dictionary */
++cid_system_info = HPDF_Dict_New (parent->mmgr);
++if (!cid_system_info)
++return NULL;
++
++if (HPDF_Dict_Add (font, "CIDSystemInfo", cid_system_info) != HPDF_OK)
++return NULL;
++
++ret += HPDF_Dict_Add (cid_system_info, "Registry",
++HPDF_String_New (parent->mmgr, encoder_attr->registry, NULL));
++ret += HPDF_Dict_Add (cid_system_info, "Ordering",
++HPDF_String_New (parent->mmgr, encoder_attr->ordering, NULL));
++ret += HPDF_Dict_AddNumber (cid_system_info, "Supplement",
++encoder_attr->suppliment);
+ 
+ if (ret != HPDF_OK)
+ return NULL;
+ 
++return font;
++}
++
++
++static HPDF_STATUS
++CIDFontType2_BeforeWrite_Func  (HPDF_Dict obj)
++{
++HPDF_FontAttr font_attr = (HPDF_FontAttr)obj->attr;
++HPDF_FontDef def = font_attr->fontdef;
++HPDF_TTFontDefAttr def_attr = (HPDF_TTFontDefAttr)def->attr;
++HPDF_STATUS ret = 0;
++
++HPDF_Font font;
++HPDF_Encoder encoder = font_attr->encoder;
++HPDF_CMapEncoderAttr encoder_attr =
++(HPDF_CMapEncoderAttr)encoder->attr;
++
++HPDF_Array array;
++HPDF_UINT i;
++HPDF_UNICODE tmp_map[65536];
++HPDF_UINT16 max = 0;
++
++
++HPDF_PTRACE ((" CIDFontType2_BeforeWrite_Func\n"));
++
++font = font_attr->descendant_font;
++HPDF_MemSet (tmp_map, 0, sizeof(HPDF_UNICODE) * 65536);
++
++if (ret != HPDF_OK)
++return ret;
++
+ for (i = 0; i < 256; i++) {
+ HPDF_UINT j;
+ 
+@@ -401,66 +440,70 @@ CIDFontType2_New (HPDF_Font parent, HPDF_Xref xref)
+   HPDF_UINT16 cid = encoder_attr->cid_map[i][j];
+   if (cid != 0) {
+   HPDF_UNICODE unicode = 

[gentoo-commits] repo/gentoo:master commit in: media-libs/libharu/files/

[David Seifert]

commit: 3edea8b85c390e2bee187d009c834eda9d46ac3a
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Fri Dec 23 16:08:13 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Dec 29 13:11:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3edea8b8

media-libs/libharu: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/3224

 .../libharu/files/libharu-2.2.1-libpng-1.5.patch   | 344 -
 1 file changed, 344 deletions(-)

diff --git a/media-libs/libharu/files/libharu-2.2.1-libpng-1.5.patch 
b/media-libs/libharu/files/libharu-2.2.1-libpng-1.5.patch
deleted file mode 100644
index d59f78f..
--- a/media-libs/libharu/files/libharu-2.2.1-libpng-1.5.patch
+++ /dev/null
@@ -1,344 +0,0 @@
-diff --git a/src/hpdf_image_png.c b/src/hpdf_image_png.c
-index b8f831e..85bd29f 100644
 a/src/hpdf_image_png.c
-+++ b/src/hpdf_image_png.c
-@@ -109,14 +109,15 @@ ReadPngData_Interlaced  (HPDF_Dictimage,
-  png_infopinfo_ptr)
- {
- png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr);
-+png_uint_32 height = png_get_image_height(png_ptr, info_ptr);
- png_bytep* row_pointers = HPDF_GetMem (image->mmgr,
--info_ptr->height * sizeof (png_bytep));
-+height * sizeof (png_bytep));
- 
- if (row_pointers) {
- HPDF_UINT i;
- 
--HPDF_MemSet (row_pointers, 0, info_ptr->height * sizeof (png_bytep));
--for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
-+HPDF_MemSet (row_pointers, 0, height * sizeof (png_bytep));
-+for (i = 0; i < (HPDF_UINT)height; i++) {
- row_pointers[i] = HPDF_GetMem (image->mmgr, len);
- 
- if (image->error->error_no != HPDF_OK)
-@@ -126,7 +127,7 @@ ReadPngData_Interlaced  (HPDF_Dictimage,
- if (image->error->error_no == HPDF_OK) {
- png_read_image(png_ptr, row_pointers);
- if (image->error->error_no == HPDF_OK) {   /* add this line */
--for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
-+for (i = 0; i < (HPDF_UINT)height; i++) {
- if (HPDF_Stream_Write (image->stream, row_pointers[i], 
len) !=
- HPDF_OK)
- break;
-@@ -135,7 +136,7 @@ ReadPngData_Interlaced  (HPDF_Dictimage,
- }
- 
- /* clean up */
--for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
-+for (i = 0; i < (HPDF_UINT)height; i++) {
- HPDF_FreeMem (image->mmgr, row_pointers[i]);
- }
- 
-@@ -151,12 +152,13 @@ ReadPngData  (HPDF_Dictimage,
-   png_infopinfo_ptr)
- {
- png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr);
-+png_uint_32 height = png_get_image_height(png_ptr, info_ptr);
- png_bytep buf_ptr = HPDF_GetMem (image->mmgr, len);
- 
- if (buf_ptr) {
- HPDF_UINT i;
- 
--for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
-+for (i = 0; i < (HPDF_UINT)height; i++) {
- png_read_rows(png_ptr, (png_byte**)_ptr, NULL, 1);
- if (image->error->error_no != HPDF_OK)
- break;
-@@ -182,17 +184,19 @@ ReadTransparentPaletteData  (HPDF_Dictimage,
-   HPDF_STATUS ret = HPDF_OK;
-   HPDF_UINT i, j;
-   png_bytep *row_ptr;
-+  png_uint_32 height = png_get_image_height(png_ptr, info_ptr);
-+  png_uint_32 width = png_get_image_width(png_ptr, info_ptr);
- 
--  row_ptr = HPDF_GetMem (image->mmgr, info_ptr->height * 
sizeof(png_bytep));
-+  row_ptr = HPDF_GetMem (image->mmgr, height * sizeof(png_bytep));
-   if (!row_ptr) {
-   return HPDF_FAILD_TO_ALLOC_MEM;
-   } else {
-   png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr);
- 
--  for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
-+  for (i = 0; i < (HPDF_UINT)height; i++) {
-   row_ptr[i] = HPDF_GetMem(image->mmgr, len);
-   if (!row_ptr[i]) {
--  for (; i >= 0; i--) {
-+  for (; i > 0; i--) {
-   HPDF_FreeMem (image->mmgr, row_ptr[i]);
-   }
-   HPDF_FreeMem (image->mmgr, row_ptr);
-@@ -207,19 +211,19 @@ ReadTransparentPaletteData  (HPDF_Dictimage,
-   goto Error;
-   }
- 
--  for (j = 0; j < info_ptr->height; j++) {
--  for (i = 0; i < info_ptr->width; i++) {
--  smask_data[info_ptr->width * j + i] = (row_ptr[j][i] < 
num_trans) ? trans[row_ptr[j][i]] : 0xFF;
-+  for (j = 0; j < height; j++) {
-+  for (i = 0; i < width; i++) {
-+  smask_data[width * j + i] = (row_ptr[j][i] < num_trans) 
? trans[row_ptr[j][i]] : 0xFF;
-   }
- 
--  if (HPDF_Stream_Write (image->stream, row_ptr[j],