Initial import

7 files changed, 483 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..09ecc443421a
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,42 @@
+pkgbase = cnijfilter-mg5300
+	pkgdesc = Canon IJ Printer Driver (for MG5300 series)
+	pkgver = 3.60
+	pkgrel = 6
+	url = http://support-au.canon.com.au/contents/AU/EN/0100392802.html
+	install = cnijfilter-mg5300.install
+	arch = i686
+	arch = x86_64
+	license = custom
+	makedepends = autoconf>=2.13
+	makedepends = automake>=1.6
+	makedepends = tar
+	makedepends = make
+	makedepends = gcc
+	depends = libcups
+	depends = cups
+	depends = popt
+	depends = ghostscript
+	depends = gsfonts
+	depends = atk>=1.9.0
+	depends = gtk2>=2.8.0
+	depends = pango>=1.12.3
+	depends = libpng
+	depends = libtiff
+	depends = cairo>=1.0.2
+	depends = libxml2>=2.6.24
+	depends = fontconfig>=2.3.0
+	depends = libxinerama
+	conflicts = cnijfilter-common
+	source = http://gdlp01.c-wss.com/gds/8/0100003928/01/cnijfilter-source-3.60-1.tar.gz
+	source = build-fixes.patch
+	source = cups.patch
+	source = id.po.patch
+	source = libpng.patch
+	md5sums = 70e412331a21f4b573b4e901c89cee18
+	md5sums = 5f4b3523f6542f0a90886e7e6264f19a
+	md5sums = d5c3dda759bd8809cd5359872f9ba645
+	md5sums = e228560529d46e1f03617ba7bc9aa657
+	md5sums = 3bca06ca61b0c9ffd0c292ed6985375f
+
+pkgname = cnijfilter-mg5300
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..b4183e2e842d
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,204 @@
+# Maintainer: Sonic-Y3k <sonic.y3k@googlemail.com> 
+# Original Contributors: Giancarlo Bianchi <giancarlobianchi76@gmail.com>
+#                        Fortunato Ventre (voRia) <vorione@gmail.com>
+#                        Custom Processing Unlimited (CPUnltd) <CPUnltd 'at' gmail 'dot' com>
+pkgname=cnijfilter-mg5300
+pkgver=3.60
+pkgrel=6
+_pkgver=3.60-1
+pkgdesc="Canon IJ Printer Driver (for MG5300 series)"
+url="http://support-au.canon.com.au/contents/AU/EN/0100392802.html"
+arch=('i686' 'x86_64')
+license=('custom')
+depends=('libcups' 'cups' 'popt' 'ghostscript' 'gsfonts' 'atk>=1.9.0' 'gtk2>=2.8.0' 
+				 'pango>=1.12.3' 'libpng' 'libtiff' 'cairo>=1.0.2' 'libxml2>=2.6.24' 
+				 'fontconfig>=2.3.0' 'libxinerama')
+makedepends=('autoconf>=2.13' 'automake>=1.6' 'tar' 'make' 'gcc')
+conflicts=('cnijfilter-common')
+install=cnijfilter-mg5300.install
+source=("http://gdlp01.c-wss.com/gds/8/0100003928/01/cnijfilter-source-${_pkgver}.tar.gz"
+				'build-fixes.patch'
+				'cups.patch'
+				'id.po.patch'
+				'libpng.patch')
+md5sums=('70e412331a21f4b573b4e901c89cee18'
+	       '5f4b3523f6542f0a90886e7e6264f19a'
+	       'd5c3dda759bd8809cd5359872f9ba645'
+	       'e228560529d46e1f03617ba7bc9aa657'
+	       '3bca06ca61b0c9ffd0c292ed6985375f')
+
+prepare() {
+  ## Patches
+	msg "Applying patches"
+  patch -p0 < build-fixes.patch
+	patch -p0 < cups.patch
+	patch -p0 < id.po.patch
+	patch -p0 < libpng.patch
+}
+
+build() {
+	if [ "$CARCH" == "x86_64" ]; then
+		libdir=libs_bin64
+	else
+		libdir=libs_bin32
+	fi
+
+	## Compile mg5300 stuff
+	# ppd file
+	msg "Building ppd"
+	cd ${srcdir}/cnijfilter-source-${_pkgver}/ppd
+	./autogen.sh --prefix=/usr --enable-ppdpath=/usr/share/cups/model --program-suffix=mg5300
+	make clean
+	make
+
+	# cnijfilter
+	msg "Building cnijfilter"
+	cd ${srcdir}/cnijfilter-source-${_pkgver}/cnijfilter
+	autoreconf -i
+	./autogen.sh --prefix=/usr --enable-libpath=/usr/lib/bjlib --enable-binpath=/usr/bin --program-suffix=mg5300
+	make clean
+	make
+
+	# printui
+	msg "Building printui"
+	cd ${srcdir}/cnijfilter-source-${_pkgver}/printui
+	./autogen.sh --prefix=/usr --datadir=/usr/share --program-suffix=mg5300
+	make clean
+	make
+
+	# lgmon
+	msg "Building lgmon"
+	cd ${srcdir}/cnijfilter-source-${_pkgver}/lgmon
+	./autogen.sh --prefix=/usr --enable-progpath=/usr/bin --program-suffix=mg5300
+	make clean
+	make
+
+	# cngpijmon
+	msg "Building cngpijmon"
+	cd ${srcdir}/cnijfilter-source-${_pkgver}/cngpijmon
+	./autogen.sh --prefix=/usr --enable-progpath=/usr/bin --datadir=/usr/share --program-suffix=mg5300
+	make clean
+	make
+	
+	## Compile common stuff
+	# libs
+	msg "Building common libs"
+	cd ${srcdir}/cnijfilter-source-${_pkgver}/libs
+	./autogen.sh --prefix=/usr
+	make clean
+	make
+
+	# cngpij
+	msg "Building cngpij"
+	cd ${srcdir}/cnijfilter-source-${_pkgver}/cngpij
+	./autogen.sh --prefix=/usr --enable-progpath=/usr/bin
+	make clean
+	make
+	
+	# pstocanonij
+	msg "Building pstocanonij"
+	cd ${srcdir}/cnijfilter-source-${_pkgver}/pstocanonij
+	./autogen.sh --prefix=/usr --enable-progpath=/usr/bin
+	make clean
+	make
+	
+	# backend
+	msg "Building backend"
+	cd ${srcdir}/cnijfilter-source-${_pkgver}/backend
+	./autogen.sh --prefix=/usr --enable-progpath=/usr/bin
+	make clean
+	make
+
+	# backendnet
+	msg "Building backendnet"
+	cd ${srcdir}/cnijfilter-source-${_pkgver}/backendnet
+	./autogen.sh --prefix=/usr --enable-progpath=/usr/bin LDFLAGS="-L../../com/${libdir}"
+	make clean
+	make
+
+	# sm sub process
+	msg "Building cnijnpr"
+	cd ${srcdir}/cnijfilter-source-${_pkgver}/cngpijmon/cnijnpr
+	./autogen.sh --prefix=/usr LDFLAGS="-ldl"
+	make clean
+	make
+}
+
+package() {
+  if [ "$CARCH" == "x86_64" ]; then
+		libdir=libs_bin64
+	else
+		libdir=libs_bin32
+	fi
+
+  cd ${srcdir}/cnijfilter-source-${_pkgver}/ppd
+  msg "Installing ppd"
+  make DESTDIR=${pkgdir} install
+
+
+  cd ${srcdir}/cnijfilter-source-${_pkgver}/cnijfilter
+  msg "Installing cnijfilter"
+  make DESTDIR=${pkgdir} install
+
+  cd ${srcdir}/cnijfilter-source-${_pkgver}/printui
+  msg "Installing printui"
+  make DESTDIR=${pkgdir} install
+
+  cd ${srcdir}/cnijfilter-source-${_pkgver}/lgmon
+  msg "Installing lgmon"
+  make DESTDIR=${pkgdir} install
+
+  cd ${srcdir}/cnijfilter-source-${_pkgver}/cngpijmon
+  msg "Installing cngpijmon"
+  make DESTDIR=${pkgdir} install
+
+  cd ${srcdir}/cnijfilter-source-${_pkgver}/libs
+  msg "Installing libs"
+  make DESTDIR=${pkgdir} install
+
+  cd ${srcdir}/cnijfilter-source-${_pkgver}/pstocanonij
+  msg "Installing pstocanonij"
+  make DESTDIR=${pkgdir} install
+
+  cd ${srcdir}/cnijfilter-source-${_pkgver}/backend
+  msg "Installing backend"
+  make DESTDIR=${pkgdir} install
+
+  cd ${srcdir}/cnijfilter-source-${_pkgver}/backendnet
+  msg "Installing backendnet"
+  make DESTDIR=${pkgdir} install
+
+  cd ${srcdir}/cnijfilter-source-${_pkgver}/cngpijmon/cnijnpr
+  msg "Installing cnijnpr"
+  make DESTDIR=${pkgdir} install
+
+  # Install mg5300 libraries
+	msg "Installing libraries"
+	install -d ${pkgdir}/usr/lib/
+  for lib in libcnbpcmcm393.so.8.10.1 libcnbpcnclapi393.so.3.6.1 libcnbpcnclbjcmd393.so.3.3.0 libcnbpcnclui393.so.3.6.1 libcnbpess393.so.4.1.3 libcnbpo393.so.1.0.4
+  do
+	  install -m 755 ${srcdir}/cnijfilter-source-${_pkgver}/393/${libdir}/${lib} ${pkgdir}/usr/lib/
+  done
+	install -d ${pkgdir}/usr/lib/bjlib/
+	install -m 644 ${srcdir}/cnijfilter-source-${_pkgver}/393/database/* ${pkgdir}/usr/lib/bjlib/
+
+  # Install common libraries
+	install -m 755 ${srcdir}/cnijfilter-source-${_pkgver}/com/${libdir}/libcnnet.so.1.2.2 ${pkgdir}/usr/lib/
+	install -m 666 ${srcdir}/cnijfilter-source-${_pkgver}/com/ini/cnnet.ini ${pkgdir}/usr/lib/bjlib/
+
+	# Make symbolic links for libraries
+	cd ${pkgdir}/usr/lib/
+	ln -s libcnnet.so.1.2.2 libcnnet.so
+	ln -s libcnbpcmcm393.so.8.10.1 libcnbpcmcm393.so
+	ln -s libcnbpcnclapi393.so.3.6.1 libcnbpcnclapi393.so
+	ln -s libcnbpcnclbjcmd393.so.3.3.0 libcnbpcnclbjcmd393.so
+	ln -s libcnbpcnclui393.so.3.6.1 libcnbpcnclui393.so
+	ln -s libcnbpess393.so.4.1.3 libcnbpess393.so
+	ln -s libcnbpo393.so.1.0.4 libcnbpo393.so
+
+	# Install license file
+	cd ${srcdir}/cnijfilter-source-${_pkgver}
+	install -D LICENSE-cnijfilter-${pkgver}EN.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-cnijfilter-${pkgver}EN.txt
+}
+
+# vim:set ts=2 sw=2 :et
diff --git a/build-fixes.patch b/build-fixes.patch
new file mode 100644
index 000000000000..0435cf2f7be0
--- /dev/null
+++ b/build-fixes.patch
@@ -0,0 +1,154 @@
+--- cnijfilter-source-3.60-1/backend/configure.in	2011-02-14 08:27:08.000000000 +0100
++++ cnijfilter-source-3.60-1.new/backend/configure.in	2013-04-10 22:18:48.924841978 +0200
+@@ -1,8 +1,6 @@
+ AC_INIT(src/cnij_backend_common.c)
+ AM_INIT_AUTOMAKE(backend, 3.60-1)
+ 
+-AM_CONFIG_HEADER(config.h)
+-
+ AC_ARG_ENABLE(progpath)
+ if test "${enable_progpath}" = "" ; then
+    enable_progpath="${ac_default_prefix}/bin"
+--- cnijfilter-source-3.60-1/backendnet/configure.in	2011-02-14 08:27:08.000000000 +0100
++++ cnijfilter-source-3.60-1.new/backendnet/configure.in	2013-04-10 22:18:38.547941017 +0200
+@@ -1,8 +1,6 @@
+ AC_INIT(backend/cnijnetlm.c)
+ AM_INIT_AUTOMAKE(backendnet, 3.60-1)
+ 
+-AM_CONFIG_HEADER(config.h)
+-
+ AC_ARG_ENABLE(progpath)
+ if test "${enable_progpath}" = "" ; then
+    enable_progpath="${ac_default_prefix}/bin"
+--- cnijfilter-source-3.60-1/cngpij/configure.in	2011-02-14 08:27:08.000000000 +0100
++++ cnijfilter-source-3.60-1.new/cngpij/configure.in	2013-04-10 22:19:32.479158480 +0200
+@@ -1,8 +1,6 @@
+ AC_INIT(cngpij/bjcups.c)
+ AM_INIT_AUTOMAKE(cngpij, 3.60-1)
+ 
+-AM_CONFIG_HEADER(config.h)
+-
+ AC_ARG_ENABLE(progpath)
+ if test "${enable_progpath}" = "" ; then
+    enable_progpath="${ac_default_prefix}/bin"
+--- cnijfilter-source-3.60-1/cngpijmon/cnijnpr/config.h.in	1970-01-01 01:00:00.000000000 +0100
++++ cnijfilter-source-3.60-1.new/cngpijmon/cnijnpr/config.h.in	2013-04-10 22:21:59.625810894 +0200
+@@ -0,0 +1 @@
++/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+--- cnijfilter-source-3.60-1/cngpijmon/cnijnpr/configure.in	2011-03-01 06:52:18.000000000 +0100
++++ cnijfilter-source-3.60-1.new/cngpijmon/cnijnpr/configure.in	2013-04-10 22:28:07.344088947 +0200
+@@ -1,7 +1,7 @@
+ AC_INIT(configure.in)
+ AM_INIT_AUTOMAKE(cnijnpr, 3.60-1)
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ 
+ AC_ARG_ENABLE(libpath)
+--- cnijfilter-source-3.60-1/cngpijmon/configure.in	2011-03-01 06:52:18.000000000 +0100
++++ cnijfilter-source-3.60-1.new/cngpijmon/configure.in	2013-04-10 22:29:26.062524835 +0200
+@@ -18,11 +18,10 @@
+ 
+ 
+ AM_INIT_AUTOMAKE(cngpijmon${program_suffix}, 3.60-1)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(src/config.h)
+ 
+ AC_ISC_POSIX
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ 
+ AM_PATH_GTK_2_0(2.0.0, ,
+--- cnijfilter-source-3.60-1/cngpijmon/src/config.h.in	1970-01-01 01:00:00.000000000 +0100
++++ cnijfilter-source-3.60-1.new/cngpijmon/src/config.h.in	2013-04-10 22:30:19.813732349 +0200
+@@ -0,0 +1 @@
++/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+--- cnijfilter-source-3.60-1/cnijfilter/configure.in	2011-03-29 12:49:28.000000000 +0200
++++ cnijfilter-source-3.60-1.new/cnijfilter/configure.in	2013-04-10 22:32:13.622954256 +0200
+@@ -25,7 +25,7 @@
+ 
+ 
+ AM_INIT_AUTOMAKE(cif${program_suffix}, 3.60-1)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(src/config.h)
+ 
+ dnl Checks for programs.
+ AC_ISC_POSIX
+@@ -47,7 +47,6 @@
+ AC_SUBST(ARC)
+ 
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ 
+ dnl Checks for libraries.
+ 
+--- cnijfilter-source-3.60-1/lgmon/configure.in	2011-03-01 06:43:25.000000000 +0100
++++ cnijfilter-source-3.60-1.new/lgmon/configure.in	2013-04-10 22:33:52.585174559 +0200
+@@ -9,7 +9,7 @@
+ fi
+ 
+ AM_INIT_AUTOMAKE(lgmon{program_suffix}, 3.60-1)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(src/config.h)
+ dnl AM_MAINTAINER_MODE
+ 
+ AC_DEFINE_UNQUOTED(PACKAGE_PRINTER_MODEL, "${program_suffix}")
+@@ -41,7 +41,6 @@
+ AC_SUBST(ARC)
+ 
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ AC_PROG_RANLIB
+ 
+--- cnijfilter-source-3.60-1/lgmon/src/config.h.in	1970-01-01 01:00:00.000000000 +0100
++++ cnijfilter-source-3.60-1.new/lgmon/src/config.h.in	2013-04-10 22:34:24.545891318 +0200
+@@ -0,0 +1 @@
++/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+--- cnijfilter-source-3.60-1/libs/configure.in	2011-02-14 08:27:08.000000000 +0100
++++ cnijfilter-source-3.60-1.new/libs/configure.in	2013-04-10 22:36:09.078234543 +0200
+@@ -1,8 +1,6 @@
+ AC_INIT(paramlist/paramlist.h)
+ AM_INIT_AUTOMAKE(buftool, 1.0.0)
+ 
+-AM_CONFIG_HEADER(config.h)
+-
+ # Checks for programs.
+ AC_PROG_CXX
+ AC_PROG_CC
+--- cnijfilter-source-3.60-1/printui/configure.in	2011-02-15 10:10:31.000000000 +0100
++++ cnijfilter-source-3.60-1.new/printui/configure.in	2013-04-10 22:37:23.159894236 +0200
+@@ -9,7 +9,7 @@
+ fi
+ 
+ AM_INIT_AUTOMAKE(printui${program_suffix}, 3.60-1)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(src/config.h)
+ AM_MAINTAINER_MODE
+ 
+ AC_DEFINE_UNQUOTED(PACKAGE_PRINTER_MODEL, "${program_suffix}")
+@@ -45,7 +45,6 @@
+ 
+ AC_ISC_POSIX
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ 
+ AM_PATH_GTK_2_0(2.6.0, ,
+--- cnijfilter-source-3.60-1/printui/src/config.h.in	1970-01-01 01:00:00.000000000 +0100
++++ cnijfilter-source-3.60-1.new/printui/src/config.h.in	2013-04-10 22:38:03.497464283 +0200
+@@ -0,0 +1 @@
++/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+--- cnijfilter-source-3.60-1/pstocanonij/configure.in	2011-02-14 08:27:08.000000000 +0100
++++ cnijfilter-source-3.60-1.new/pstocanonij/configure.in	2013-04-10 22:38:55.801968666 +0200
+@@ -1,8 +1,6 @@
+ AC_INIT(filter/pstocanonij.c)
+ AM_INIT_AUTOMAKE(pstocanonij, 1.0.0)
+ 
+-AM_CONFIG_HEADER(config.h)
+-
+ AC_ARG_ENABLE(progpath)
+ if test "${enable_progpath}" = "" ; then
+    enable_progpath="${ac_default_prefix}/bin"
diff --git a/cnijfilter-mg5300.install b/cnijfilter-mg5300.install
new file mode 100644
index 000000000000..6b123c09e35a
--- /dev/null
+++ b/cnijfilter-mg5300.install
@@ -0,0 +1,15 @@
+post_install() {
+	if [ -x /usr/bin/ldconfig ]; then
+		/usr/bin/ldconfig
+	fi
+}
+post_upgrade() {
+	if [ -x /usr/bin/ldconfig ]; then
+                /usr/bin/ldconfig
+        fi
+}
+post_remove() {
+        if [ -x /usr/bin/ldconfig ]; then
+                /usr/bin/ldconfig
+        fi
+}
diff --git a/cups.patch b/cups.patch
new file mode 100644
index 000000000000..422035004f62
--- /dev/null
+++ b/cups.patch
@@ -0,0 +1,33 @@
+--- cnijfilter-source-3.60-1/backend/src/cnij_backend_common.c	2011-02-14 08:27:08.000000000 +0100
++++ cnijfilter-source-3.60-1.new/backend/src/cnij_backend_common.c	2013-04-10 22:13:24.924183639 +0200
+@@ -38,6 +38,7 @@
+ // CUPS Header
+ #include <cups/cups.h>
+ #include <cups/ipp.h>
++#include <cups/ppd.h>
+ 
+ // Header file for CANON
+ #include "cnij_backend_common.h"
+--- cnijfilter-source-3.60-1/cngpijmon/src/bjcupsmon_cups.c	2011-03-01 06:52:18.000000000 +0100
++++ cnijfilter-source-3.60-1.new/cngpijmon/src/bjcupsmon_cups.c	2013-04-10 22:14:27.462265743 +0200
+@@ -18,8 +18,10 @@
+  */
+ 
+ /*** Includes ***/
++#define _IPP_PRIVATE_STRUCTURES 1
+ #include <cups/cups.h>
+ #include <cups/language.h>
++#include <cups/ppd.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <pwd.h>
+--- cnijfilter-source-3.60-1/cngpij/cngpij/bjcups.c	2011-03-22 10:57:29.000000000 +0100
++++ cnijfilter-source-3.60-1.new/cngpij/cngpij/bjcups.c	2013-04-10 22:14:57.489611751 +0200
+@@ -21,6 +21,7 @@
+ #include	<config.h>
+ #endif	// HAVE_CONFIG_H
+ 
++#define _IPP_PRIVATE_STRUCTURES 1
+ #include <cups/cups.h>
+ #include <cups/language.h>
+ #include <cups/ppd.h>
diff --git a/id.po.patch b/id.po.patch
new file mode 100644
index 000000000000..cfebdd074aad
--- /dev/null
+++ b/id.po.patch
@@ -0,0 +1,13 @@
+--- cnijfilter-source-3.60-1/printui/po/id.po	2011-05-31 02:57:34.000000000 +0200
++++ cnijfilter-source-3.60-1.new/printui/po/id.po	2013-04-10 22:02:28.789284020 +0200
+@@ -1447,8 +1447,8 @@
+ "Paper Source: %s is not available for the selected Media Type.\n"
+ "Paper Source setting has been changed to %s."
+ msgstr ""
+-"Setelan Sumber Kertas saat ini tidak tersedia untuk Tipe Media yang dipilih.\n"
+-"Setelan Sumber Kertas telah diubah."
++"Setelan Sumber %s Kertas saat ini tidak tersedia untuk Tipe Media yang dipilih.\n"
++"Setelan Sumber Kertas telah diubah %s."
+ 
+ #. bkenh_enh
+ #: po/keystr.h:342
diff --git a/libpng.patch b/libpng.patch
new file mode 100644
index 000000000000..048944c55c10
--- /dev/null
+++ b/libpng.patch
@@ -0,0 +1,22 @@
+--- cnijfilter-source-3.60-1/cnijfilter/src/bjfimage.c	2011-02-17 02:45:45.000000000 +0100
++++ cnijfilter-source-3.60-1.new/cnijfilter/src/bjfimage.c	2013-04-10 21:56:08.217263534 +0200
+@@ -1520,8 +1520,8 @@
+ 	short			tmpformat;
+ 	short			retbyte = 0;
+ 	short			bpp = 3;
+-	long			width = 0;
+-	long			length = 0;
++	png_uint_32		width = 0;
++	png_uint_32		length = 0;
+ 	long			rstep = 0;
+ 	long			RasterLength = 0;
+ 	long			i;
+@@ -1574,7 +1574,7 @@
+ 		goto onErr;
+ 	}
+ 
+-	if (setjmp (png_p->jmpbuf))
++	if (setjmp (png_jmpbuf(png_p)))
+ 	{
+ 		png_destroy_read_struct(&png_p, &info_p, (png_infopp)NULL);
+ 		goto onErr;