Date: Tuesday, May 28, 2013 @ 19:05:29
Author: spupykin
Revision: 91840
archrelease: copy trunk to community-i686, community-x86_64
Added:
qpxtool/repos/community-i686/PKGBUILD
(from rev 91839, qpxtool/trunk/PKGBUILD)
qpxtool/repos/community-i686/libpng15.patch
(from rev 91839, qpxtool/trunk/libpng15.patch)
qpxtool/repos/community-x86_64/PKGBUILD
(from rev 91839, qpxtool/trunk/PKGBUILD)
qpxtool/repos/community-x86_64/libpng15.patch
(from rev 91839, qpxtool/trunk/libpng15.patch)
Deleted:
qpxtool/repos/community-i686/PKGBUILD
qpxtool/repos/community-i686/libpng15.patch
qpxtool/repos/community-x86_64/PKGBUILD
qpxtool/repos/community-x86_64/libpng15.patch
---------------------------------+
/PKGBUILD | 70 ++++++++++
/libpng15.patch | 254 ++++++++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 35 -----
community-i686/libpng15.patch | 127 -------------------
community-x86_64/PKGBUILD | 35 -----
community-x86_64/libpng15.patch | 127 -------------------
6 files changed, 324 insertions(+), 324 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-05-28 17:05:13 UTC (rev 91839)
+++ community-i686/PKGBUILD 2013-05-28 17:05:29 UTC (rev 91840)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Contributor: Krzysztof Stasiorowski <krzysie...@gmail.com>
-
-pkgname=qpxtool
-pkgver=0.7.2
-pkgrel=3
-pkgdesc="Allows better controll over optical drives to include QChecks and
optimization settings."
-arch=('i686' 'x86_64')
-url="http://qpxtool.sourceforge.net/";
-license=('GPL')
-depends=('qt4')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
- libpng15.patch)
-md5sums=('b1235e74b8ef4fe087a6b64f5cfca14a'
- 'ab9af7610277652c77c6d114422b2266')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- # Fix strict aliasing warnings
- export CFLAGS="$CFLAGS -fno-strict-aliasing"
- sed -i \
- -e 's|lib64|lib|' \
- -e 's|lrelease|lrelease-qt4|' \
- configure
- patch -p1 <$srcdir/libpng15.patch
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- mkdir -p $pkgdir/usr/bin
- make DESTDIR=$pkgdir install
-}
Copied: qpxtool/repos/community-i686/PKGBUILD (from rev 91839,
qpxtool/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-05-28 17:05:29 UTC (rev 91840)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Contributor: Krzysztof Stasiorowski <krzysie...@gmail.com>
+
+pkgname=qpxtool
+pkgver=0.7.2
+pkgrel=4
+pkgdesc="Allows better controll over optical drives to include QChecks and
optimization settings."
+arch=('i686' 'x86_64')
+url="http://qpxtool.sourceforge.net/";
+license=('GPL')
+depends=('qt4')
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
+ libpng15.patch)
+md5sums=('b1235e74b8ef4fe087a6b64f5cfca14a'
+ 'ab9af7610277652c77c6d114422b2266')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ # Fix strict aliasing warnings
+ export CFLAGS="$CFLAGS -fno-strict-aliasing"
+ sed -i \
+ -e 's|lib64|lib|' \
+ -e 's|lrelease|lrelease-qt4|' \
+ configure
+ patch -p1 <$srcdir/libpng15.patch
+ ./configure --prefix=/usr --sbindir=/usr/bin
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ mkdir -p $pkgdir/usr/bin
+ make DESTDIR=$pkgdir install
+}
Deleted: community-i686/libpng15.patch
===================================================================
--- community-i686/libpng15.patch 2013-05-28 17:05:13 UTC (rev 91839)
+++ community-i686/libpng15.patch 2013-05-28 17:05:29 UTC (rev 91840)
@@ -1,127 +0,0 @@
-diff -wbBur qpxtool-0.7.1_002/console/f1tattoo/f1tattoo.cpp
qpxtool-0.7.1_002.my/console/f1tattoo/f1tattoo.cpp
---- qpxtool-0.7.1_002/console/f1tattoo/f1tattoo.cpp 2009-11-25
10:55:44.000000000 +0300
-+++ qpxtool-0.7.1_002.my/console/f1tattoo/f1tattoo.cpp 2012-01-23
13:53:37.000000000 +0400
-@@ -129,28 +129,28 @@
-
- png_read_info(png_ptr, info_ptr);
-
-- printf("Image size: %ld x %ld\n", info_ptr->width, info_ptr->height);
-+ printf("Image size: %u x %u\n", png_get_image_width(png_ptr, info_ptr),
png_get_image_height(png_ptr, info_ptr));
-
-- if (info_ptr->width != 3744U || info_ptr->height != rows ) {
-+ if (png_get_image_width(png_ptr, info_ptr) != 3744U ||
png_get_image_height(png_ptr, info_ptr) != rows ) {
- printf("Image should be 3744 x %d", rows);
- return 1;
- }
-
--// width = info_ptr->width;
--// height = info_ptr->height;
--// bit_depth = info_ptr->bit_depth;
-+// width = png_get_image_width(png_ptr, info_ptr);
-+// height = png_get_image_height(png_ptr, info_ptr);
-+// bit_depth = png_get_bit_depth(png_ptr, info_ptr);
-
- number_of_passes = png_set_interlace_handling(png_ptr);
- png_read_update_info(png_ptr, info_ptr);
-
-- printf("Color type: [%d] ", info_ptr->color_type);
-- switch (info_ptr->color_type) {
-+ printf("Color type: [%d] ", png_get_color_type(png_ptr, info_ptr));
-+ switch (png_get_color_type(png_ptr, info_ptr)) {
- case PNG_COLOR_TYPE_GRAY:
- printf("PNG_COLOR_TYPE_GRAY\n");
- break;
- case PNG_COLOR_TYPE_PALETTE:
- printf("PNG_COLOR_TYPE_PALETTE\n");
-- if (!(info_ptr->valid & PNG_INFO_PLTE)) {
-+ if (!(png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)))
{
- printf("PNG color type is indexed, but no
palette found!");
- goto err_read_png;
- }
-@@ -168,49 +168,53 @@
- printf("unlnown PNG color type!\n");
- goto err_read_png;
- }
-- printf("Bit depth : %d\n", info_ptr->bit_depth);
-- if (info_ptr->bit_depth != 8) {
-+ printf("Bit depth : %d\n", png_get_bit_depth(png_ptr, info_ptr));
-+ if (png_get_bit_depth(png_ptr, info_ptr) != 8) {
- printf("Unsupported bit depth!\n");
- goto err_read_png;
- }
-- if (info_ptr->valid & PNG_INFO_PLTE) {
-- printf("Palette : %d colors\n", info_ptr->num_palette);
-+
-+ int num_palette;
-+ png_colorp plte;
-+ png_get_PLTE(png_ptr, info_ptr, &plte, &num_palette);
-+
-+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) {
-+ printf("Palette : %d colors\n", num_palette);
- } else {
- printf("Palette : NO\n");
- }
-- printf("ROW bytes : %ld\n", info_ptr->rowbytes);
--
-+ printf("ROW bytes : %d\n", png_get_rowbytes(png_ptr, info_ptr));
-
- raw_row_pointer = buf;
-- png_row_pointer = (png_byte*) malloc(info_ptr->rowbytes);
-+ png_row_pointer = (png_byte*) malloc(png_get_rowbytes(png_ptr,
info_ptr));
- for (row=0; row<rows; row++) {
- if (setjmp(png_jmpbuf(png_ptr))) {
- printf("png_jmpbuf failed!\n");
- goto err_read_png;
- }
- png_read_row(png_ptr, png_row_pointer, NULL);
-- if (info_ptr->width < 3744U)
-+ if (png_get_image_width(png_ptr, info_ptr) < 3744U)
- memset(raw_row_pointer, 0, 3744);
-
-- switch (info_ptr->color_type) {
-+ switch (png_get_color_type(png_ptr, info_ptr)) {
- case PNG_COLOR_TYPE_GRAY:
-- for (col=0; col<info_ptr->width; col++) {
-+ for (col=0; col<png_get_image_width(png_ptr,
info_ptr); col++) {
- raw_row_pointer[col] =
png_row_pointer[col] ^ 0xFF;
- // memcpy(raw_row_pointer,
png_row_pointer, 3744);
- }
- break;
- case PNG_COLOR_TYPE_PALETTE:
-- for (col=0; col<info_ptr->width; col++) {
-+ for (col=0; col<png_get_image_width(png_ptr,
info_ptr); col++) {
- c = png_row_pointer[col];
-- r = info_ptr->palette[c].red;
-- g = info_ptr->palette[c].green;
-- b = info_ptr->palette[c].blue;
-+ r = plte[c].red;
-+ g = plte[c].green;
-+ b = plte[c].blue;
- c = (r*11 + g*16 + b*5) / 32;
- raw_row_pointer[col] = c ^ 0xFF;
- }
- break;
- case PNG_COLOR_TYPE_RGB:
-- for (col=0; col<info_ptr->width; col++) {
-+ for (col=0; col<png_get_image_width(png_ptr,
info_ptr); col++) {
- r = png_row_pointer[col*3];
- g = png_row_pointer[col*3+1];
- b = png_row_pointer[col*3+2];
-@@ -219,7 +223,7 @@
- }
- break;
- case PNG_COLOR_TYPE_RGB_ALPHA:
-- for (col=0; col<info_ptr->width; col++) {
-+ for (col=0; col<png_get_image_width(png_ptr,
info_ptr); col++) {
- r = png_row_pointer[col*4];
- g = png_row_pointer[col*4+1];
- b = png_row_pointer[col*4+2];
-@@ -228,7 +232,7 @@
- }
- break;
- case PNG_COLOR_TYPE_GRAY_ALPHA:
-- for (col=0; col<info_ptr->width; col++) {
-+ for (col=0; col<png_get_image_width(png_ptr,
info_ptr); col++) {
- raw_row_pointer[col] =
png_row_pointer[col*2] ^ 0xFF;
- }
- break;
Copied: qpxtool/repos/community-i686/libpng15.patch (from rev 91839,
qpxtool/trunk/libpng15.patch)
===================================================================
--- community-i686/libpng15.patch (rev 0)
+++ community-i686/libpng15.patch 2013-05-28 17:05:29 UTC (rev 91840)
@@ -0,0 +1,127 @@
+diff -wbBur qpxtool-0.7.1_002/console/f1tattoo/f1tattoo.cpp
qpxtool-0.7.1_002.my/console/f1tattoo/f1tattoo.cpp
+--- qpxtool-0.7.1_002/console/f1tattoo/f1tattoo.cpp 2009-11-25
10:55:44.000000000 +0300
++++ qpxtool-0.7.1_002.my/console/f1tattoo/f1tattoo.cpp 2012-01-23
13:53:37.000000000 +0400
+@@ -129,28 +129,28 @@
+
+ png_read_info(png_ptr, info_ptr);
+
+- printf("Image size: %ld x %ld\n", info_ptr->width, info_ptr->height);
++ printf("Image size: %u x %u\n", png_get_image_width(png_ptr, info_ptr),
png_get_image_height(png_ptr, info_ptr));
+
+- if (info_ptr->width != 3744U || info_ptr->height != rows ) {
++ if (png_get_image_width(png_ptr, info_ptr) != 3744U ||
png_get_image_height(png_ptr, info_ptr) != rows ) {
+ printf("Image should be 3744 x %d", rows);
+ return 1;
+ }
+
+-// width = info_ptr->width;
+-// height = info_ptr->height;
+-// bit_depth = info_ptr->bit_depth;
++// width = png_get_image_width(png_ptr, info_ptr);
++// height = png_get_image_height(png_ptr, info_ptr);
++// bit_depth = png_get_bit_depth(png_ptr, info_ptr);
+
+ number_of_passes = png_set_interlace_handling(png_ptr);
+ png_read_update_info(png_ptr, info_ptr);
+
+- printf("Color type: [%d] ", info_ptr->color_type);
+- switch (info_ptr->color_type) {
++ printf("Color type: [%d] ", png_get_color_type(png_ptr, info_ptr));
++ switch (png_get_color_type(png_ptr, info_ptr)) {
+ case PNG_COLOR_TYPE_GRAY:
+ printf("PNG_COLOR_TYPE_GRAY\n");
+ break;
+ case PNG_COLOR_TYPE_PALETTE:
+ printf("PNG_COLOR_TYPE_PALETTE\n");
+- if (!(info_ptr->valid & PNG_INFO_PLTE)) {
++ if (!(png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)))
{
+ printf("PNG color type is indexed, but no
palette found!");
+ goto err_read_png;
+ }
+@@ -168,49 +168,53 @@
+ printf("unlnown PNG color type!\n");
+ goto err_read_png;
+ }
+- printf("Bit depth : %d\n", info_ptr->bit_depth);
+- if (info_ptr->bit_depth != 8) {
++ printf("Bit depth : %d\n", png_get_bit_depth(png_ptr, info_ptr));
++ if (png_get_bit_depth(png_ptr, info_ptr) != 8) {
+ printf("Unsupported bit depth!\n");
+ goto err_read_png;
+ }
+- if (info_ptr->valid & PNG_INFO_PLTE) {
+- printf("Palette : %d colors\n", info_ptr->num_palette);
++
++ int num_palette;
++ png_colorp plte;
++ png_get_PLTE(png_ptr, info_ptr, &plte, &num_palette);
++
++ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) {
++ printf("Palette : %d colors\n", num_palette);
+ } else {
+ printf("Palette : NO\n");
+ }
+- printf("ROW bytes : %ld\n", info_ptr->rowbytes);
+-
++ printf("ROW bytes : %d\n", png_get_rowbytes(png_ptr, info_ptr));
+
+ raw_row_pointer = buf;
+- png_row_pointer = (png_byte*) malloc(info_ptr->rowbytes);
++ png_row_pointer = (png_byte*) malloc(png_get_rowbytes(png_ptr,
info_ptr));
+ for (row=0; row<rows; row++) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
+ printf("png_jmpbuf failed!\n");
+ goto err_read_png;
+ }
+ png_read_row(png_ptr, png_row_pointer, NULL);
+- if (info_ptr->width < 3744U)
++ if (png_get_image_width(png_ptr, info_ptr) < 3744U)
+ memset(raw_row_pointer, 0, 3744);
+
+- switch (info_ptr->color_type) {
++ switch (png_get_color_type(png_ptr, info_ptr)) {
+ case PNG_COLOR_TYPE_GRAY:
+- for (col=0; col<info_ptr->width; col++) {
++ for (col=0; col<png_get_image_width(png_ptr,
info_ptr); col++) {
+ raw_row_pointer[col] =
png_row_pointer[col] ^ 0xFF;
+ // memcpy(raw_row_pointer,
png_row_pointer, 3744);
+ }
+ break;
+ case PNG_COLOR_TYPE_PALETTE:
+- for (col=0; col<info_ptr->width; col++) {
++ for (col=0; col<png_get_image_width(png_ptr,
info_ptr); col++) {
+ c = png_row_pointer[col];
+- r = info_ptr->palette[c].red;
+- g = info_ptr->palette[c].green;
+- b = info_ptr->palette[c].blue;
++ r = plte[c].red;
++ g = plte[c].green;
++ b = plte[c].blue;
+ c = (r*11 + g*16 + b*5) / 32;
+ raw_row_pointer[col] = c ^ 0xFF;
+ }
+ break;
+ case PNG_COLOR_TYPE_RGB:
+- for (col=0; col<info_ptr->width; col++) {
++ for (col=0; col<png_get_image_width(png_ptr,
info_ptr); col++) {
+ r = png_row_pointer[col*3];
+ g = png_row_pointer[col*3+1];
+ b = png_row_pointer[col*3+2];
+@@ -219,7 +223,7 @@
+ }
+ break;
+ case PNG_COLOR_TYPE_RGB_ALPHA:
+- for (col=0; col<info_ptr->width; col++) {
++ for (col=0; col<png_get_image_width(png_ptr,
info_ptr); col++) {
+ r = png_row_pointer[col*4];
+ g = png_row_pointer[col*4+1];
+ b = png_row_pointer[col*4+2];
+@@ -228,7 +232,7 @@
+ }
+ break;
+ case PNG_COLOR_TYPE_GRAY_ALPHA:
+- for (col=0; col<info_ptr->width; col++) {
++ for (col=0; col<png_get_image_width(png_ptr,
info_ptr); col++) {
+ raw_row_pointer[col] =
png_row_pointer[col*2] ^ 0xFF;
+ }
+ break;
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-05-28 17:05:13 UTC (rev 91839)
+++ community-x86_64/PKGBUILD 2013-05-28 17:05:29 UTC (rev 91840)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Contributor: Krzysztof Stasiorowski <krzysie...@gmail.com>
-
-pkgname=qpxtool
-pkgver=0.7.2
-pkgrel=3
-pkgdesc="Allows better controll over optical drives to include QChecks and
optimization settings."
-arch=('i686' 'x86_64')
-url="http://qpxtool.sourceforge.net/";
-license=('GPL')
-depends=('qt4')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
- libpng15.patch)
-md5sums=('b1235e74b8ef4fe087a6b64f5cfca14a'
- 'ab9af7610277652c77c6d114422b2266')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- # Fix strict aliasing warnings
- export CFLAGS="$CFLAGS -fno-strict-aliasing"
- sed -i \
- -e 's|lib64|lib|' \
- -e 's|lrelease|lrelease-qt4|' \
- configure
- patch -p1 <$srcdir/libpng15.patch
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- mkdir -p $pkgdir/usr/bin
- make DESTDIR=$pkgdir install
-}
Copied: qpxtool/repos/community-x86_64/PKGBUILD (from rev 91839,
qpxtool/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-05-28 17:05:29 UTC (rev 91840)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Contributor: Krzysztof Stasiorowski <krzysie...@gmail.com>
+
+pkgname=qpxtool
+pkgver=0.7.2
+pkgrel=4
+pkgdesc="Allows better controll over optical drives to include QChecks and
optimization settings."
+arch=('i686' 'x86_64')
+url="http://qpxtool.sourceforge.net/";
+license=('GPL')
+depends=('qt4')
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
+ libpng15.patch)
+md5sums=('b1235e74b8ef4fe087a6b64f5cfca14a'
+ 'ab9af7610277652c77c6d114422b2266')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ # Fix strict aliasing warnings
+ export CFLAGS="$CFLAGS -fno-strict-aliasing"
+ sed -i \
+ -e 's|lib64|lib|' \
+ -e 's|lrelease|lrelease-qt4|' \
+ configure
+ patch -p1 <$srcdir/libpng15.patch
+ ./configure --prefix=/usr --sbindir=/usr/bin
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ mkdir -p $pkgdir/usr/bin
+ make DESTDIR=$pkgdir install
+}
Deleted: community-x86_64/libpng15.patch
===================================================================
--- community-x86_64/libpng15.patch 2013-05-28 17:05:13 UTC (rev 91839)
+++ community-x86_64/libpng15.patch 2013-05-28 17:05:29 UTC (rev 91840)
@@ -1,127 +0,0 @@
-diff -wbBur qpxtool-0.7.1_002/console/f1tattoo/f1tattoo.cpp
qpxtool-0.7.1_002.my/console/f1tattoo/f1tattoo.cpp
---- qpxtool-0.7.1_002/console/f1tattoo/f1tattoo.cpp 2009-11-25
10:55:44.000000000 +0300
-+++ qpxtool-0.7.1_002.my/console/f1tattoo/f1tattoo.cpp 2012-01-23
13:53:37.000000000 +0400
-@@ -129,28 +129,28 @@
-
- png_read_info(png_ptr, info_ptr);
-
-- printf("Image size: %ld x %ld\n", info_ptr->width, info_ptr->height);
-+ printf("Image size: %u x %u\n", png_get_image_width(png_ptr, info_ptr),
png_get_image_height(png_ptr, info_ptr));
-
-- if (info_ptr->width != 3744U || info_ptr->height != rows ) {
-+ if (png_get_image_width(png_ptr, info_ptr) != 3744U ||
png_get_image_height(png_ptr, info_ptr) != rows ) {
- printf("Image should be 3744 x %d", rows);
- return 1;
- }
-
--// width = info_ptr->width;
--// height = info_ptr->height;
--// bit_depth = info_ptr->bit_depth;
-+// width = png_get_image_width(png_ptr, info_ptr);
-+// height = png_get_image_height(png_ptr, info_ptr);
-+// bit_depth = png_get_bit_depth(png_ptr, info_ptr);
-
- number_of_passes = png_set_interlace_handling(png_ptr);
- png_read_update_info(png_ptr, info_ptr);
-
-- printf("Color type: [%d] ", info_ptr->color_type);
-- switch (info_ptr->color_type) {
-+ printf("Color type: [%d] ", png_get_color_type(png_ptr, info_ptr));
-+ switch (png_get_color_type(png_ptr, info_ptr)) {
- case PNG_COLOR_TYPE_GRAY:
- printf("PNG_COLOR_TYPE_GRAY\n");
- break;
- case PNG_COLOR_TYPE_PALETTE:
- printf("PNG_COLOR_TYPE_PALETTE\n");
-- if (!(info_ptr->valid & PNG_INFO_PLTE)) {
-+ if (!(png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)))
{
- printf("PNG color type is indexed, but no
palette found!");
- goto err_read_png;
- }
-@@ -168,49 +168,53 @@
- printf("unlnown PNG color type!\n");
- goto err_read_png;
- }
-- printf("Bit depth : %d\n", info_ptr->bit_depth);
-- if (info_ptr->bit_depth != 8) {
-+ printf("Bit depth : %d\n", png_get_bit_depth(png_ptr, info_ptr));
-+ if (png_get_bit_depth(png_ptr, info_ptr) != 8) {
- printf("Unsupported bit depth!\n");
- goto err_read_png;
- }
-- if (info_ptr->valid & PNG_INFO_PLTE) {
-- printf("Palette : %d colors\n", info_ptr->num_palette);
-+
-+ int num_palette;
-+ png_colorp plte;
-+ png_get_PLTE(png_ptr, info_ptr, &plte, &num_palette);
-+
-+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) {
-+ printf("Palette : %d colors\n", num_palette);
- } else {
- printf("Palette : NO\n");
- }
-- printf("ROW bytes : %ld\n", info_ptr->rowbytes);
--
-+ printf("ROW bytes : %d\n", png_get_rowbytes(png_ptr, info_ptr));
-
- raw_row_pointer = buf;
-- png_row_pointer = (png_byte*) malloc(info_ptr->rowbytes);
-+ png_row_pointer = (png_byte*) malloc(png_get_rowbytes(png_ptr,
info_ptr));
- for (row=0; row<rows; row++) {
- if (setjmp(png_jmpbuf(png_ptr))) {
- printf("png_jmpbuf failed!\n");
- goto err_read_png;
- }
- png_read_row(png_ptr, png_row_pointer, NULL);
-- if (info_ptr->width < 3744U)
-+ if (png_get_image_width(png_ptr, info_ptr) < 3744U)
- memset(raw_row_pointer, 0, 3744);
-
-- switch (info_ptr->color_type) {
-+ switch (png_get_color_type(png_ptr, info_ptr)) {
- case PNG_COLOR_TYPE_GRAY:
-- for (col=0; col<info_ptr->width; col++) {
-+ for (col=0; col<png_get_image_width(png_ptr,
info_ptr); col++) {
- raw_row_pointer[col] =
png_row_pointer[col] ^ 0xFF;
- // memcpy(raw_row_pointer,
png_row_pointer, 3744);
- }
- break;
- case PNG_COLOR_TYPE_PALETTE:
-- for (col=0; col<info_ptr->width; col++) {
-+ for (col=0; col<png_get_image_width(png_ptr,
info_ptr); col++) {
- c = png_row_pointer[col];
-- r = info_ptr->palette[c].red;
-- g = info_ptr->palette[c].green;
-- b = info_ptr->palette[c].blue;
-+ r = plte[c].red;
-+ g = plte[c].green;
-+ b = plte[c].blue;
- c = (r*11 + g*16 + b*5) / 32;
- raw_row_pointer[col] = c ^ 0xFF;
- }
- break;
- case PNG_COLOR_TYPE_RGB:
-- for (col=0; col<info_ptr->width; col++) {
-+ for (col=0; col<png_get_image_width(png_ptr,
info_ptr); col++) {
- r = png_row_pointer[col*3];
- g = png_row_pointer[col*3+1];
- b = png_row_pointer[col*3+2];
-@@ -219,7 +223,7 @@
- }
- break;
- case PNG_COLOR_TYPE_RGB_ALPHA:
-- for (col=0; col<info_ptr->width; col++) {
-+ for (col=0; col<png_get_image_width(png_ptr,
info_ptr); col++) {
- r = png_row_pointer[col*4];
- g = png_row_pointer[col*4+1];
- b = png_row_pointer[col*4+2];
-@@ -228,7 +232,7 @@
- }
- break;
- case PNG_COLOR_TYPE_GRAY_ALPHA:
-- for (col=0; col<info_ptr->width; col++) {
-+ for (col=0; col<png_get_image_width(png_ptr,
info_ptr); col++) {
- raw_row_pointer[col] =
png_row_pointer[col*2] ^ 0xFF;
- }
- break;
Copied: qpxtool/repos/community-x86_64/libpng15.patch (from rev 91839,
qpxtool/trunk/libpng15.patch)
===================================================================
--- community-x86_64/libpng15.patch (rev 0)
+++ community-x86_64/libpng15.patch 2013-05-28 17:05:29 UTC (rev 91840)
@@ -0,0 +1,127 @@
+diff -wbBur qpxtool-0.7.1_002/console/f1tattoo/f1tattoo.cpp
qpxtool-0.7.1_002.my/console/f1tattoo/f1tattoo.cpp
+--- qpxtool-0.7.1_002/console/f1tattoo/f1tattoo.cpp 2009-11-25
10:55:44.000000000 +0300
++++ qpxtool-0.7.1_002.my/console/f1tattoo/f1tattoo.cpp 2012-01-23
13:53:37.000000000 +0400
+@@ -129,28 +129,28 @@
+
+ png_read_info(png_ptr, info_ptr);
+
+- printf("Image size: %ld x %ld\n", info_ptr->width, info_ptr->height);
++ printf("Image size: %u x %u\n", png_get_image_width(png_ptr, info_ptr),
png_get_image_height(png_ptr, info_ptr));
+
+- if (info_ptr->width != 3744U || info_ptr->height != rows ) {
++ if (png_get_image_width(png_ptr, info_ptr) != 3744U ||
png_get_image_height(png_ptr, info_ptr) != rows ) {
+ printf("Image should be 3744 x %d", rows);
+ return 1;
+ }
+
+-// width = info_ptr->width;
+-// height = info_ptr->height;
+-// bit_depth = info_ptr->bit_depth;
++// width = png_get_image_width(png_ptr, info_ptr);
++// height = png_get_image_height(png_ptr, info_ptr);
++// bit_depth = png_get_bit_depth(png_ptr, info_ptr);
+
+ number_of_passes = png_set_interlace_handling(png_ptr);
+ png_read_update_info(png_ptr, info_ptr);
+
+- printf("Color type: [%d] ", info_ptr->color_type);
+- switch (info_ptr->color_type) {
++ printf("Color type: [%d] ", png_get_color_type(png_ptr, info_ptr));
++ switch (png_get_color_type(png_ptr, info_ptr)) {
+ case PNG_COLOR_TYPE_GRAY:
+ printf("PNG_COLOR_TYPE_GRAY\n");
+ break;
+ case PNG_COLOR_TYPE_PALETTE:
+ printf("PNG_COLOR_TYPE_PALETTE\n");
+- if (!(info_ptr->valid & PNG_INFO_PLTE)) {
++ if (!(png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)))
{
+ printf("PNG color type is indexed, but no
palette found!");
+ goto err_read_png;
+ }
+@@ -168,49 +168,53 @@
+ printf("unlnown PNG color type!\n");
+ goto err_read_png;
+ }
+- printf("Bit depth : %d\n", info_ptr->bit_depth);
+- if (info_ptr->bit_depth != 8) {
++ printf("Bit depth : %d\n", png_get_bit_depth(png_ptr, info_ptr));
++ if (png_get_bit_depth(png_ptr, info_ptr) != 8) {
+ printf("Unsupported bit depth!\n");
+ goto err_read_png;
+ }
+- if (info_ptr->valid & PNG_INFO_PLTE) {
+- printf("Palette : %d colors\n", info_ptr->num_palette);
++
++ int num_palette;
++ png_colorp plte;
++ png_get_PLTE(png_ptr, info_ptr, &plte, &num_palette);
++
++ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) {
++ printf("Palette : %d colors\n", num_palette);
+ } else {
+ printf("Palette : NO\n");
+ }
+- printf("ROW bytes : %ld\n", info_ptr->rowbytes);
+-
++ printf("ROW bytes : %d\n", png_get_rowbytes(png_ptr, info_ptr));
+
+ raw_row_pointer = buf;
+- png_row_pointer = (png_byte*) malloc(info_ptr->rowbytes);
++ png_row_pointer = (png_byte*) malloc(png_get_rowbytes(png_ptr,
info_ptr));
+ for (row=0; row<rows; row++) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
+ printf("png_jmpbuf failed!\n");
+ goto err_read_png;
+ }
+ png_read_row(png_ptr, png_row_pointer, NULL);
+- if (info_ptr->width < 3744U)
++ if (png_get_image_width(png_ptr, info_ptr) < 3744U)
+ memset(raw_row_pointer, 0, 3744);
+
+- switch (info_ptr->color_type) {
++ switch (png_get_color_type(png_ptr, info_ptr)) {
+ case PNG_COLOR_TYPE_GRAY:
+- for (col=0; col<info_ptr->width; col++) {
++ for (col=0; col<png_get_image_width(png_ptr,
info_ptr); col++) {
+ raw_row_pointer[col] =
png_row_pointer[col] ^ 0xFF;
+ // memcpy(raw_row_pointer,
png_row_pointer, 3744);
+ }
+ break;
+ case PNG_COLOR_TYPE_PALETTE:
+- for (col=0; col<info_ptr->width; col++) {
++ for (col=0; col<png_get_image_width(png_ptr,
info_ptr); col++) {
+ c = png_row_pointer[col];
+- r = info_ptr->palette[c].red;
+- g = info_ptr->palette[c].green;
+- b = info_ptr->palette[c].blue;
++ r = plte[c].red;
++ g = plte[c].green;
++ b = plte[c].blue;
+ c = (r*11 + g*16 + b*5) / 32;
+ raw_row_pointer[col] = c ^ 0xFF;
+ }
+ break;
+ case PNG_COLOR_TYPE_RGB:
+- for (col=0; col<info_ptr->width; col++) {
++ for (col=0; col<png_get_image_width(png_ptr,
info_ptr); col++) {
+ r = png_row_pointer[col*3];
+ g = png_row_pointer[col*3+1];
+ b = png_row_pointer[col*3+2];
+@@ -219,7 +223,7 @@
+ }
+ break;
+ case PNG_COLOR_TYPE_RGB_ALPHA:
+- for (col=0; col<info_ptr->width; col++) {
++ for (col=0; col<png_get_image_width(png_ptr,
info_ptr); col++) {
+ r = png_row_pointer[col*4];
+ g = png_row_pointer[col*4+1];
+ b = png_row_pointer[col*4+2];
+@@ -228,7 +232,7 @@
+ }
+ break;
+ case PNG_COLOR_TYPE_GRAY_ALPHA:
+- for (col=0; col<info_ptr->width; col++) {
++ for (col=0; col<png_get_image_width(png_ptr,
info_ptr); col++) {
+ raw_row_pointer[col] =
png_row_pointer[col*2] ^ 0xFF;
+ }
+ break;
