diff --git a/applications/codec/CMakeLists.txt b/applications/codec/CMakeLists.txt
index d6494c1c..5bcee3c5 100644
--- a/applications/codec/CMakeLists.txt
+++ b/applications/codec/CMakeLists.txt
@@ -5,6 +5,7 @@ SET(common_SRCS
   convert.c
   converttif.c
   convertbmp.c
+  convertpng.c
   index.c
   ${OPENJPEG_SOURCE_DIR}/applications/common/color.c
   )
diff --git a/applications/codec/convert.c b/applications/codec/convert.c
index 04acd581..d975b72b 100644
--- a/applications/codec/convert.c
+++ b/applications/codec/convert.c
@@ -36,11 +36,6 @@
 #include <string.h>
 #include <ctype.h>
 
-#ifdef HAVE_LIBPNG
-#include <zlib.h>
-#include <png.h>
-#endif /* HAVE_LIBPNG */
-
 #include "openjpeg.h"
 #include "convert.h"
 
@@ -2163,540 +2158,3 @@ int imagetoraw(opj_image_t * image, const char *outfile)
 	fclose(rawFile);
 	return 0;
 }
-
-#ifdef HAVE_LIBPNG
-
-#define PNG_MAGIC "\x89PNG\x0d\x0a\x1a\x0a"
-#define MAGIC_SIZE 8
-/* PNG allows bits per sample: 1, 2, 4, 8, 16 */
-
-opj_image_t *pngtoimage(const char *read_idf, opj_cparameters_t * params)
-{
-	png_structp  png;
-	png_infop    info;
-	double gamma, display_exponent;
-	int bit_depth, interlace_type,compression_type, filter_type;
-	int unit;
-	png_uint_32 resx, resy;
-	unsigned int i, j;
-	png_uint_32  width, height;
-	int color_type, has_alpha, is16;
-	unsigned char *s;
-	FILE *reader;
-	unsigned char **rows;
-/* j2k: */
-	opj_image_t *image;
-	opj_image_cmptparm_t cmptparm[4];
-	int sub_dx, sub_dy;
-	unsigned int nr_comp;
-	int *r, *g, *b, *a;
-	unsigned char sigbuf[8];
-
-	if((reader = fopen(read_idf, "rb")) == NULL)
-   {
-	fprintf(stderr,"pngtoimage: can not open %s\n",read_idf);
-	return NULL;
-   }
-	image = NULL; png = NULL; rows = NULL;
-
-	if(fread(sigbuf, 1, MAGIC_SIZE, reader) != MAGIC_SIZE
-	|| memcmp(sigbuf, PNG_MAGIC, MAGIC_SIZE) != 0)
-   {
-	fprintf(stderr,"pngtoimage: %s is no valid PNG file\n",read_idf);
-	goto fin;
-   }
-/* libpng-VERSION/example.c: 
- * PC : screen_gamma = 2.2;
- * Mac: screen_gamma = 1.7 or 1.0;
-*/
-	display_exponent = 2.2;
-
-	if((png = png_create_read_struct(PNG_LIBPNG_VER_STRING,
-				    NULL, NULL, NULL)) == NULL)
-	  goto fin;
-	if((info = png_create_info_struct(png)) == NULL)
-	  goto fin;
-
-	if(setjmp(png_jmpbuf(png)))
-	  goto fin;
-
-	png_init_io(png, reader);
-	png_set_sig_bytes(png, MAGIC_SIZE);
-
-	png_read_info(png, info);
-
-	if(png_get_IHDR(png, info, &width, &height,
-		&bit_depth, &color_type, &interlace_type, 
-		&compression_type, &filter_type) == 0)
-	 goto fin;
-
-/* png_set_expand():
- * expand paletted images to RGB, expand grayscale images of
- * less than 8-bit depth to 8-bit depth, and expand tRNS chunks
- * to alpha channels.
-*/
-	if(color_type == PNG_COLOR_TYPE_PALETTE)
-	  png_set_expand(png);
-	else
-	if(color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
-	  png_set_expand(png);
-
-	if(png_get_valid(png, info, PNG_INFO_tRNS))
-	  png_set_expand(png);
-
-	is16 = (bit_depth == 16);
-
-/* GRAY => RGB; GRAY_ALPHA => RGBA
-*/
-	if(color_type == PNG_COLOR_TYPE_GRAY
-	|| color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-   {
-	png_set_gray_to_rgb(png);
-	color_type = 
-	 (color_type == PNG_COLOR_TYPE_GRAY? PNG_COLOR_TYPE_RGB:
-		PNG_COLOR_TYPE_RGB_ALPHA);
-   }
-	if( !png_get_gAMA(png, info, &gamma))
-	  gamma = 0.45455;
-
-	png_set_gamma(png, display_exponent, gamma);
-
-	png_read_update_info(png, info);
-
-	png_get_pHYs(png, info, &resx, &resy, &unit);
-
-	color_type = png_get_color_type(png, info);
-
-	has_alpha = (color_type == PNG_COLOR_TYPE_RGB_ALPHA);
-
-	nr_comp = 3 + has_alpha;
-
-	bit_depth = png_get_bit_depth(png, info);
-
-	rows = (unsigned char**)calloc(height+1, sizeof(unsigned char*));
-	for(i = 0; i < height; ++i)
-	 rows[i] = (unsigned char*)malloc(png_get_rowbytes(png,info));
-
-	png_read_image(png, rows);
-
-	memset(&cmptparm, 0, 4 * sizeof(opj_image_cmptparm_t));
-
-	sub_dx = params->subsampling_dx; sub_dy = params->subsampling_dy;
-
-	for(i = 0; i < nr_comp; ++i)
-   {
-	cmptparm[i].prec = bit_depth;
-/* bits_per_pixel: 8 or 16 */
-	cmptparm[i].bpp = bit_depth;
-	cmptparm[i].sgnd = 0;
-	cmptparm[i].dx = sub_dx;
-	cmptparm[i].dy = sub_dy;
-	cmptparm[i].w = width;
-	cmptparm[i].h = height;
-   }
-
-	image = opj_image_create(nr_comp, &cmptparm[0], CLRSPC_SRGB);
-
-	if(image == NULL) goto fin;
-
-    image->x0 = params->image_offset_x0;
-    image->y0 = params->image_offset_y0;
-    image->x1 = image->x0 + (width  - 1) * sub_dx + 1 + image->x0;
-    image->y1 = image->y0 + (height - 1) * sub_dy + 1 + image->y0;
-
-	r = image->comps[0].data;
-	g = image->comps[1].data;
-	b = image->comps[2].data;
-	if(has_alpha) {
-		a = image->comps[3].data;
-	}
-
-	for(i = 0; i < height; ++i)
-   {
-	s = rows[i];
-
-	for(j = 0; j < width; ++j)
-  {
-	if(is16)
- {
-	*r++ = s[0]<<8|s[1]; s += 2;
-
-	*g++ = s[0]<<8|s[1]; s += 2;
-	
-	*b++ = s[0]<<8|s[1]; s += 2;
-	
-	if(has_alpha) { *a++ = s[0]<<8|s[1]; s += 2; }
-
-	continue;
- }
-	*r++ = *s++; *g++ = *s++; *b++ = *s++;
-
-	if(has_alpha) *a++ = *s++;
-  }
-   }
-fin:
-	if(rows)
-   {
-	for(i = 0; i < height; ++i)
-	 free(rows[i]);
-	free(rows);
-   }
-	if(png)
-	  png_destroy_read_struct(&png, &info, NULL);
-
-	fclose(reader);
-
-	return image;
-
-}/* pngtoimage() */
-
-int imagetopng(opj_image_t * image, const char *write_idf)
-{
-	FILE *writer;
-	png_structp png;
-	png_infop info;
-	int *red, *green, *blue, *alpha;
-	unsigned char *row_buf, *d;
-	int has_alpha, width, height, nr_comp, color_type;
-	int adjustR, adjustG, adjustB, adjustA, x, y, fails;
-	int prec, ushift, dshift, is16, force16, force8;
-	unsigned short mask = 0xffff;
-	png_color_8 sig_bit;
-
-	is16 = force16 = force8 = ushift = dshift = 0; fails = 1;
-	prec = image->comps[0].prec;
-	nr_comp = image->numcomps;
-
-	if(prec > 8 && prec < 16)
-   {
-	ushift = 16 - prec; dshift = prec - ushift;
-	prec = 16; force16 = 1;
-   }
-	else
-	if(prec < 8 && nr_comp > 1)/* GRAY_ALPHA, RGB, RGB_ALPHA */
-   {
-	ushift = 8 - prec; dshift = 8 - ushift;
-	prec = 8; force8 = 1;
-   }
-
-	if(prec != 1 && prec != 2 && prec != 4 && prec != 8 && prec != 16)
-   {
-	fprintf(stderr,"imagetopng: can not create %s"
-	 "\n\twrong bit_depth %d\n", write_idf, prec);
-	return fails;
-   }
-	writer = fopen(write_idf, "wb");
-
-	if(writer == NULL) return fails;
-
-	info = NULL; has_alpha = 0;
-
-/* Create and initialize the png_struct with the desired error handler
- * functions.  If you want to use the default stderr and longjump method,
- * you can supply NULL for the last three parameters.  We also check that
- * the library version is compatible with the one used at compile time,
- * in case we are using dynamically linked libraries.  REQUIRED.
-*/
-	png = png_create_write_struct(PNG_LIBPNG_VER_STRING,
-		NULL, NULL, NULL);
-/*png_voidp user_error_ptr, user_error_fn, user_warning_fn); */
-
-	if(png == NULL) goto fin;
-
-/* Allocate/initialize the image information data.  REQUIRED 
-*/
-	info = png_create_info_struct(png);
-
-	if(info == NULL) goto fin;
-
-/* Set error handling.  REQUIRED if you are not supplying your own
- * error handling functions in the png_create_write_struct() call.
-*/
-	if(setjmp(png_jmpbuf(png))) goto fin;
-
-/* I/O initialization functions is REQUIRED 
-*/
-	png_init_io(png, writer);
-
-/* Set the image information here.  Width and height are up to 2^31,
- * bit_depth is one of 1, 2, 4, 8, or 16, but valid values also depend on
- * the color_type selected. color_type is one of PNG_COLOR_TYPE_GRAY,
- * PNG_COLOR_TYPE_GRAY_ALPHA, PNG_COLOR_TYPE_PALETTE, PNG_COLOR_TYPE_RGB,
- * or PNG_COLOR_TYPE_RGB_ALPHA.  interlace is either PNG_INTERLACE_NONE or
- * PNG_INTERLACE_ADAM7, and the compression_type and filter_type MUST
- * currently be PNG_COMPRESSION_TYPE_BASE and PNG_FILTER_TYPE_BASE. 
- * REQUIRED
- *
- * ERRORS:
- *
- * color_type == PNG_COLOR_TYPE_PALETTE && bit_depth > 8
- * color_type == PNG_COLOR_TYPE_RGB && bit_depth < 8
- * color_type == PNG_COLOR_TYPE_GRAY_ALPHA && bit_depth < 8
- * color_type == PNG_COLOR_TYPE_RGB_ALPHA) && bit_depth < 8
- * 
-*/
-	png_set_compression_level(png, Z_BEST_COMPRESSION);
-
-	if(prec == 16) mask = 0xffff;
-	else
-	if(prec == 8) mask = 0x00ff;
-	else
-	if(prec == 4) mask = 0x000f;
-	else
-	if(prec == 2) mask = 0x0003;
-	else
-	if(prec == 1) mask = 0x0001;
-
-	if(nr_comp >= 3
-    && image->comps[0].dx == image->comps[1].dx
-    && image->comps[1].dx == image->comps[2].dx
-    && image->comps[0].dy == image->comps[1].dy
-    && image->comps[1].dy == image->comps[2].dy
-    && image->comps[0].prec == image->comps[1].prec
-    && image->comps[1].prec == image->comps[2].prec)
-   {
-	int v;
-
-    has_alpha = (nr_comp > 3); 
-
-	is16 = (prec == 16);
-	
-    width = image->comps[0].w;
-    height = image->comps[0].h;
-
-	red = image->comps[0].data;
-	green = image->comps[1].data;
-	blue = image->comps[2].data;
-
-    sig_bit.red = sig_bit.green = sig_bit.blue = prec;
-
-	if(has_alpha) 
-  {
-	sig_bit.alpha = prec;
-	alpha = image->comps[3].data; 
-	color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-	adjustA = (image->comps[3].sgnd ? 1 << (image->comps[3].prec - 1) : 0);
-  }
-	else 
-  {
-	sig_bit.alpha = 0; alpha = NULL;
-	color_type = PNG_COLOR_TYPE_RGB;
-	adjustA = 0;
-  }
-	png_set_sBIT(png, info, &sig_bit);
-
-	png_set_IHDR(png, info, width, height, prec, 
-	 color_type,
-	 PNG_INTERLACE_NONE,
-	 PNG_COMPRESSION_TYPE_BASE,  PNG_FILTER_TYPE_BASE);
-/*=============================*/
-	png_write_info(png, info);
-/*=============================*/
-	if(prec < 8)
-  {
-	png_set_packing(png);
-  }
-    adjustR = (image->comps[0].sgnd ? 1 << (image->comps[0].prec - 1) : 0);
-    adjustG = (image->comps[1].sgnd ? 1 << (image->comps[1].prec - 1) : 0);
-    adjustB = (image->comps[2].sgnd ? 1 << (image->comps[2].prec - 1) : 0);
-
-	row_buf = (unsigned char*)malloc(width * nr_comp * 2);
-
-	for(y = 0; y < height; ++y)
-  {
-	d = row_buf;
-
-	for(x = 0; x < width; ++x)
- {
-		if(is16)
-	   {
-		v = *red + adjustR; ++red;
-		
-		if(force16) { v = (v<<ushift) + (v>>dshift); }
-
-		*d++ = (unsigned char)(v>>8); *d++ = (unsigned char)v;
-
-		v = *green + adjustG; ++green;
-		
-		if(force16) { v = (v<<ushift) + (v>>dshift); }
-
-		*d++ = (unsigned char)(v>>8); *d++ = (unsigned char)v;
-
-		v =  *blue + adjustB; ++blue;
-		
-		if(force16) { v = (v<<ushift) + (v>>dshift); }
-
-		*d++ = (unsigned char)(v>>8); *d++ = (unsigned char)v;
-
-		if(has_alpha)
-	  {
-		v = *alpha + adjustA; ++alpha;
-		
-		if(force16) { v = (v<<ushift) + (v>>dshift); }
-
-		*d++ = (unsigned char)(v>>8); *d++ = (unsigned char)v;
-	  }
-		continue;
-	   }/* if(is16) */
-
-		v = *red + adjustR; ++red;
-
-		if(force8) { v = (v<<ushift) + (v>>dshift); }
-
-		*d++ = (unsigned char)(v & mask);
-
-		v = *green + adjustG; ++green;
-
-		if(force8) { v = (v<<ushift) + (v>>dshift); }
-
-		*d++ = (unsigned char)(v & mask);
-
-		v = *blue + adjustB; ++blue;
-
-		if(force8) { v = (v<<ushift) + (v>>dshift); }
-
-		*d++ = (unsigned char)(v & mask);
-
-		if(has_alpha)
-	   {
-		v = *alpha + adjustA; ++alpha;
-
-		if(force8) { v = (v<<ushift) + (v>>dshift); }
-
-		*d++ = (unsigned char)(v & mask);
-	   }
- }	/* for(x) */
-
-	png_write_row(png, row_buf);
-
-  }	/* for(y) */
-	free(row_buf);
-
-   }/* nr_comp >= 3 */
-	else
-	if(nr_comp == 1 /* GRAY */
-	|| (   nr_comp == 2 /* GRAY_ALPHA */
-		&& image->comps[0].dx == image->comps[1].dx
-		&& image->comps[0].dy == image->comps[1].dy
-		&& image->comps[0].prec == image->comps[1].prec))
-   {
-	int v;
-
-	red = image->comps[0].data;
-
-    sig_bit.gray = prec;
-    sig_bit.red = sig_bit.green = sig_bit.blue = sig_bit.alpha = 0;
-	alpha = NULL; adjustA = 0;
-	color_type = PNG_COLOR_TYPE_GRAY;
-
-    if(nr_comp == 2) 
-  { 
-	has_alpha = 1; sig_bit.alpha = prec;
-	alpha = image->comps[1].data;
-	color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-	adjustA = (image->comps[1].sgnd ? 1 << (image->comps[1].prec - 1) : 0);
-  }
-    width = image->comps[0].w;
-    height = image->comps[0].h;
-
-	png_set_IHDR(png, info, width, height, sig_bit.gray,
-     color_type,
-     PNG_INTERLACE_NONE,
-     PNG_COMPRESSION_TYPE_BASE,  PNG_FILTER_TYPE_BASE);
-
-	png_set_sBIT(png, info, &sig_bit);
-/*=============================*/
-	png_write_info(png, info);
-/*=============================*/
-	adjustR = (image->comps[0].sgnd ? 1 << (image->comps[0].prec - 1) : 0);
-
-	if(prec < 8)
-  {
-	png_set_packing(png);
-  }
-
-	if(prec > 8)
-  {
-	row_buf = (unsigned char*)
-	 malloc(width * nr_comp * sizeof(unsigned short));
-
-	for(y = 0; y < height; ++y)
- {
-	d = row_buf;
-
-		for(x = 0; x < width; ++x)
-	   {
-		v = *red + adjustR; ++red;
-
-		if(force16) { v = (v<<ushift) + (v>>dshift); }
-
-		*d++ = (unsigned char)(v>>8); *d++ = (unsigned char)v;
-
-		if(has_alpha)
-	  {
-		v = *alpha++;
-
-		if(force16) { v = (v<<ushift) + (v>>dshift); }
-
-		*d++ = (unsigned char)(v>>8); *d++ = (unsigned char)v;
-	  }
-	   }/* for(x) */
-	png_write_row(png, row_buf);
-
- }	/* for(y) */
-	free(row_buf);
-  }
-	else /* prec <= 8 */
-  {
-	row_buf = (unsigned char*)calloc(width, nr_comp * 2);
-
-	for(y = 0; y < height; ++y)
- {
-	d = row_buf;
-
-		for(x = 0; x < width; ++x)
-	   {
-		v = *red + adjustR; ++red;
-
-		if(force8) { v = (v<<ushift) + (v>>dshift); }
-
-		*d++ = (unsigned char)(v & mask);
-
-		if(has_alpha)
-	  {
-		v = *alpha + adjustA; ++alpha;
-
-		if(force8) { v = (v<<ushift) + (v>>dshift); }
-
-		*d++ = (unsigned char)(v & mask);
-	  }
-	   }/* for(x) */
-
-	png_write_row(png, row_buf);
-
- }	/* for(y) */
-	free(row_buf);
-  }
-   }
-	else
-   {
-	fprintf(stderr,"imagetopng: can not create %s\n",write_idf);
-	goto fin;
-   }
-	png_write_end(png, info);
-
-	fails = 0;
-
-fin:
-
-	if(png)
-   {
-    png_destroy_write_struct(&png, &info);
-   }
-	fclose(writer);
-
-	if(fails) remove(write_idf);
-
-	return fails;
-}/* imagetopng() */
-#endif /* HAVE_LIBPNG */
diff --git a/applications/codec/convertpng.c b/applications/codec/convertpng.c
new file mode 100644
index 00000000..3b0151c6
--- /dev/null
+++ b/applications/codec/convertpng.c
@@ -0,0 +1,496 @@
+/*
+ * The copyright in this software is being made available under the 2-clauses
+ * BSD License, included below. This software may be subject to other third
+ * party and contributor rights, including patent rights, and no such rights
+ * are granted under this license.
+ *
+ * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
+ * Copyright (c) 2003-2014, Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2006-2007, Parvatha Elangovan
+ * Copyright (c) 2015, Matthieu Darbois
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "opj_config.h"
+
+#ifndef HAVE_LIBPNG
+# error HAVE_LIBPNG_NOT_DEFINED
+#endif /* HAVE_LIBPNG */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include <zlib.h>
+#include <png.h>
+
+#include "openjpeg.h"
+#include "convert.h"
+
+#define PNG_MAGIC "\x89PNG\x0d\x0a\x1a\x0a"
+#define MAGIC_SIZE 8
+/* PNG allows bits per sample: 1, 2, 4, 8, 16 */
+
+
+static void convert_16u32s_C1R(const png_byte* pSrc, png_int_32* pDst, size_t length)
+{
+	size_t i;
+	for (i = 0; i < length; i++) {
+		png_int_32 val0 = *pSrc++;
+		png_int_32 val1 = *pSrc++;
+		pDst[i] = val0 << 8 | val1;
+	}
+}
+
+opj_image_t *pngtoimage(const char *read_idf, opj_cparameters_t * params)
+{
+	png_structp  png = NULL;
+	png_infop    info = NULL;
+	double gamma;
+	int bit_depth, interlace_type,compression_type, filter_type;
+	png_uint_32 i;
+	png_uint_32  width, height = 0U;
+	int color_type;
+	FILE *reader = NULL;
+	png_byte** rows = NULL;
+	png_int_32* row32s = NULL;
+	/* j2k: */
+	opj_image_t *image = NULL;
+	opj_image_cmptparm_t cmptparm[4];
+	png_uint_32 nr_comp;
+	png_byte sigbuf[8];
+	convert_XXx32s_C1R cvtXXTo32s = NULL;
+	convert_32s_CXPX cvtCxToPx = NULL;
+	png_int_32* planes[4];
+	
+	if((reader = fopen(read_idf, "rb")) == NULL)
+	{
+		fprintf(stderr,"pngtoimage: can not open %s\n",read_idf);
+		return NULL;
+	}
+	
+	if(fread(sigbuf, 1, MAGIC_SIZE, reader) != MAGIC_SIZE
+		 || memcmp(sigbuf, PNG_MAGIC, MAGIC_SIZE) != 0)
+	{
+		fprintf(stderr,"pngtoimage: %s is no valid PNG file\n",read_idf);
+		goto fin;
+	}
+	
+	if((png = png_create_read_struct(PNG_LIBPNG_VER_STRING,
+																	 NULL, NULL, NULL)) == NULL)
+		goto fin;
+	if((info = png_create_info_struct(png)) == NULL)
+		goto fin;
+	
+	if(setjmp(png_jmpbuf(png)))
+		goto fin;
+	
+	png_init_io(png, reader);
+	png_set_sig_bytes(png, MAGIC_SIZE);
+	
+	png_read_info(png, info);
+	
+	if(png_get_IHDR(png, info, &width, &height,
+									&bit_depth, &color_type, &interlace_type,
+									&compression_type, &filter_type) == 0)
+		goto fin;
+	
+	/* png_set_expand():
+	 * expand paletted images to RGB, expand grayscale images of
+	 * less than 8-bit depth to 8-bit depth, and expand tRNS chunks
+	 * to alpha channels.
+	 */
+	if(color_type == PNG_COLOR_TYPE_PALETTE) {
+		png_set_expand(png);
+	}
+	
+	if(png_get_valid(png, info, PNG_INFO_tRNS)) {
+		png_set_expand(png);
+	}
+	/* We might wan't to expand background */
+	/*
+	if(png_get_valid(png, info, PNG_INFO_bKGD)) {
+		png_color_16p bgnd;
+		png_get_bKGD(png, info, &bgnd);
+		png_set_background(png, bgnd, PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
+	}
+	*/
+	
+	if( !png_get_gAMA(png, info, &gamma))
+		gamma = 1.0;
+	
+	/* we're not displaying but converting, screen gamma == 1.0 */
+	png_set_gamma(png, 1.0, gamma);
+	
+	png_read_update_info(png, info);
+	
+	color_type = png_get_color_type(png, info);
+	
+	switch (color_type) {
+		case PNG_COLOR_TYPE_GRAY:
+			nr_comp = 1;
+			break;
+		case PNG_COLOR_TYPE_GRAY_ALPHA:
+			nr_comp = 2;
+			break;
+		case PNG_COLOR_TYPE_RGB:
+			nr_comp = 3;
+			break;
+		case PNG_COLOR_TYPE_RGB_ALPHA:
+			nr_comp = 4;
+			break;
+		default:
+			fprintf(stderr,"pngtoimage: colortype %d is not supported\n", color_type);
+			goto fin;
+	}
+	cvtCxToPx = convert_32s_CXPX_LUT[nr_comp];
+	bit_depth = png_get_bit_depth(png, info);
+	
+	switch (bit_depth) {
+		case 1:
+		case 2:
+		case 4:
+		case 8:
+			cvtXXTo32s = convert_XXu32s_C1R_LUT[bit_depth];
+			break;
+		case 16: /* 16 bpp is specific to PNG */
+			cvtXXTo32s = convert_16u32s_C1R;
+			break;
+		default:
+			fprintf(stderr,"pngtoimage: bit depth %d is not supported\n", bit_depth);
+			goto fin;
+	}
+
+	
+	rows = (png_byte**)calloc(height+1, sizeof(png_byte*));
+	for(i = 0; i < height; ++i)
+		rows[i] = (png_byte*)malloc(png_get_rowbytes(png,info));
+	
+	png_read_image(png, rows);
+	
+	/* Create image */
+	memset(cmptparm, 0, sizeof(cmptparm));
+	for(i = 0; i < nr_comp; ++i)
+	{
+		cmptparm[i].prec = (png_uint_32)bit_depth;
+		/* bits_per_pixel: 8 or 16 */
+		cmptparm[i].bpp = (png_uint_32)bit_depth;
+		cmptparm[i].sgnd = 0;
+		cmptparm[i].dx = (png_uint_32)params->subsampling_dx;
+		cmptparm[i].dy = (png_uint_32)params->subsampling_dy;
+		cmptparm[i].w = (png_uint_32)width;
+		cmptparm[i].h = (png_uint_32)height;
+	}
+	
+	image = opj_image_create(nr_comp, &cmptparm[0], (nr_comp > 2U) ? CLRSPC_SRGB : CLRSPC_GRAY);
+	if(image == NULL) goto fin;
+	image->x0 = (png_uint_32)params->image_offset_x0;
+	image->y0 = (png_uint_32)params->image_offset_y0;
+	image->x1 = (png_uint_32)(image->x0 + (width  - 1) * (png_uint_32)params->subsampling_dx + 1 + image->x0);
+	image->y1 = (png_uint_32)(image->y0 + (height - 1) * (png_uint_32)params->subsampling_dy + 1 + image->y0);
+	
+	row32s = (png_int_32 *)malloc((size_t)width * nr_comp * sizeof(png_int_32));
+	if(row32s == NULL) goto fin;
+	
+	/* Set alpha channel */
+	/* image->comps[nr_comp-1U].alpha = 1U - (nr_comp & 1U); */
+	
+	for(i = 0; i < nr_comp; i++)
+	{
+		planes[i] = image->comps[i].data;
+	}
+	
+	for(i = 0; i < height; ++i)
+	{
+		cvtXXTo32s(rows[i], row32s, (size_t)width * nr_comp);
+		cvtCxToPx(row32s, planes, width);
+		planes[0] += width;
+		planes[1] += width;
+		planes[2] += width;
+		planes[3] += width;
+	}
+fin:
+	if(rows)
+	{
+		for(i = 0; i < height; ++i)
+			free(rows[i]);
+		free(rows);
+	}
+	if (row32s) {
+		free(row32s);
+	}
+	if(png)
+		png_destroy_read_struct(&png, &info, NULL);
+	
+	fclose(reader);
+	
+	return image;
+	
+}/* pngtoimage() */
+
+
+static void convert_32s16u_C1R(const png_int_32* pSrc, png_byte* pDst, size_t length)
+{
+	size_t i;
+	for (i = 0; i < length; i++) {
+		png_uint_32 val = (png_uint_32)pSrc[i];
+		*pDst++ = (png_byte)(val >> 8);
+		*pDst++ = (png_byte)val;
+	}
+}
+int imagetopng(opj_image_t * image, const char *write_idf)
+{
+	FILE * volatile writer = NULL;
+	png_structp png = NULL;
+	png_infop info = NULL;
+	png_bytep volatile row_buf = NULL;
+	int nr_comp, color_type;
+	volatile int prec;
+	png_color_8 sig_bit;
+	png_int_32 const* planes[4];
+	int i;
+	png_int_32* volatile buffer32s = NULL;
+	
+	volatile int fails = 1;
+	
+	memset(&sig_bit, 0, sizeof(sig_bit));
+	prec = (int)image->comps[0].prec;
+	planes[0] = image->comps[0].data;
+	nr_comp = (int)image->numcomps;
+	
+	if (nr_comp > 4) {
+		nr_comp = 4;
+	}
+	for (i = 1; i < nr_comp; ++i) {
+		if (image->comps[0].dx != image->comps[i].dx) {
+			break;
+		}
+		if (image->comps[0].dy != image->comps[i].dy) {
+			break;
+		}
+		if (image->comps[0].prec != image->comps[i].prec) {
+			break;
+		}
+		if (image->comps[0].sgnd != image->comps[i].sgnd) {
+			break;
+		}
+		planes[i] = image->comps[i].data;
+	}
+	if (i != nr_comp) {
+		fprintf(stderr,"imagetopng: All components shall have the same subsampling, same bit depth, same sign.\n");
+		fprintf(stderr,"\tAborting\n");
+		return 1;
+	}
+	for (i = 0; i < nr_comp; ++i) {
+		clip_component(&(image->comps[i]), image->comps[0].prec);
+	}
+	if(prec > 8 && prec < 16)
+	{
+		for (i = 0; i < nr_comp; ++i) {
+			scale_component(&(image->comps[i]), 16);
+		}
+		prec = 16;
+	}
+	else if(prec < 8 && nr_comp > 1)/* GRAY_ALPHA, RGB, RGB_ALPHA */
+	{
+		for (i = 0; i < nr_comp; ++i) {
+			scale_component(&(image->comps[i]), 8);
+		}
+		prec = 8;
+	} else if((prec > 1) && (prec < 8) && ((prec == 6) || ((prec & 1)==1))) { /* GRAY with non native precision */
+		if ((prec == 5) || (prec == 6)) {
+			prec = 8;
+		} else {
+			prec++;
+		}
+		for (i = 0; i < nr_comp; ++i) {
+			scale_component(&(image->comps[i]), (png_uint_32)prec);
+		}
+	}
+	
+	if(prec != 1 && prec != 2 && prec != 4 && prec != 8 && prec != 16)
+	{
+		fprintf(stderr,"imagetopng: can not create %s\n\twrong bit_depth %d\n", write_idf, prec);
+		return fails;
+	}
+	
+	writer = fopen(write_idf, "wb");
+	
+	if(writer == NULL) return fails;
+	
+	/* Create and initialize the png_struct with the desired error handler
+	 * functions.  If you want to use the default stderr and longjump method,
+	 * you can supply NULL for the last three parameters.  We also check that
+	 * the library version is compatible with the one used at compile time,
+	 * in case we are using dynamically linked libraries.  REQUIRED.
+	 */
+	png = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+																NULL, NULL, NULL);
+	/*png_voidp user_error_ptr, user_error_fn, user_warning_fn); */
+	
+	if(png == NULL) goto fin;
+	
+	/* Allocate/initialize the image information data.  REQUIRED
+	 */
+	info = png_create_info_struct(png);
+	
+	if(info == NULL) goto fin;
+	
+	/* Set error handling.  REQUIRED if you are not supplying your own
+	 * error handling functions in the png_create_write_struct() call.
+	 */
+	if(setjmp(png_jmpbuf(png))) goto fin;
+	
+	/* I/O initialization functions is REQUIRED
+	 */
+	png_init_io(png, writer);
+	
+	/* Set the image information here.  Width and height are up to 2^31,
+	 * bit_depth is one of 1, 2, 4, 8, or 16, but valid values also depend on
+	 * the color_type selected. color_type is one of PNG_COLOR_TYPE_GRAY,
+	 * PNG_COLOR_TYPE_GRAY_ALPHA, PNG_COLOR_TYPE_PALETTE, PNG_COLOR_TYPE_RGB,
+	 * or PNG_COLOR_TYPE_RGB_ALPHA.  interlace is either PNG_INTERLACE_NONE or
+	 * PNG_INTERLACE_ADAM7, and the compression_type and filter_type MUST
+	 * currently be PNG_COMPRESSION_TYPE_BASE and PNG_FILTER_TYPE_BASE.
+	 * REQUIRED
+	 *
+	 * ERRORS:
+	 *
+	 * color_type == PNG_COLOR_TYPE_PALETTE && bit_depth > 8
+	 * color_type == PNG_COLOR_TYPE_RGB && bit_depth < 8
+	 * color_type == PNG_COLOR_TYPE_GRAY_ALPHA && bit_depth < 8
+	 * color_type == PNG_COLOR_TYPE_RGB_ALPHA) && bit_depth < 8
+	 *
+	 */
+	png_set_compression_level(png, Z_BEST_COMPRESSION);
+	
+	if(nr_comp >= 3) /* RGB(A) */
+	{
+		color_type = PNG_COLOR_TYPE_RGB;
+		sig_bit.red = sig_bit.green = sig_bit.blue = (png_byte)prec;
+	}
+	else /* GRAY(A) */
+	{
+		color_type = PNG_COLOR_TYPE_GRAY;
+		sig_bit.gray = (png_byte)prec;
+	}
+	if((nr_comp & 1) == 0) /* ALPHA */
+	{
+		color_type |= PNG_COLOR_MASK_ALPHA;
+		sig_bit.alpha = (png_byte)prec;
+	}
+	
+	png_set_IHDR(png, info, image->comps[0].w, image->comps[0].h, prec, color_type,
+							 PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE,  PNG_FILTER_TYPE_BASE);
+	
+	png_set_sBIT(png, info, &sig_bit);
+	/* png_set_gamma(png, 2.2, 1./2.2); */
+	/* png_set_sRGB(png, info, PNG_sRGB_INTENT_PERCEPTUAL); */
+	png_write_info(png, info);
+	
+	/* setup conversion */
+	{
+		size_t rowStride;
+		png_size_t png_row_size;
+		
+		png_row_size = png_get_rowbytes(png, info);
+		rowStride = ((size_t)image->comps[0].w * (size_t)nr_comp * (size_t)prec + 7U) / 8U;
+		if (rowStride != (size_t)png_row_size) {
+			fprintf(stderr, "Invalid PNG row size\n");
+			goto fin;
+		}
+		row_buf = (png_bytep)malloc(png_row_size);
+		if (row_buf == NULL) {
+			fprintf(stderr, "Can't allocate memory for PNG row\n");
+			goto fin;
+		}
+		buffer32s = (png_int_32*)malloc((size_t)image->comps[0].w * (size_t)nr_comp * sizeof(png_int_32));
+		if (buffer32s == NULL) {
+			fprintf(stderr, "Can't allocate memory for interleaved 32s row\n");
+			goto fin;
+		}
+	}
+	
+	/* convert */
+	{
+		size_t width= image->comps[0].w;
+		png_uint_32 y;
+		convert_32s_PXCX cvtPxToCx = convert_32s_PXCX_LUT[nr_comp];
+		convert_32sXXx_C1R cvt32sToPack = NULL;
+		png_int_32 adjust = image->comps[0].sgnd ? 1 << (prec - 1) : 0;
+		png_bytep row_buf_cpy = row_buf;
+		png_int_32* buffer32s_cpy = buffer32s;
+
+		switch (prec) {
+			case 1:
+			case 2:
+			case 4:
+			case 8:
+				cvt32sToPack = convert_32sXXu_C1R_LUT[prec];
+				break;
+			case 16:
+				cvt32sToPack = convert_32s16u_C1R;
+				break;
+			default:
+				/* never here */
+				break;
+		}
+	
+		for(y = 0; y < image->comps[0].h; ++y)
+		{
+			cvtPxToCx(planes, buffer32s_cpy, width, adjust);
+			cvt32sToPack(buffer32s_cpy, row_buf_cpy, width * (size_t)nr_comp);
+			png_write_row(png, row_buf_cpy);
+			planes[0] += width;
+			planes[1] += width;
+			planes[2] += width;
+			planes[3] += width;
+		}
+	}
+
+	png_write_end(png, info);
+	
+	fails = 0;
+	
+fin:
+	if(png) {
+		png_destroy_write_struct(&png, &info);
+	}
+	if(row_buf) {
+		free(row_buf);
+	}
+	if(buffer32s) {
+		free(buffer32s);
+	}
+	fclose(writer);
+	
+	if(fails) (void)remove(write_idf); /* ignore return value */
+	
+	return fails;
+}/* imagetopng() */
diff --git a/tests/compare_images.c b/tests/compare_images.c
index ce61b3b5..d087c496 100644
--- a/tests/compare_images.c
+++ b/tests/compare_images.c
@@ -644,7 +644,7 @@ static int parse_cmdline_cmp(int argc, char **argv, test_cmp_parameters* param)
 int main(int argc, char **argv)
 {
   test_cmp_parameters inParam;
-  unsigned int it_comp, itpxl;
+  int it_comp, itpxl;
   int failed = 1;
   int nbFilenamePGXbase = 0, nbFilenamePGXtest = 0;
   char *filenamePNGtest= NULL, *filenamePNGbase = NULL, *filenamePNGdiff = NULL;
diff --git a/tests/nonregression/test_suite.ctest.in b/tests/nonregression/test_suite.ctest.in
index f2ba6fc5..034026a9 100644
--- a/tests/nonregression/test_suite.ctest.in
+++ b/tests/nonregression/test_suite.ctest.in
@@ -106,43 +106,43 @@ image_to_j2k -i @INPUT_NR_PATH@/issue203-33x33-bgrx16.bmp -o @TEMP_PATH@/issue20
 image_to_j2k -i @INPUT_NR_PATH@/issue203-127x64-bgr16.bmp -o @TEMP_PATH@/issue203-127x64-bgr16.bmp.jp2
 image_to_j2k -i @INPUT_NR_PATH@/issue203-127x64-bgrx.bmp -o @TEMP_PATH@/issue203-127x64-bgrx.bmp.jp2
 
-# issue 536 (PNG images are always read as RGB(A) images) + issue 264 (convert.c is unmaintainable)
-# Test all images from pngsuite
-# No plan to fix this in 1.5 branch right now
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn0g01.png -o @TEMP_PATH@/basn0g01.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn0g02.png -o @TEMP_PATH@/basn0g02.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn0g04.png -o @TEMP_PATH@/basn0g04.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn0g08.png -o @TEMP_PATH@/basn0g08.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn0g16.png -o @TEMP_PATH@/basn0g16.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn2c08.png -o @TEMP_PATH@/basn2c08.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn2c16.png -o @TEMP_PATH@/basn2c16.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn3p01.png -o @TEMP_PATH@/basn3p01.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn3p02.png -o @TEMP_PATH@/basn3p02.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn3p04.png -o @TEMP_PATH@/basn3p04.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn3p08.png -o @TEMP_PATH@/basn3p08.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn4a08.png -o @TEMP_PATH@/basn4a08.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn4a16.png -o @TEMP_PATH@/basn4a16.png.jp2
-## already done image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn6a08.png -o @TEMP_PATH@/basn6a08.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn6a16.png -o @TEMP_PATH@/basn6a16.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftbbn0g01.png -o @TEMP_PATH@/ftbbn0g01.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftbbn0g02.png -o @TEMP_PATH@/ftbbn0g02.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftbbn0g04.png -o @TEMP_PATH@/ftbbn0g04.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftbbn2c16.png -o @TEMP_PATH@/ftbbn2c16.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftbbn3p08.png -o @TEMP_PATH@/ftbbn3p08.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftbgn2c16.png -o @TEMP_PATH@/ftbgn2c16.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftbgn3p08.png -o @TEMP_PATH@/ftbgn3p08.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftbrn2c08.png -o @TEMP_PATH@/ftbrn2c08.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftbwn0g16.png -o @TEMP_PATH@/ftbwn0g16.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftbwn3p08.png -o @TEMP_PATH@/ftbwn3p08.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftbyn3p08.png -o @TEMP_PATH@/ftbyn3p08.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftp0n0g08.png -o @TEMP_PATH@/ftp0n0g08.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftp0n2c08.png -o @TEMP_PATH@/ftp0n2c08.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftp0n3p08.png -o @TEMP_PATH@/ftp0n3p08.png.jp2
-#image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftp1n3p08.png -o @TEMP_PATH@/ftp1n3p08.png.jp2
-
 # issue 571 Lossless is not lossless on linux x86
 image_to_j2k -i @INPUT_NR_PATH@/issue571.tif -o @TEMP_PATH@/issue571.tif.j2k
 
+# issue 536 (PNG images are always read as RGB(A) images) + issue 264 (convert.c is unmaintainable)
+# Test all images from pngsuite
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn0g01.png -o @TEMP_PATH@/basn0g01.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn0g02.png -o @TEMP_PATH@/basn0g02.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn0g04.png -o @TEMP_PATH@/basn0g04.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn0g08.png -o @TEMP_PATH@/basn0g08.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn0g16.png -o @TEMP_PATH@/basn0g16.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn2c08.png -o @TEMP_PATH@/basn2c08.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn2c16.png -o @TEMP_PATH@/basn2c16.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn3p01.png -o @TEMP_PATH@/basn3p01.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn3p02.png -o @TEMP_PATH@/basn3p02.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn3p04.png -o @TEMP_PATH@/basn3p04.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn3p08.png -o @TEMP_PATH@/basn3p08.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn4a08.png -o @TEMP_PATH@/basn4a08.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn4a16.png -o @TEMP_PATH@/basn4a16.png.jp2
+# already done image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn6a08.png -o @TEMP_PATH@/basn6a08.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/basn6a16.png -o @TEMP_PATH@/basn6a16.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftbbn0g01.png -o @TEMP_PATH@/ftbbn0g01.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftbbn0g02.png -o @TEMP_PATH@/ftbbn0g02.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftbbn0g04.png -o @TEMP_PATH@/ftbbn0g04.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftbbn2c16.png -o @TEMP_PATH@/ftbbn2c16.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftbbn3p08.png -o @TEMP_PATH@/ftbbn3p08.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftbgn2c16.png -o @TEMP_PATH@/ftbgn2c16.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftbgn3p08.png -o @TEMP_PATH@/ftbgn3p08.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftbrn2c08.png -o @TEMP_PATH@/ftbrn2c08.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftbwn0g16.png -o @TEMP_PATH@/ftbwn0g16.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftbwn3p08.png -o @TEMP_PATH@/ftbwn3p08.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftbyn3p08.png -o @TEMP_PATH@/ftbyn3p08.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftp0n0g08.png -o @TEMP_PATH@/ftp0n0g08.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftp0n2c08.png -o @TEMP_PATH@/ftp0n2c08.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftp0n3p08.png -o @TEMP_PATH@/ftp0n3p08.png.jp2
+image_to_j2k -i @INPUT_NR_PATH@/pngsuite/ftp1n3p08.png -o @TEMP_PATH@/ftp1n3p08.png.jp2
+
+
 # DECODER TEST SUITE
 j2k_to_image -i  @INPUT_NR_PATH@/Bretagne2.j2k -o @TEMP_PATH@/Bretagne2.j2k.pgx
 j2k_to_image -i  @INPUT_NR_PATH@/_00042.j2k -o @TEMP_PATH@/_00042.j2k.pgx
@@ -459,50 +459,47 @@ j2k_to_image -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_tif-16.tif
 #issue 235 CMAP outside jp2h box. CMAP is buggy
 j2k_to_image -i @INPUT_NR_PATH@/issue235.jp2 -o @TEMP_PATH@/issue235.jp2.pgx
 
-# NOT IMPLEMENTED >
-# # issue 264, add checks for png
-# # GRAYSCALE
-# j2k_to_image -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_png-1.png -p 1S
-# j2k_to_image -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_png-2.png -p 2S
-# j2k_to_image -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_png-4.png -p 4S
-# j2k_to_image -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_png-6.png -p 6S
-# j2k_to_image -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_png-8.png -p 8S
-# j2k_to_image -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_png-10.png -p 10S
-# j2k_to_image -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_png-12.png -p 12S
-# j2k_to_image -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_png-14.png -p 14S
-# j2k_to_image -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_png-16.png -p 16S
-# # GRAYSCALE ALPHA
-# j2k_to_image -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_png-1.png -p 1S
-# j2k_to_image -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_png-2.png -p 2S
-# j2k_to_image -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_png-4.png -p 4S
-# j2k_to_image -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_png-6.png -p 6S
-# j2k_to_image -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_png-8.png -p 8S
-# j2k_to_image -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_png-10.png -p 10S
-# j2k_to_image -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_png-12.png -p 12S
-# j2k_to_image -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_png-14.png -p 14S
-# j2k_to_image -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_png-16.png -p 16S
-# # RGB
-# j2k_to_image -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_png-1.png -p 1S
-# j2k_to_image -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_png-2.png -p 2S
-# j2k_to_image -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_png-4.png -p 4S
-# j2k_to_image -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_png-6.png -p 6S
-# j2k_to_image -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_png-8.png -p 8S
-# j2k_to_image -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_png-10.png -p 10S
-# j2k_to_image -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_png-12.png -p 12S
-# j2k_to_image -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_png-14.png -p 14S
-# j2k_to_image -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_png-16.png -p 16S
-# # RGBA
-# j2k_to_image -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-1.png -p 1S
-# j2k_to_image -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-2.png -p 2S
-# j2k_to_image -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-4.png -p 4S
-# j2k_to_image -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-6.png -p 6S
-# j2k_to_image -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-8.png -p 8S
-# j2k_to_image -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-10.png -p 10S
-# j2k_to_image -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-12.png -p 12S
-# j2k_to_image -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-14.png -p 14S
-# j2k_to_image -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-16.png -p 16S
-
-# < NOT IMPLEMENTED
+# issue 264, add checks for png
+# GRAYSCALE
+j2k_to_image -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_png-1.png -p 1S
+j2k_to_image -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_png-2.png -p 2S
+j2k_to_image -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_png-4.png -p 4S
+j2k_to_image -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_png-6.png -p 6S
+j2k_to_image -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_png-8.png -p 8S
+j2k_to_image -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_png-10.png -p 10S
+j2k_to_image -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_png-12.png -p 12S
+j2k_to_image -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_png-14.png -p 14S
+j2k_to_image -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_png-16.png -p 16S
+# GRAYSCALE ALPHA
+j2k_to_image -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_png-1.png -p 1S
+j2k_to_image -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_png-2.png -p 2S
+j2k_to_image -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_png-4.png -p 4S
+j2k_to_image -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_png-6.png -p 6S
+j2k_to_image -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_png-8.png -p 8S
+j2k_to_image -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_png-10.png -p 10S
+j2k_to_image -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_png-12.png -p 12S
+j2k_to_image -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_png-14.png -p 14S
+j2k_to_image -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_png-16.png -p 16S
+# RGB
+j2k_to_image -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_png-1.png -p 1S
+j2k_to_image -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_png-2.png -p 2S
+j2k_to_image -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_png-4.png -p 4S
+j2k_to_image -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_png-6.png -p 6S
+j2k_to_image -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_png-8.png -p 8S
+j2k_to_image -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_png-10.png -p 10S
+j2k_to_image -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_png-12.png -p 12S
+j2k_to_image -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_png-14.png -p 14S
+j2k_to_image -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_png-16.png -p 16S
+# RGBA
+j2k_to_image -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-1.png -p 1S
+j2k_to_image -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-2.png -p 2S
+j2k_to_image -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-4.png -p 4S
+j2k_to_image -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-6.png -p 6S
+j2k_to_image -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-8.png -p 8S
+j2k_to_image -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-10.png -p 10S
+j2k_to_image -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-12.png -p 12S
+j2k_to_image -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-14.png -p 14S
+j2k_to_image -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-16.png -p 16S
 
 # issue 388
 !j2k_to_image -i @INPUT_NR_PATH@/v4dwt_interleave_h.gsr105.j2k -o @TEMP_PATH@/v4dwt_interleave_h.gsr105.j2k.pgx