openjpeg version 1.0 (previous version still available with tag opj0-97)

8 files changed, 1750 insertions, 2444 deletions

diff --git a/codec/compat/getopt.c b/codec/compat/getopt.c
index d0082c51..d5420acb 100644
--- a/codec/compat/getopt.c
+++ b/codec/compat/getopt.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1987, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
+ *  The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,8 +12,8 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -34,48 +34,44 @@
 /* last review : october 29th, 2002 */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getopt.c	8.3 (Berkeley) 4/27/95";
-#endif				/* LIBC_SCCS and not lint */
+static char sccsid[] = "@(#)getopt.c  8.3 (Berkeley) 4/27/95";
+#endif        /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-int opterr = 1,			/* if error message should be printed */
- optind = 1,			/* index into parent argv vector */
- optopt,			/* character checked for validity */
- optreset;			/* reset getopt */
-char *optarg;			/* argument associated with option */
+int opterr = 1,     /* if error message should be printed */
+ optind = 1,      /* index into parent argv vector */
+ optopt,      /* character checked for validity */
+ optreset;      /* reset getopt */
+char *optarg;     /* argument associated with option */
 
-#define	BADCH	(int)'?'
-#define	BADARG	(int)':'
-#define	EMSG	""
+#define BADCH (int)'?'
+#define BADARG  (int)':'
+#define EMSG  ""
 
 /*
  * getopt --
- *	Parse argc/argv argument vector.
+ *  Parse argc/argv argument vector.
  */
-int getopt(nargc, nargv, ostr)
-int nargc;
-char *const *nargv;
-const char *ostr;
-{
+int getopt(int nargc, char *const *nargv, const char *ostr) {
 #  define __progname nargv[0]
-  static char *place = EMSG;	/* option letter processing */
-  char *oli;			/* option letter list index */
+  static char *place = EMSG;  /* option letter processing */
+  char *oli;      /* option letter list index */
 
-  if (optreset || !*place) {	/* update scanning pointer */
+  if (optreset || !*place) {  /* update scanning pointer */
     optreset = 0;
     if (optind >= nargc || *(place = nargv[optind]) != '-') {
       place = EMSG;
       return (-1);
     }
-    if (place[1] && *++place == '-') {	/* found "--" */
+    if (place[1] && *++place == '-') {  /* found "--" */
       ++optind;
       place = EMSG;
       return (-1);
     }
-  }				/* option letter okay? */
+  }       /* option letter okay? */
   if ((optopt = (int) *place++) == (int) ':' ||
       !(oli = strchr(ostr, optopt))) {
     /*
@@ -88,29 +84,29 @@ const char *ostr;
       ++optind;
     if (opterr && *ostr != ':')
       (void) fprintf(stderr,
-		     "%s: illegal option -- %c\n", __progname, optopt);
+         "%s: illegal option -- %c\n", __progname, optopt);
     return (BADCH);
   }
-  if (*++oli != ':') {		/* don't need argument */
+  if (*++oli != ':') {    /* don't need argument */
     optarg = NULL;
     if (!*place)
       ++optind;
-  } else {			/* need an argument */
-    if (*place)			/* no white space */
+  } else {      /* need an argument */
+    if (*place)     /* no white space */
       optarg = place;
-    else if (nargc <= ++optind) {	/* no arg */
+    else if (nargc <= ++optind) { /* no arg */
       place = EMSG;
       if (*ostr == ':')
-	return (BADARG);
+  return (BADARG);
       if (opterr)
-	(void) fprintf(stderr,
-		       "%s: option requires an argument -- %c\n",
-		       __progname, optopt);
+  (void) fprintf(stderr,
+           "%s: option requires an argument -- %c\n",
+           __progname, optopt);
       return (BADCH);
-    } else			/* white space */
+    } else      /* white space */
       optarg = nargv[optind];
     place = EMSG;
     ++optind;
   }
-  return (optopt);		/* dump back option letter */
+  return (optopt);    /* dump back option letter */
 }
diff --git a/codec/compat/getopt.h b/codec/compat/getopt.h
index ab9c1a7b..c2b4ddde 100644
--- a/codec/compat/getopt.h
+++ b/codec/compat/getopt.h
@@ -11,4 +11,4 @@ extern char *optarg;
 
 extern int getopt(int nargc, char *const *nargv, const char *ostr);
 
-#endif				/* _GETOPT_H_ */
+#endif        /* _GETOPT_H_ */
diff --git a/codec/convert.c b/codec/convert.c
index 427d7740..813a0601 100644
--- a/codec/convert.c
+++ b/codec/convert.c
@@ -1,7 +1,9 @@
 /*
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2002-2003,  Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
+ * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
+ * Copyright (c) 2005, HervŽ Drolon, FreeImage Team
+ * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,11 +28,41 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <openjpeg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <math.h>
 #include <string.h>
+#include "openjpeg.h"
+
+/*
+ * Get logarithm of an integer and round downwards.
+ *
+ * log2(a)
+ */
+static int int_floorlog2(int a) {
+  int l;
+  for (l = 0; a > 1; l++) {
+    a >>= 1;
+  }
+  return l;
+}
+
+/*
+ * Divide an integer by a power of 2 and round upwards.
+ *
+ * a divided by 2^b
+ */
+static int int_ceildivpow2(int a, int b) {
+  return (a + (1 << b) - 1) >> b;
+}
+
+/*
+ * Divide an integer and round upwards.
+ *
+ * a divided by b
+ */
+static int int_ceildiv(int a, int b) {
+  return (a + b - 1) / b;
+}
 
 /* -->> -->> -->> -->>
 
@@ -38,63 +70,66 @@
 
  <<-- <<-- <<-- <<-- */
 
-/* UINT2 defines a two byte word */
-typedef unsigned short int UINT2;
+/* WORD defines a two byte word */
+typedef unsigned short int WORD;
 
-/* UINT4 defines a four byte word */
-typedef unsigned long int UINT4;
+/* DWORD defines a four byte word */
+typedef unsigned long int DWORD;
 
 typedef struct {
-  UINT2 bfType;			/* 'BM' for Bitmap (19776) */
-  UINT4 bfSize;			/* Size of the file        */
-  UINT2 bfReserved1;		/* Reserved : 0            */
-  UINT2 bfReserved2;		/* Reserved : 0            */
-  UINT4 bfOffBits;		/* Offset                  */
+  WORD bfType;      /* 'BM' for Bitmap (19776) */
+  DWORD bfSize;     /* Size of the file        */
+  WORD bfReserved1;   /* Reserved : 0            */
+  WORD bfReserved2;   /* Reserved : 0            */
+  DWORD bfOffBits;    /* Offset                  */
 } BITMAPFILEHEADER_t;
 
 typedef struct {
-  UINT4 biSize;			/* Size of the structure in bytes */
-  UINT4 biWidth;		/* Width of the image in pixels */
-  UINT4 biHeight;		/* Heigth of the image in pixels */
-  UINT2 biPlanes;		/* 1 */
-  UINT2 biBitCount;		/* Number of color bits by pixels */
-  UINT4 biCompression;		/* Type of encoding 0: none 1: RLE8 2: RLE4 */
-  UINT4 biSizeImage;		/* Size of the image in bytes */
-  UINT4 biXpelsPerMeter;	/* Horizontal (X) resolution in pixels/meter */
-  UINT4 biYpelsPerMeter;	/* Vertical (Y) resolution in pixels/meter */
-  UINT4 biClrUsed;		/* Number of color used in the image (0: ALL) */
-  UINT4 biClrImportant;		/* Number of important color (0: ALL) */
+  DWORD biSize;     /* Size of the structure in bytes */
+  DWORD biWidth;    /* Width of the image in pixels */
+  DWORD biHeight;   /* Heigth of the image in pixels */
+  WORD biPlanes;    /* 1 */
+  WORD biBitCount;    /* Number of color bits by pixels */
+  DWORD biCompression;    /* Type of encoding 0: none 1: RLE8 2: RLE4 */
+  DWORD biSizeImage;    /* Size of the image in bytes */
+  DWORD biXpelsPerMeter;  /* Horizontal (X) resolution in pixels/meter */
+  DWORD biYpelsPerMeter;  /* Vertical (Y) resolution in pixels/meter */
+  DWORD biClrUsed;    /* Number of color used in the image (0: ALL) */
+  DWORD biClrImportant;   /* Number of important color (0: ALL) */
 } BITMAPINFOHEADER_t;
 
-int bmptoimage(char *filename, j2k_image_t * img, int subsampling_dx,
-	       int subsampling_dy, int Dim[2])
-{
+opj_image_t* bmptoimage(char *filename, opj_cparameters_t *parameters) {
+  int subsampling_dx = parameters->subsampling_dx;
+  int subsampling_dy = parameters->subsampling_dy;
+
+  int i, numcomps, w, h;
+  OPJ_COLOR_SPACE color_space;
+  opj_image_cmptparm_t cmptparm[3]; /* maximum of 3 components */
+  opj_image_t * image = NULL;
+
   FILE *IN;
-  FILE *Compo0 = NULL, *Compo1 = NULL, *Compo2 = NULL;
   BITMAPFILEHEADER_t File_h;
   BITMAPINFOHEADER_t Info_h;
   unsigned char *RGB;
   unsigned char *table_R, *table_G, *table_B;
-  unsigned int j, w, h, PAD, type = 0;
+  unsigned int j, PAD, type = 0;
 
-  int i;
+  int x, y, index;
   int gray_scale = 1, not_end_file = 1; 
 
   unsigned int line = 0, col = 0;
   unsigned char v, v2;
-  UINT4 W, H;
-
+  DWORD W, H;
+  
   IN = fopen(filename, "rb");
   if (!IN) {
-    fprintf(stderr,
-	    "\033[0;33mFailed to open %s for reading !!\033[0;39m\n",
-	    filename);
+    fprintf(stderr, "\033[0;33mFailed to open %s for reading !!\033[0;39m\n", filename);
     return 0;
   }
-
+  
   File_h.bfType = getc(IN);
   File_h.bfType = (getc(IN) << 8) + File_h.bfType;
-
+  
   if (File_h.bfType != 19778) {
     fprintf(stderr,"Error, not a BMP file!\n");
     return 0;
@@ -174,348 +209,422 @@ int bmptoimage(char *filename, j2k_image_t * img, int subsampling_dx,
     Info_h.biClrImportant = (getc(IN) << 24) + Info_h.biClrImportant;
 
     /* Read the data and store them in the OUT file */
-
+    
     if (Info_h.biBitCount == 24) {
-      img->x0 = Dim[0];
-      img->y0 = Dim[1];
-      img->x1 =
-	!Dim[0] ? (w - 1) * subsampling_dx + 1 : Dim[0] + (w -
-							   1) *
-	subsampling_dx + 1;
-      img->y1 =
-	!Dim[1] ? (h - 1) * subsampling_dy + 1 : Dim[1] + (h -
-							   1) *
-	subsampling_dy + 1;
-      img->numcomps = 3;
-      img->color_space = 1;
-      img->comps =
-	(j2k_comp_t *) malloc(img->numcomps * sizeof(j2k_comp_t));
-      for (i = 0; i < img->numcomps; i++) {
-	img->comps[i].prec = 8;
-	img->comps[i].bpp = 8;
-	img->comps[i].sgnd = 0;
-	img->comps[i].dx = subsampling_dx;
-	img->comps[i].dy = subsampling_dy;
-      }
-      Compo0 = fopen("Compo0", "wb");
-      if (!Compo0) {
-	fprintf(stderr,
-		"\033[0;33mFailed to open Compo0 for writing !\033[0;39m\n");
+      numcomps = 3;
+      color_space = CLRSPC_SRGB;
+      /* initialize image components */
+      memset(&cmptparm[0], 0, 3 * sizeof(opj_image_cmptparm_t));
+      for(i = 0; i < numcomps; i++) {
+        cmptparm[i].prec = 8;
+        cmptparm[i].bpp = 8;
+        cmptparm[i].sgnd = 0;
+        cmptparm[i].dx = subsampling_dx;
+        cmptparm[i].dy = subsampling_dy;
+        cmptparm[i].w = w;
+        cmptparm[i].h = h;
       }
-      Compo1 = fopen("Compo1", "wb");
-      if (!Compo1) {
-	fprintf(stderr,
-		"\033[0;33mFailed to open Compo1 for writing !\033[0;39m\n");
-      }
-      Compo2 = fopen("Compo2", "wb");
-      if (!Compo2) {
-	fprintf(stderr,
-		"\033[0;33mFailed to open Compo2 for writing !\033[0;39m\n");
+      /* create the image */
+      image = opj_image_create(numcomps, &cmptparm[0], color_space);
+      if(!image) {
+        fclose(IN);
+        return NULL;
       }
 
+      /* set image offset and reference grid */
+      image->x0 = parameters->image_offset_x0;
+      image->y0 = parameters->image_offset_y0;
+      image->x1 = !image->x0 ? (w - 1) * subsampling_dx + 1 : image->x0 + (w - 1) * subsampling_dx + 1;
+      image->y1 = !image->y0 ? (h - 1) * subsampling_dy + 1 : image->y0 + (h - 1) * subsampling_dy + 1;
+
+      /* set image data */
+
       /* Place the cursor at the beginning of the image information */
       fseek(IN, 0, SEEK_SET);
       fseek(IN, File_h.bfOffBits, SEEK_SET);
-
+      
       W = Info_h.biWidth;
       H = Info_h.biHeight;
 
       // PAD = 4 - (3 * W) % 4;
       // PAD = (PAD == 4) ? 0 : PAD;
       PAD = (3 * W) % 4 ? 4 - (3 * W) % 4 : 0;
-
-
-      RGB =
-	(unsigned char *) malloc((3 * W + PAD) * H *
-				 sizeof(unsigned char));
-
+      
+      RGB = (unsigned char *) malloc((3 * W + PAD) * H * sizeof(unsigned char));
+      
       fread(RGB, sizeof(unsigned char), (3 * W + PAD) * H, IN);
-
-      for (j = 0; j < (3 * W + PAD) * H; j++) {
-	unsigned char elmt;
-	int Wp = 3 * W + PAD;
-
-	elmt = RGB[(H - (j / Wp + 1)) * Wp + j % Wp];
-	if ((j % Wp) < (3 * W)) {
-	  switch (type) {
-	  case 0:
-	    fprintf(Compo2, "%c", elmt);
-	    type = 1;
-	    break;
-	  case 1:
-	    fprintf(Compo1, "%c", elmt);
-	    type = 2;
-	    break;
-	  case 2:
-	    fprintf(Compo0, "%c", elmt);
-	    type = 0;
-	    break;
-	  }
-	}
+      
+      index = 0;
+
+      for(y = 0; y < (int)H; y++) {
+        unsigned char *scanline = RGB + (3 * W + PAD) * (H - 1 - y);
+        for(x = 0; x < (int)W; x++) {
+          unsigned char *pixel = &scanline[3 * x];
+          image->comps[0].data[index] = pixel[2]; /* R */
+          image->comps[1].data[index] = pixel[1]; /* G */
+          image->comps[2].data[index] = pixel[0]; /* B */
+          index++;
+        }
       }
 
-      fclose(Compo0);
-      fclose(Compo1);
-      fclose(Compo2);
       free(RGB);
-    } else if (Info_h.biBitCount == 8 && Info_h.biCompression == 0) {
-      img->x0 = Dim[0];
-      img->y0 = Dim[1];
-      img->x1 =
-	!Dim[0] ? (w - 1) * subsampling_dx + 1 : Dim[0] + (w -
-							   1) *
-	subsampling_dx + 1;
-      img->y1 =
-	!Dim[1] ? (h - 1) * subsampling_dy + 1 : Dim[1] + (h -
-							   1) *
-	subsampling_dy + 1;
 
+    } else if (Info_h.biBitCount == 8 && Info_h.biCompression == 0) {
       table_R = (unsigned char *) malloc(256 * sizeof(unsigned char));
       table_G = (unsigned char *) malloc(256 * sizeof(unsigned char));
       table_B = (unsigned char *) malloc(256 * sizeof(unsigned char));
-
+      
       for (j = 0; j < Info_h.biClrUsed; j++) {
-	table_B[j] = getc(IN);
-	table_G[j] = getc(IN);
-	table_R[j] = getc(IN);
-	getc(IN);
-	if (table_R[j] != table_G[j] && table_R[j] != table_B[j]
-	    && table_G[j] != table_B[j])
-	  gray_scale = 0;
+        table_B[j] = getc(IN);
+        table_G[j] = getc(IN);
+        table_R[j] = getc(IN);
+        getc(IN);
+        if (table_R[j] != table_G[j] && table_R[j] != table_B[j] && table_G[j] != table_B[j])
+          gray_scale = 0;
       }
-
+      
       /* Place the cursor at the beginning of the image information */
       fseek(IN, 0, SEEK_SET);
       fseek(IN, File_h.bfOffBits, SEEK_SET);
-
+      
       W = Info_h.biWidth;
       H = Info_h.biHeight;
       if (Info_h.biWidth % 2)
-	W++;
+        W++;
+      
+      numcomps = gray_scale ? 1 : 3;
+      color_space = gray_scale ? CLRSPC_GRAY : CLRSPC_SRGB;
+      /* initialize image components */
+      memset(&cmptparm[0], 0, 3 * sizeof(opj_image_cmptparm_t));
+      for(i = 0; i < numcomps; i++) {
+        cmptparm[i].prec = 8;
+        cmptparm[i].bpp = 8;
+        cmptparm[i].sgnd = 0;
+        cmptparm[i].dx = subsampling_dx;
+        cmptparm[i].dy = subsampling_dy;
+        cmptparm[i].w = w;
+        cmptparm[i].h = h;
+      }
+      /* create the image */
+      image = opj_image_create(numcomps, &cmptparm[0], color_space);
+      if(!image) {
+        fclose(IN);
+        return NULL;
+      }
 
-      RGB = (unsigned char *) malloc(W * H * sizeof(unsigned char));
+      /* set image offset and reference grid */
+      image->x0 = parameters->image_offset_x0;
+      image->y0 = parameters->image_offset_y0;
+      image->x1 = !image->x0 ? (w - 1) * subsampling_dx + 1 : image->x0 + (w - 1) * subsampling_dx + 1;
+      image->y1 = !image->y0 ? (h - 1) * subsampling_dy + 1 : image->y0 + (h - 1) * subsampling_dy + 1;
 
+      /* set image data */
+
+      RGB = (unsigned char *) malloc(W * H * sizeof(unsigned char));
+      
       fread(RGB, sizeof(unsigned char), W * H, IN);
       if (gray_scale) {
-	img->numcomps = 1;
-	img->comps =
-	  (j2k_comp_t *) malloc(img->numcomps * sizeof(j2k_comp_t));
-	img->comps[0].prec = 8;
-	img->comps[0].bpp = 8;
-	img->comps[0].sgnd = 0;
-	img->comps[0].dx = subsampling_dx;
-	img->comps[0].dy = subsampling_dy;
-	Compo0 = fopen("Compo0", "wb");
-	if (!Compo0) {
-	  fprintf(stderr,
-		  "\033[0;33mFailed to open Compo0 for writing !\033[0;39m\n");
-	}
-	for (j = 0; j < W * H; j++) {
-	  if ((j % W < W - 1 && Info_h.biWidth % 2)
-	      || !(Info_h.biWidth % 2))
-	    fprintf(Compo0, "%c",
-		    table_R[RGB[W * H - ((j) / (W) + 1) * W + (j) % (W)]]);
-	}
-	fclose(Compo0);
-      } else {
-	img->numcomps = 3;
-	img->comps =
-	  (j2k_comp_t *) malloc(img->numcomps * sizeof(j2k_comp_t));
-	for (i = 0; i < img->numcomps; i++) {
-	  img->comps[i].prec = 8;
-	  img->comps[i].bpp = 8;
-	  img->comps[i].sgnd = 0;
-	  img->comps[i].dx = subsampling_dx;
-	  img->comps[i].dy = subsampling_dy;
-	}
-
-	Compo0 = fopen("Compo0", "wb");
-	if (!Compo0) {
-	  fprintf(stderr,
-		  "\033[0;33mFailed to open Compo0 for writing !\033[0;39m\n");
-	}
-	Compo1 = fopen("Compo1", "wb");
-	if (!Compo1) {
-	  fprintf(stderr,
-		  "\033[0;33mFailed to open Compo1 for writing !\033[0;39m\n");
-	}
-	Compo2 = fopen("Compo2", "wb");
-	if (!Compo2) {
-	  fprintf(stderr,
-		  "\033[0;33mFailed to open Compo2 for writing !\033[0;39m\n");
-	}
-
-	for (j = 0; j < W * H; j++) {
-	  if ((j % W < W - 1 && Info_h.biWidth % 2)
-	      || !(Info_h.biWidth % 2)) {
-	    fprintf(Compo0, "%c",
-		    table_R[RGB[W * H - ((j) / (W) + 1) * W + (j) % (W)]]);
-	    fprintf(Compo1, "%c",
-		    table_G[RGB[W * H - ((j) / (W) + 1) * W + (j) % (W)]]);
-	    fprintf(Compo2, "%c",
-		    table_B[RGB[W * H - ((j) / (W) + 1) * W + (j) % (W)]]);
-	  }
-
-	}
-	fclose(Compo0);
-	fclose(Compo1);
-	fclose(Compo2);
+        index = 0;
+        for (j = 0; j < W * H; j++) {
+          if ((j % W < W - 1 && Info_h.biWidth % 2) || !(Info_h.biWidth % 2)) {
+            image->comps[0].data[index] = table_R[RGB[W * H - ((j) / (W) + 1) * W + (j) % (W)]];
+            index++;
+          }
+        }
+
+      } else {    
+        index = 0;
+        for (j = 0; j < W * H; j++) {
+          if ((j % W < W - 1 && Info_h.biWidth % 2) || !(Info_h.biWidth % 2)) {
+            unsigned char pixel_index = RGB[W * H - ((j) / (W) + 1) * W + (j) % (W)];
+            image->comps[0].data[index] = table_R[pixel_index];
+            image->comps[1].data[index] = table_G[pixel_index];
+            image->comps[2].data[index] = table_B[pixel_index];
+            index++;
+          }
+        }
       }
       free(RGB);
-
-    } else if (Info_h.biBitCount == 8 && Info_h.biCompression == 1) {
-      img->x0 = Dim[0];
-      img->y0 = Dim[1];
-      img->x1 =
-	!Dim[0] ? (w - 1) * subsampling_dx + 1 : Dim[0] + (w -
-							   1) *
-	subsampling_dx + 1;
-      img->y1 =
-	!Dim[1] ? (h - 1) * subsampling_dy + 1 : Dim[1] + (h -
-							   1) *
-	subsampling_dy + 1;
-
+            
+    } else if (Info_h.biBitCount == 8 && Info_h.biCompression == 1) {       
       table_R = (unsigned char *) malloc(256 * sizeof(unsigned char));
       table_G = (unsigned char *) malloc(256 * sizeof(unsigned char));
       table_B = (unsigned char *) malloc(256 * sizeof(unsigned char));
-
+      
       for (j = 0; j < Info_h.biClrUsed; j++) {
-	table_B[j] = getc(IN);
-	table_G[j] = getc(IN);
-	table_R[j] = getc(IN);
-	getc(IN);
-	if (table_R[j] != table_G[j] && table_R[j] != table_B[j]
-	    && table_G[j] != table_B[j])
-	  gray_scale = 0;
+        table_B[j] = getc(IN);
+        table_G[j] = getc(IN);
+        table_R[j] = getc(IN);
+        getc(IN);
+        if (table_R[j] != table_G[j] && table_R[j] != table_B[j] && table_G[j] != table_B[j])
+          gray_scale = 0;
       }
 
-      /* Place the cursor at the beginning of the image information */
-      fseek(IN, 0, SEEK_SET);
-      fseek(IN, File_h.bfOffBits, SEEK_SET);
-
-      if (gray_scale) {
-	img->numcomps = 1;
-	img->comps = (j2k_comp_t *) malloc(sizeof(j2k_comp_t));
-	img->comps[0].prec = 8;
-	img->comps[0].bpp = 8;
-	img->comps[0].sgnd = 0;
-	img->comps[0].dx = subsampling_dx;
-	img->comps[0].dy = subsampling_dy;
-	Compo0 = fopen("Compo0", "wb");
-	if (!Compo0) {
-	  fprintf(stderr,
-		  "\033[0;33mFailed to open Compo0 for writing !\033[0;39m\n");
-	}
-      } else {
-	img->numcomps = 3;
-	img->comps =
-	  (j2k_comp_t *) malloc(img->numcomps * sizeof(j2k_comp_t));
-	for (i = 0; i < img->numcomps; i++) {
-	  img->comps[i].prec = 8;
-	  img->comps[i].bpp = 8;
-	  img->comps[i].sgnd = 0;
-	  img->comps[i].dx = subsampling_dx;
-	  img->comps[i].dy = subsampling_dy;
-	}
-	Compo0 = fopen("Compo0", "wb");
-	if (!Compo0) {
-	  fprintf(stderr,
-		  "\033[0;33mFailed to open Compo0 for writing !\033[0;39m\n");
-	}
-	Compo1 = fopen("Compo1", "wb");
-	if (!Compo1) {
-	  fprintf(stderr,
-		  "\033[0;33mFailed to open Compo1 for writing !\033[0;39m\n");
-	}
-	Compo2 = fopen("Compo2", "wb");
-	if (!Compo2) {
-	  fprintf(stderr,
-		  "\033[0;33mFailed to open Compo2 for writing !\033[0;39m\n");
-	}
+      numcomps = gray_scale ? 1 : 3;
+      color_space = gray_scale ? CLRSPC_GRAY : CLRSPC_SRGB;
+      /* initialize image components */
+      memset(&cmptparm[0], 0, 3 * sizeof(opj_image_cmptparm_t));
+      for(i = 0; i < numcomps; i++) {
+        cmptparm[i].prec = 8;
+        cmptparm[i].bpp = 8;
+        cmptparm[i].sgnd = 0;
+        cmptparm[i].dx = subsampling_dx;
+        cmptparm[i].dy = subsampling_dy;
+        cmptparm[i].w = w;
+        cmptparm[i].h = h;
+      }
+      /* create the image */
+      image = opj_image_create(numcomps, &cmptparm[0], color_space);
+      if(!image) {
+        fclose(IN);
+        return NULL;
       }
 
-      RGB =
-	(unsigned char *) malloc(Info_h.biWidth * Info_h.biHeight *
-				 sizeof(unsigned char));
+      /* set image offset and reference grid */
+      image->x0 = parameters->image_offset_x0;
+      image->y0 = parameters->image_offset_y0;
+      image->x1 = !image->x0 ? (w - 1) * subsampling_dx + 1 : image->x0 + (w - 1) * subsampling_dx + 1;
+      image->y1 = !image->y0 ? (h - 1) * subsampling_dy + 1 : image->y0 + (h - 1) * subsampling_dy + 1;
 
+      /* set image data */
+      
+      /* Place the cursor at the beginning of the image information */
+      fseek(IN, 0, SEEK_SET);
+      fseek(IN, File_h.bfOffBits, SEEK_SET);
+      
+      RGB = (unsigned char *) malloc(Info_h.biWidth * Info_h.biHeight * sizeof(unsigned char));
+            
       while (not_end_file) {
-	v = getc(IN);
-	if (v) {
-	  v2 = getc(IN);
-	  for (i = 0; i < (int) v; i++) {
-	    RGB[line * Info_h.biWidth + col] = v2;
-	    col++;
-	  }
-	} else {
-	  v = getc(IN);
-	  switch (v) {
-	  case 0:
-	    col = 0;
-	    line++;
-	    break;
-	  case 1:
-	    line++;
-	    not_end_file = 0;
-	    break;
-	  case 2:
-	    fprintf(stderr,"No Delta supported\n");
-	    return 1;
-	    break;
-	  default:
-	    for (i = 0; i < v; i++) {
-	      v2 = getc(IN);
-	      RGB[line * Info_h.biWidth + col] = v2;
-	      col++;
-	    }
-	    if (v % 2)
-	      v2 = getc(IN);
-	  }
-	}
+        v = getc(IN);
+        if (v) {
+          v2 = getc(IN);
+          for (i = 0; i < (int) v; i++) {
+            RGB[line * Info_h.biWidth + col] = v2;
+            col++;
+          }
+        } else {
+          v = getc(IN);
+          switch (v) {
+            case 0:
+              col = 0;
+              line++;
+              break;
+            case 1:
+              line++;
+              not_end_file = 0;
+              break;
+            case 2:
+              fprintf(stderr,"No Delta supported\n");
+              opj_image_destroy(image);
+              fclose(IN);
+              return NULL;
+              break;
+            default:
+              for (i = 0; i < v; i++) {
+                v2 = getc(IN);
+                RGB[line * Info_h.biWidth + col] = v2;
+                col++;
+              }
+              if (v % 2)
+                v2 = getc(IN);
+              break;
+          }
+        }
       }
       if (gray_scale) {
-	for (line = 0; line < Info_h.biHeight; line++)
-	  for (col = 0; col < Info_h.biWidth; col++)
-	    fprintf(Compo0, "%c", table_R[(int)
-					  RGB[(Info_h.biHeight - line -
-					       1) * Info_h.biWidth +
-					      col]]);
-	fclose(Compo0);
+        index = 0;
+        for (line = 0; line < Info_h.biHeight; line++) {
+          for (col = 0; col < Info_h.biWidth; col++) {
+            image->comps[0].data[index] = table_R[(int)RGB[(Info_h.biHeight - line - 1) * Info_h.biWidth + col]];
+            index++;
+          }
+        }
       } else {
-	for (line = 0; line < Info_h.biHeight; line++)
-	  for (col = 0; col < Info_h.biWidth; col++) {
-	    fprintf(Compo0, "%c", table_R[(int)
-					  RGB[(Info_h.biHeight - line -
-					       1) * Info_h.biWidth +
-					      col]]);
-	    fprintf(Compo1, "%c", table_G[(int)
-					  RGB[(Info_h.biHeight - line -
-					       1) * Info_h.biWidth +
-					      col]]);
-	    fprintf(Compo2, "%c", table_B[(int)
-					  RGB[(Info_h.biHeight - line -
-					       1) * Info_h.biWidth +
-					      col]]);
-	  }
-	fclose(Compo0);
-	fclose(Compo1);
-	fclose(Compo2);
+        index = 0;
+        for (line = 0; line < Info_h.biHeight; line++) {
+          for (col = 0; col < Info_h.biWidth; col++) {
+            unsigned char pixel_index = (int)RGB[(Info_h.biHeight - line - 1) * Info_h.biWidth + col];
+            image->comps[0].data[index] = table_R[pixel_index];
+            image->comps[1].data[index] = table_G[pixel_index];
+            image->comps[2].data[index] = table_B[pixel_index];
+            index++;
+          }
+        }
       }
       free(RGB);
-    } else
-      fprintf(stderr,
-	      "Other system than 24 bits/pixels or 8 bits (no RLE coding) is not yet implemented [%d]\n",
-	      Info_h.biBitCount);
+  } else {
+    fprintf(stderr, 
+      "Other system than 24 bits/pixels or 8 bits (no RLE coding) is not yet implemented [%d]\n", Info_h.biBitCount);
+  }
+  fclose(IN);
+ }
+ 
+ return image;
+}
 
-    fclose(IN);
-    return 1;
+int imagetobmp(opj_image_t * image, char *outfile) {
+  int w, wr, h, hr;
+  int i, pad;
+  FILE *fdest = NULL;
+
+  if (image->numcomps == 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) {
+    
+    /* -->> -->> -->> -->>    
+    24 bits color     
+    <<-- <<-- <<-- <<-- */
+      
+    fdest = fopen(outfile, "wb");
+    if (!fdest) {
+      fprintf(stderr, "ERROR -> failed to open %s for writing\n", outfile);
+      return 1;
+    }
+      
+    // w = int_ceildiv(image->x1 - image->x0, image->comps[0].dx);
+    // wr = int_ceildiv(int_ceildivpow2(image->x1 - image->x0,image->factor), image->comps[0].dx);
+    w = image->comps[0].w;
+    wr = int_ceildivpow2(image->comps[0].w, image->comps[0].factor);
+      
+    // h = int_ceildiv(image->y1 - image->y0, image->comps[0].dy);
+    // hr = int_ceildiv(int_ceildivpow2(image->y1 - image->y0,image->factor), image->comps[0].dy);
+    h = image->comps[0].h;
+    hr = int_ceildivpow2(image->comps[0].h, image->comps[0].factor);
+      
+    fprintf(fdest, "BM");
+      
+    /* FILE HEADER */
+    /* ------------- */
+    fprintf(fdest, "%c%c%c%c",
+      (unsigned char) (hr * wr * 3 + 3 * hr * (wr % 2) + 54) & 0xff,
+      (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2) + 54) >> 8) & 0xff,
+      (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2) + 54) >> 16) & 0xff,
+      (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2) + 54) >> 24) & 0xff);
+    fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff, ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
+    fprintf(fdest, "%c%c%c%c", (54) & 0xff, ((54) >> 8) & 0xff,((54) >> 16) & 0xff, ((54) >> 24) & 0xff);
+      
+    /* INFO HEADER   */
+    /* ------------- */
+    fprintf(fdest, "%c%c%c%c", (40) & 0xff, ((40) >> 8) & 0xff, ((40) >> 16) & 0xff, ((40) >> 24) & 0xff);
+    fprintf(fdest, "%c%c%c%c", (unsigned char) ((wr) & 0xff),
+      (unsigned char) ((wr) >> 8) & 0xff,
+      (unsigned char) ((wr) >> 16) & 0xff,
+      (unsigned char) ((wr) >> 24) & 0xff);
+    fprintf(fdest, "%c%c%c%c", (unsigned char) ((hr) & 0xff),
+      (unsigned char) ((hr) >> 8) & 0xff,
+      (unsigned char) ((hr) >> 16) & 0xff,
+      (unsigned char) ((hr) >> 24) & 0xff);
+    fprintf(fdest, "%c%c", (1) & 0xff, ((1) >> 8) & 0xff);
+    fprintf(fdest, "%c%c", (24) & 0xff, ((24) >> 8) & 0xff);
+    fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff, ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
+    fprintf(fdest, "%c%c%c%c", (unsigned char) (3 * hr * wr + 3 * hr * (wr % 2)) & 0xff,
+      (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2)) >> 8) & 0xff,
+      (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2)) >> 16) & 0xff,
+      (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2)) >> 24) & 0xff);
+    fprintf(fdest, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff, ((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
+    fprintf(fdest, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff, ((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
+    fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff, ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
+    fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff, ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
+      
+    for (i = 0; i < wr * hr; i++) {
+      unsigned char R, G, B;
+      /* a modifier */
+      // R = image->comps[0].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];
+      R = image->comps[0].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
+      // G = image->comps[1].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];
+      G = image->comps[1].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
+      // B = image->comps[2].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];
+      B = image->comps[2].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
+      fprintf(fdest, "%c%c%c", B, G, R);
+      
+      if ((i + 1) % wr == 0) {
+        for (pad = (3 * wr) % 4 ? 4 - (3 * wr) % 4 : 0; pad > 0; pad--) /* ADD */
+          fprintf(fdest, "%c", 0);
+      }
+    }
+    fclose(fdest);
+  } else {      /* Gray-scale */
+
+    /* -->> -->> -->> -->>
+    8 bits non code (Gray scale)
+    <<-- <<-- <<-- <<-- */
+
+    fdest = fopen(outfile, "wb");
+    // w = int_ceildiv(image->x1 - image->x0, image->comps[0].dx);
+    // wr = int_ceildiv(int_ceildivpow2(image->x1 - image->x0,image->factor), image->comps[0].dx);
+    w = image->comps[0].w;
+    wr = int_ceildivpow2(image->comps[0].w, image->comps[0].factor);
+      
+    // h = int_ceildiv(image->y1 - image->y0, image->comps[0].dy);
+    // hr = int_ceildiv(int_ceildivpow2(image->y1 - image->y0,image->factor), image->comps[0].dy);
+    h = image->comps[0].h;
+    hr = int_ceildivpow2(image->comps[0].h, image->comps[0].factor);
+      
+    fprintf(fdest, "BM");
+      
+    /* FILE HEADER */
+    /* ------------- */
+    fprintf(fdest, "%c%c%c%c", (unsigned char) (hr * wr + 54 + 1024 + hr * (wr % 2)) & 0xff,
+      (unsigned char) ((hr * wr + 54 + 1024 + hr * (wr % 2)) >> 8) & 0xff,
+      (unsigned char) ((hr * wr + 54 + 1024 + hr * (wr % 2)) >> 16) & 0xff,
+      (unsigned char) ((hr * wr + 54 + 1024 + wr * (wr % 2)) >> 24) & 0xff);
+    fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff, ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
+    fprintf(fdest, "%c%c%c%c", (54 + 1024) & 0xff, ((54 + 1024) >> 8) & 0xff, 
+      ((54 + 1024) >> 16) & 0xff,
+      ((54 + 1024) >> 24) & 0xff);
+      
+    /* INFO HEADER */
+    /* ------------- */
+    fprintf(fdest, "%c%c%c%c", (40) & 0xff, ((40) >> 8) & 0xff, ((40) >> 16) & 0xff, ((40) >> 24) & 0xff);
+    fprintf(fdest, "%c%c%c%c", (unsigned char) ((wr) & 0xff),
+      (unsigned char) ((wr) >> 8) & 0xff,
+      (unsigned char) ((wr) >> 16) & 0xff,
+      (unsigned char) ((wr) >> 24) & 0xff);
+    fprintf(fdest, "%c%c%c%c", (unsigned char) ((hr) & 0xff),
+      (unsigned char) ((hr) >> 8) & 0xff,
+      (unsigned char) ((hr) >> 16) & 0xff,
+      (unsigned char) ((hr) >> 24) & 0xff);
+    fprintf(fdest, "%c%c", (1) & 0xff, ((1) >> 8) & 0xff);
+    fprintf(fdest, "%c%c", (8) & 0xff, ((8) >> 8) & 0xff);
+    fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff, ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
+    fprintf(fdest, "%c%c%c%c", (unsigned char) (hr * wr + hr * (wr % 2)) & 0xff,
+      (unsigned char) ((hr * wr + hr * (wr % 2)) >> 8) &  0xff,
+      (unsigned char) ((hr * wr + hr * (wr % 2)) >> 16) & 0xff,
+      (unsigned char) ((hr * wr + hr * (wr % 2)) >> 24) & 0xff);
+    fprintf(fdest, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff, ((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
+    fprintf(fdest, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff, ((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
+    fprintf(fdest, "%c%c%c%c", (256) & 0xff, ((256) >> 8) & 0xff, ((256) >> 16) & 0xff, ((256) >> 24) & 0xff);
+    fprintf(fdest, "%c%c%c%c", (256) & 0xff, ((256) >> 8) & 0xff, ((256) >> 16) & 0xff, ((256) >> 24) & 0xff);
+  }
+
+  for (i = 0; i < 256; i++) {
+    fprintf(fdest, "%c%c%c%c", i, i, i, 0);
+  }
+
+  for (i = 0; i < wr * hr; i++) {
+    /* a modifier !! */
+    // fprintf(fdest, "%c", image->comps[0].data[w * h - ((i) / (w) + 1) * w + (i) % (w)]);
+    fprintf(fdest, "%c", image->comps[0].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)]);
+    /*if (((i + 1) % w == 0 && w % 2))
+    fprintf(fdest, "%c", 0); */
+    if ((i + 1) % wr == 0) {
+      for (pad = wr % 4 ? 4 - wr % 4 : 0; pad > 0; pad--) /* ADD */
+        fprintf(fdest, "%c", 0);
+    }
   }
+  fclose(fdest);
+
+  return 0;
 }
 
-	/* -->> -->> -->> -->>
+/* -->> -->> -->> -->>
 
-	   PGX IMAGE FORMAT
+PGX IMAGE FORMAT
 
-	   <<-- <<-- <<-- <<-- */
+<<-- <<-- <<-- <<-- */
 
 
 unsigned char readuchar(FILE * f)
@@ -549,179 +658,199 @@ unsigned int readuint(FILE * f, int bigendian)
     return (c4 << 24) + (c3 << 16) + (c2 << 8) + c1;
 }
 
-int pgxtoimage(char *filename, j2k_image_t * img, int tdy,
-	       int subsampling_dx, int subsampling_dy, int Dim[2],
-	       j2k_cp_t cp)
-{
-  FILE *f;
+opj_image_t* pgxtoimage(char *filename, opj_cparameters_t *parameters) {
+  FILE *f = NULL;
   int w, h, prec;
-  int i, compno, bandno;
-  char str[256]; 
+  int i, numcomps, max;
+  OPJ_COLOR_SPACE color_space;
+  opj_image_cmptparm_t cmptparm;  // maximum of 1 component 
+  opj_image_t * image = NULL;
 
   char endian1,endian2,sign;
   char signtmp[32];
 
   char temp[32];
   int bigendian;
-  j2k_comp_t *comp;
-
-  img->numcomps = 1;
-  img->color_space = 2;
-  img->comps = (j2k_comp_t *) malloc(img->numcomps * sizeof(j2k_comp_t));
-  for (compno = 0; compno < img->numcomps; compno++) {
-    FILE *src;
-    char tmp[16];
-    int max = 0;
-    int Y1;
-
-
-    comp = &img->comps[compno];
-    sprintf(str, "%s", filename);
-    
-
-    f = fopen(str, "rb");
-    if (!f) {
-      fprintf(stderr, "Failed to open %s for reading !\n", str);
-      return 0;
-    }
-
+  opj_image_comp_t *comp = NULL;
 
+  numcomps = 1;
+  color_space = CLRSPC_GRAY;
 
-    fseek(f, 0, SEEK_SET);
+  memset(&cmptparm, 0, sizeof(opj_image_cmptparm_t));
 
-    fscanf(f, "PG%[ \t]%c%c%[ \t+-]%d%[ \t]%d%[ \t]%d",temp,&endian1,&endian2,signtmp,&prec,temp,&w,temp,&h);
+  max = 0;
 
-    
+  f = fopen(filename, "rb");
+  if (!f) {
+    fprintf(stderr, "Failed to open %s for reading !\n", filename);
+    return NULL;
+  }
 
-    i=0;
+  fseek(f, 0, SEEK_SET);
+  fscanf(f, "PG%[ \t]%c%c%[ \t+-]%d%[ \t]%d%[ \t]%d",temp,&endian1,&endian2,signtmp,&prec,temp,&w,temp,&h);
+  
+  i=0;
+  sign='+';   
+  while (signtmp[i]!='\0') {
+    if (signtmp[i]=='-') sign='-';
+    i++;
+  }
+  
+  fgetc(f);
+  if (endian1=='M' && endian2=='L') {
+    bigendian = 1;
+  } else if (endian2=='M' && endian1=='L') {
+    bigendian = 0;
+  } else {
+    fprintf(stderr, "Bad pgx header, please check input file\n");
+    return NULL;
+  }
 
-    sign='+';
+  /* initialize image component */
 
-    while (signtmp[i]!='\0') {
+  cmptparm.x0 = parameters->image_offset_x0;
+  cmptparm.y0 = parameters->image_offset_y0;
+  cmptparm.w = !cmptparm.x0 ? (w - 1) * parameters->subsampling_dx + 1 : cmptparm.x0 + (w - 1) * parameters->subsampling_dx + 1;
+  cmptparm.h = !cmptparm.y0 ? (h - 1) * parameters->subsampling_dy + 1 : cmptparm.y0 + (h - 1) * parameters->subsampling_dy + 1;
+  
+  if (sign == '-') {
+    cmptparm.sgnd = 1;
+  } else {
+    cmptparm.sgnd = 0;
+  }
+  cmptparm.prec = prec;
+  cmptparm.bpp = prec;
+  cmptparm.dx = parameters->subsampling_dx;
+  cmptparm.dy = parameters->subsampling_dy;
+  
+  /* create the image */
+  image = opj_image_create(numcomps, &cmptparm, color_space);
+  if(!image) {
+    fclose(f);
+    return NULL;
+  }
+  /* set image offset and reference grid */
+  image->x0 = cmptparm.x0;
+  image->y0 = cmptparm.x0;
+  image->x1 = cmptparm.w;
+  image->y1 = cmptparm.h;
 
-      if (signtmp[i]=='-') sign='-';
+  /* set image data */
 
-      i++;
+  comp = &image->comps[0];
 
+  for (i = 0; i < w * h; i++) {
+    int v;
+    if (comp->prec <= 8) {
+      if (!comp->sgnd) {
+        v = readuchar(f);
+      } else {
+        v = (char) readuchar(f);
+      }
+    } else if (comp->prec <= 16) {
+      if (!comp->sgnd) {
+        v = readushort(f, bigendian);
+      } else {
+        v = (short) readushort(f, bigendian);
+      }
+    } else {
+      if (!comp->sgnd) {
+        v = readuint(f, bigendian);
+      } else {
+        v = (int) readuint(f, bigendian);
+      }
     }
+    if (v > max)
+      max = v;
+    comp->data[i] = v;
+  }
+  fclose(f);
+  comp->bpp = int_floorlog2(max) + 1;
 
-    
-
-    fgetc(f);
-    if (endian1=='M' && endian2=='L')
-      bigendian = 1;
-    else if (endian2=='M' && endian1=='L')
-      bigendian = 0;
-
-    else {
-
-      fprintf(stderr, "Bad pgx header, please check input file\n");
-
-      return 0;
+  return image;
+}
 
+int imagetopgx(opj_image_t * image, char *outfile) {
+  int w, wr, h, hr;
+  int i, j, compno;
+  FILE *fdest = NULL;
+
+  for (compno = 0; compno < image->numcomps; compno++) {
+    opj_image_comp_t *comp = &image->comps[compno];
+    char name[256];
+    int nbytes = 0;
+    char *tmp = outfile;
+    while (*tmp) {
+      tmp++;
     }
+    while (*tmp!='.') {
+      tmp--;
+    }
+    *tmp='\0';
 
-
-    if (compno == 0) {
-      img->x0 = Dim[0];
-      img->y0 = Dim[1];
-      img->x1 =
-	!Dim[0] ? (w - 1) * subsampling_dx + 1 : Dim[0] + (w -
-	1) *
-	subsampling_dx + 1;
-      img->y1 =
-	!Dim[1] ? (h - 1) * subsampling_dy + 1 : Dim[1] + (h -
-	1) *
-	subsampling_dy + 1;
+    if (image->numcomps > 1) {
+      sprintf(name, "%s-%d.pgx", outfile, compno);
     } else {
-      if (w != img->x1 || h != img->y1)
-	return 0;
+      sprintf(name, "%s.pgx", outfile);
     }
-    
-    if (sign == '-') {
-      comp->sgnd = 1;
-    } else {
-      comp->sgnd = 0;
+    fdest = fopen(name, "wb");
+    if (!fdest) {
+      fprintf(stderr, "ERROR -> failed to open %s for writing\n", name);
+      return 1;
     }
-    comp->prec = prec;
-    comp->dx = subsampling_dx;
-    comp->dy = subsampling_dy;
-    bandno = 1;
-    
-    Y1 = cp.ty0 + bandno * cp.tdy <
-      img->y1 ? cp.ty0 + bandno * cp.tdy : img->y1;
-    Y1 -= img->y0;
-    
-    sprintf(tmp, "bandtile%d", bandno);	/* bandtile file */
-    src = fopen(tmp, "wb");
-    if (!src) {
-      fprintf(stderr, "failed to open %s for writing !\n", tmp);
+    // w = int_ceildiv(image->x1 - image->x0, comp->dx);
+    // wr = int_ceildiv(int_ceildivpow2(image->x1 - image->x0,image->factor), comp->dx);
+    w = image->comps[compno].w;
+    wr = int_ceildivpow2(image->comps[compno].w, image->comps[compno].factor);
+      
+    // h = int_ceildiv(image->y1 - image->y0, comp->dy);
+    // hr = int_ceildiv(int_ceildivpow2(image->y1 - image->y0,image->factor), comp->dy);
+    h = image->comps[compno].h;
+    hr = int_ceildivpow2(image->comps[compno].h, image->comps[compno].factor);
+      
+    fprintf(fdest, "PG ML %c %d %d %d\n", comp->sgnd ? '-' : '+', comp->prec, wr, hr);
+    if (comp->prec <= 8) {
+      nbytes = 1;
+    } else if (comp->prec <= 16) {
+      nbytes = 2;
+    } else {
+      nbytes = 4;
     }
-    for (i = 0; i < w * h; i++) {
-      int v;
-      if (i == Y1 * w / subsampling_dy && tdy != -1) {	/* bandtile is full */
-	fclose(src);
-	bandno++;
-	sprintf(tmp, "bandtile%d", bandno);
-	src = fopen(tmp, "wb");
-	if (!src) {
-	  fprintf(stderr, "failed to open %s for writing !\n", tmp);
-	}
-	Y1 = cp.ty0 + bandno * cp.tdy <
-	  img->y1 ? cp.ty0 + bandno * cp.tdy : img->y1;
-	Y1 -= img->y0;
-      }
-      if (comp->prec <= 8) {
-	if (!comp->sgnd) {
-	  v = readuchar(f);
-	} else {
-	  v = (char) readuchar(f);
-	}
-      } else if (comp->prec <= 16) {
-	if (!comp->sgnd) {
-	  v = readushort(f, bigendian);
-	} else {
-	  v = (short) readushort(f, bigendian);
-	}
-      } else {
-	if (!comp->sgnd) {
-	  v = readuint(f, bigendian);
-	} else {
-	  v = (int) readuint(f, bigendian);
-	}
+    for (i = 0; i < wr * hr; i++) {
+      int v = image->comps[compno].data[i / wr * w + i % wr];
+      for (j = nbytes - 1; j >= 0; j--) {
+        char byte = (char) (v >> (j * 8));
+        fwrite(&byte, 1, 1, fdest);
       }
-      if (v > max)
-	max = v;
-      fprintf(src, "%d ", v);
     }
-    fclose(f);
-    fclose(src);
-    comp->bpp = int_floorlog2(max) + 1;
+    fclose(fdest);
   }
-  return 1;
+
+  return 0;
 }
 
 /* -->> -->> -->> -->>
 
-  PNM IMAGE FORMAT
+PNM IMAGE FORMAT
 
- <<-- <<-- <<-- <<-- */
+<<-- <<-- <<-- <<-- */
 
-int pnmtoimage(char *filename, j2k_image_t * img, int subsampling_dx,
-	       int subsampling_dy, int Dim[2])
-{
-  FILE *f;
-  FILE *Compo0, *Compo1, *Compo2;
-  int w, h;
-  int i;
+opj_image_t* pnmtoimage(char *filename, opj_cparameters_t *parameters) {
+  int tdy = parameters->cp_tdy;
+  int subsampling_dx = parameters->subsampling_dx;
+  int subsampling_dy = parameters->subsampling_dy;
+
+  FILE *f = NULL;
+  int i, compno, numcomps, w, h;
+  OPJ_COLOR_SPACE color_space;
+  opj_image_cmptparm_t cmptparm[3]; /* maximum of 3 components */
+  opj_image_t * image = NULL;
   char value;
   char comment[256];
 
   f = fopen(filename, "rb");
   if (!f) {
-    fprintf(stderr,
-	    "\033[0;33mFailed to open %s for reading !!\033[0;39m\n",
-	    filename);
+    fprintf(stderr, "\033[0;33mFailed to open %s for reading !!\033[0;39m\n", filename);
     return 0;
   }
 
@@ -729,222 +858,238 @@ int pnmtoimage(char *filename, j2k_image_t * img, int subsampling_dx,
     return 0;
   value = fgetc(f);
 
-  if (value == '2') {
-    fgetc(f);
-    if (fgetc(f) == '#') {
-      fseek(f, 0, SEEK_SET);
-      fscanf(f, "P2\n");
-      fgets(comment, 256, f);
-      fscanf(f, "%d %d\n255", &w, &h);
-    } else {
-      fseek(f, 0, SEEK_SET);
-      fscanf(f, "P2\n%d %d\n255", &w, &h);
-    }
-
-    fgetc(f);
-    img->x0 = Dim[0];
-    img->y0 = Dim[1];
-    img->x1 =
-      !Dim[0] ? (w - 1) * subsampling_dx + 1 : Dim[0] + (w -
-							 1) *
-      subsampling_dx + 1;
-    img->y1 =
-      !Dim[1] ? (h - 1) * subsampling_dy + 1 : Dim[1] + (h -
-							 1) *
-      subsampling_dy + 1;
-
-    img->numcomps = 1;
-    img->color_space = 2;
-    img->comps = (j2k_comp_t *) malloc(sizeof(j2k_comp_t));
-    img->comps[0].prec = 8;
-    img->comps[0].bpp = 8;
-    img->comps[0].sgnd = 0;
-    img->comps[0].dx = subsampling_dx;
-    img->comps[0].dy = subsampling_dy;
-
-    Compo0 = fopen("Compo0", "wb");
-    if (!Compo0) {
-      fprintf(stderr,
-	      "\033[0;33mFailed to open Compo0 for writing !\033[0;39m\n");
-    }
-    for (i = 0; i < w * h; i++) {
-      unsigned int l;
-      fscanf(f, "%d", &l);
-      fprintf(Compo0, "%c", l);
+  switch(value) {
+    case '2': /* greyscale image type */
+    case '5':
+    {
+      numcomps = 1;
+      color_space = CLRSPC_GRAY;
+
+      fgetc(f);
+
+      if (fgetc(f) == '#') {
+        /* skip comments */
+        fseek(f, 0, SEEK_SET);
+        if (value == '2') {
+          fscanf(f, "P2\n");
+        } else if (value == '5') {
+          fscanf(f, "P5\n");
+        }
+        fgets(comment, 256, f);
+        fscanf(f, "%d %d\n255", &w, &h);
+      } else {
+        fseek(f, 0, SEEK_SET);
+        if (value == '2') {
+          fscanf(f, "P2\n%d %d\n255", &w, &h);
+        } else if (value == '5') {
+          fscanf(f, "P5\n%d %d\n255", &w, &h);
+        }
+      }
+      
+      fgetc(f); /* <cr><lf> */
     }
-    fclose(Compo0);
-  } else if (value == '5') {
-    fgetc(f);
-    if (fgetc(f) == '#') {
-      fseek(f, 0, SEEK_SET);
-      fscanf(f, "P5\n");
-      fgets(comment, 256, f);
-      fscanf(f, "%d %d\n255", &w, &h);
-    } else {
-      fseek(f, 0, SEEK_SET);
-      fscanf(f, "P5\n%d %d\n255", &w, &h);
+    break;
+
+    case '3': /* RGB image type */
+    case '6':
+    {
+      numcomps = 3;
+      color_space = CLRSPC_SRGB;
+
+      fgetc(f);
+
+      if (fgetc(f) == '#') {
+        /* skip comments */
+        fseek(f, 0, SEEK_SET);
+        if (value == '3') {
+          fscanf(f, "P3\n");
+        } else if (value == '6') {
+          fscanf(f, "P6\n");
+        }
+        fgets(comment, 256, f);
+        fscanf(f, "%d %d\n255", &w, &h);
+      } else {
+        fseek(f, 0, SEEK_SET);
+        if (value == '3') {
+          fscanf(f, "P3\n%d %d\n255", &w, &h);
+        } else if (value == '6') {
+          fscanf(f, "P6\n%d %d\n255", &w, &h);
+        }
+      }
+      
+      fgetc(f); /* <cr><lf> */
     }
+    break;
 
-    fgetc(f);
-    img->x0 = Dim[0];
-    img->y0 = Dim[1];
-    img->x1 =
-      !Dim[0] ? (w - 1) * subsampling_dx + 1 : Dim[0] + (w -
-							 1) *
-      subsampling_dx + 1;
-    img->y1 =
-      !Dim[1] ? (h - 1) * subsampling_dy + 1 : Dim[1] + (h -
-							 1) *
-      subsampling_dy + 1;
-
-    img->numcomps = 1;
-    img->color_space = 2;
-    img->comps = (j2k_comp_t *) malloc(sizeof(j2k_comp_t));
-    img->comps[0].prec = 8;
-    img->comps[0].bpp = 8;
-    img->comps[0].sgnd = 0;
-    img->comps[0].dx = subsampling_dx;
-    img->comps[0].dy = subsampling_dy;
-    Compo0 = fopen("Compo0", "wb");
-    if (!Compo0) {
-      fprintf(stderr,
-	      "\033[0;33mFailed to open Compo0 for writing !\033[0;39m\n");
-    }
-    for (i = 0; i < w * h; i++) {
-      unsigned char l;
-      fread(&l, 1, 1, f);
-      fwrite(&l, 1, 1, Compo0);
-    }
-    fclose(Compo0);
-  } else if (value == '3') {
-    fgetc(f);
-    if (fgetc(f) == '#') {
-      fseek(f, 0, SEEK_SET);
-      fscanf(f, "P3\n");
-      fgets(comment, 256, f);
-      fscanf(f, "%d %d\n255", &w, &h);
-    } else {
-      fseek(f, 0, SEEK_SET);
-      fscanf(f, "P3\n%d %d\n255", &w, &h);
-    }
+    default:
+      fclose(f);
+      return NULL;
+  }
 
-    fgetc(f);
-    img->x0 = Dim[0];
-    img->y0 = Dim[1];
-    img->x1 =
-      !Dim[0] ? (w - 1) * subsampling_dx + 1 : Dim[0] + (w -
-							 1) *
-      subsampling_dx + 1;
-    img->y1 =
-      !Dim[1] ? (h - 1) * subsampling_dy + 1 : Dim[1] + (h -
-							 1) *
-      subsampling_dy + 1;
-    img->numcomps = 3;
-    img->color_space = 1;
-    img->comps = (j2k_comp_t *) malloc(img->numcomps * sizeof(j2k_comp_t));
-    for (i = 0; i < img->numcomps; i++) {
-      img->comps[i].prec = 8;
-      img->comps[i].bpp = 8;
-      img->comps[i].sgnd = 0;
-      img->comps[i].dx = subsampling_dx;
-      img->comps[i].dy = subsampling_dy;
-    }
-    Compo0 = fopen("Compo0", "wb");
-    if (!Compo0) {
-      fprintf(stderr,
-	      "\033[0;33mFailed to open Compo0 for writing !\033[0;39m\n");
-    }
+  /* initialize image components */
+  memset(&cmptparm[0], 0, 3 * sizeof(opj_image_cmptparm_t));
+  for(i = 0; i < numcomps; i++) {
+    cmptparm[i].prec = 8;
+    cmptparm[i].bpp = 8;
+    cmptparm[i].sgnd = 0;
+    cmptparm[i].dx = subsampling_dx;
+    cmptparm[i].dy = subsampling_dy;
+    cmptparm[i].w = w;
+    cmptparm[i].h = h;
+  }
+  /* create the image */
+  image = opj_image_create(numcomps, &cmptparm[0], color_space);
+  if(!image) {
+    fclose(f);
+    return NULL;
+  }
 
-    Compo1 = fopen("Compo1", "wb");
-    if (!Compo1) {
-      fprintf(stderr,
-	      "\033[0;33mFailed to open Compo1 for writing !\033[0;39m\n");
-    }
+  /* set image offset and reference grid */
+  image->x0 = parameters->image_offset_x0;
+  image->y0 = parameters->image_offset_y0;
+  image->x1 = parameters->image_offset_x0 + (w - 1) * subsampling_dx + 1;
+  image->y1 = parameters->image_offset_y0 + (h - 1) * subsampling_dy + 1;
 
-    Compo2 = fopen("Compo2", "wb");
-    if (!Compo2) {
-      fprintf(stderr,
-	      "\033[0;33mFailed to open Compo2 for writing !\033[0;39m\n");
-    }
+  /* set image data */
 
+  if ((value == '2') || (value == '3')) { /* ASCII */
     for (i = 0; i < w * h; i++) {
-      unsigned int r, g, b;
-      fscanf(f, "%d", &r);
-      fscanf(f, "%d", &g);
-      fscanf(f, "%d", &b);
-      fprintf(Compo0, "%c", r);
-      fprintf(Compo1, "%c", g);
-      fprintf(Compo2, "%c", b);
+      for(compno = 0; compno < numcomps; compno++) {
+        unsigned int index = 0;
+        fscanf(f, "%d", &index);
+        /* compno : 0 = GREY, (0, 1, 2) = (R, G, B) */
+        image->comps[compno].data[i] = index;
+      }
     }
-    fclose(Compo0);
-    fclose(Compo1);
-    fclose(Compo2);
-  } else if (value == '6') {
-    fgetc(f);
-    if (fgetc(f) == '#') {
-      fseek(f, 0, SEEK_SET);
-      fscanf(f, "P6\n");
-      fgets(comment, 256, f);
-      fscanf(f, "%d %d\n255", &w, &h);
-    } else {
-      fseek(f, 0, SEEK_SET);
-      fscanf(f, "P6\n%d %d\n255", &w, &h);
+  } else if ((value == '5') || (value == '6')) {  /* BINARY */
+    for (i = 0; i < w * h; i++) {
+      for(compno = 0; compno < numcomps; compno++) {
+        unsigned char index = 0;
+        fread(&index, 1, 1, f);
+        /* compno : 0 = GREY, (0, 1, 2) = (R, G, B) */
+        image->comps[compno].data[i] = index;
+      }
     }
+  }
 
-    fgetc(f);
-    img->x0 = Dim[0];
-    img->y0 = Dim[1];
-    img->x1 =
-      !Dim[0] ? (w - 1) * subsampling_dx + 1 : Dim[0] + (w -
-							 1) *
-      subsampling_dx + 1;
-    img->y1 =
-      !Dim[1] ? (h - 1) * subsampling_dy + 1 : Dim[1] + (h -
-							 1) *
-      subsampling_dy + 1;
-    img->numcomps = 3;
-    img->color_space = 1;
-    img->comps = (j2k_comp_t *) malloc(img->numcomps * sizeof(j2k_comp_t));
-    for (i = 0; i < img->numcomps; i++) {
-      img->comps[i].prec = 8;
-      img->comps[i].bpp = 8;
-      img->comps[i].sgnd = 0;
-      img->comps[i].dx = subsampling_dx;
-      img->comps[i].dy = subsampling_dy;
-    }
-    Compo0 = fopen("Compo0", "wb");
-    if (!Compo0) {
-      fprintf(stderr,
-	      "\033[0;33mFailed to open Compo0 for writing !\033[0;39m\n");
-    }
+  fclose(f);
 
-    Compo1 = fopen("Compo1", "wb");
-    if (!Compo1) {
-      fprintf(stderr,
-	      "\033[0;33mFailed to open Compo1 for writing !\033[0;39m\n");
-    }
+  return image;
+}
 
-    Compo2 = fopen("Compo2", "wb");
-    if (!Compo2) {
-      fprintf(stderr,
-	      "\033[0;33mFailed to open Compo2 for writing !\033[0;39m\n");
+int imagetopnm(opj_image_t * image, char *outfile) {
+  int w, wr, wrr, h, hr, hrr, max;
+  int i, compno;
+  int adjust;
+  FILE *fdest = NULL;
+  char S2;
+  char *tmp = outfile;
+
+  while (*tmp) {
+    tmp++;
+  }
+  tmp--;
+  tmp--;
+  S2 = *tmp;
+
+  if (image->numcomps == 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
+    && S2 !='g' && S2 !='G') {
+
+    fdest = fopen(outfile, "wb");
+    if (!fdest) {
+      fprintf(stderr, "ERROR -> failed to open %s for writing\n", outfile);
+      return 1;
     }
 
-    for (i = 0; i < w * h; i++) {
-      unsigned char r, g, b;
-      fread(&r, 1, 1, f);
-      fread(&g, 1, 1, f);
-      fread(&b, 1, 1, f);
-      fwrite(&r, 1, 1, Compo0);
-      fwrite(&g, 1, 1, Compo1);
-      fwrite(&b, 1, 1, Compo2);
+    w = int_ceildiv(image->x1 - image->x0, image->comps[0].dx);
+    // wr = int_ceildiv(int_ceildivpow2(image->x1 - image->x0,image->factor),image->comps[0].dx);
+    wr = image->comps[0].w;
+    wrr = int_ceildivpow2(image->comps[0].w, image->comps[0].factor);
+        
+    h = int_ceildiv(image->y1 - image->y0, image->comps[0].dy);
+    // hr = int_ceildiv(int_ceildivpow2(image->y1 - image->y0,image->factor), image->comps[0].dy);
+    hr = image->comps[0].h;
+    hrr = int_ceildivpow2(image->comps[0].h, image->comps[0].factor);
+      
+    max = image->comps[0].prec > 8 ? 255 : (1 << image->comps[0].prec) - 1;
+      
+    image->comps[0].x0 = int_ceildivpow2(image->comps[0].x0 - int_ceildiv(image->x0, image->comps[0].dx), image->comps[0].factor);
+    image->comps[0].y0 = int_ceildivpow2(image->comps[0].y0 - int_ceildiv(image->y0, image->comps[0].dy), image->comps[0].factor);
+
+    fprintf(fdest, "P6\n%d %d\n%d\n", wrr, hrr, max);
+    adjust = image->comps[0].prec > 8 ? image->comps[0].prec - 8 : 0;
+    for (i = 0; i < wrr * hrr; i++) {
+      int r, g, b;
+      unsigned char rc,gc,bc;
+      r = image->comps[0].data[i / wrr * wr + i % wrr];
+      r += (image->comps[0].sgnd ? 1 << (image->comps[0].prec - 1) : 0);
+      rc = (unsigned char) ((r >> adjust)+((r >> (adjust-1))%2));
+
+      g = image->comps[1].data[i / wrr * wr + i % wrr];
+      g += (image->comps[1].sgnd ? 1 << (image->comps[1].prec - 1) : 0);
+      gc = (unsigned char) ((g >> adjust)+((g >> (adjust-1))%2));
+      
+      b = image->comps[2].data[i / wrr * wr + i % wrr];
+      b += (image->comps[2].sgnd ? 1 << (image->comps[2].prec - 1) : 0);
+      bc = (unsigned char) ((b >> adjust)+((b >> (adjust-1))%2));
+      
+      fprintf(fdest, "%c%c%c", rc, gc, bc);
     }
-    fclose(Compo0);
-    fclose(Compo1);
-    fclose(Compo2);
+    fclose(fdest);
   } else {
-    return 0;
+    int ncomp=(S2=='g' || S2=='G')?1:image->numcomps;
+    if (image->numcomps>ncomp) {
+      fprintf(stderr,"WARNING -> [PGM files] Only the first component\n");
+      fprintf(stderr,"           is written to the file\n");
+    }
+    for (compno = 0; compno < ncomp; compno++) {
+      char name[256];
+      if (ncomp > 1) {
+        sprintf(name, "%d.%s", compno, outfile);
+      } else {
+        sprintf(name, "%s", outfile);
+      }
+      
+      fdest = fopen(name, "wb");
+      if (!fdest) {
+        fprintf(stderr, "ERROR -> failed to open %s for writing\n", name);
+        return 1;
+      }
+            
+      w = int_ceildiv(image->x1 - image->x0, image->comps[compno].dx);
+      // wr = int_ceildiv(int_ceildivpow2(image->x1 - image->x0,image->factor),image->comps[compno].dx);
+      wr = image->comps[compno].w;
+      wrr = int_ceildivpow2(image->comps[compno].w, image->comps[compno].factor);
+      
+      h = int_ceildiv(image->y1 - image->y0, image->comps[compno].dy);
+      // hr = int_ceildiv(int_ceildivpow2(image->y1 - image->y0,image->factor), image->comps[compno].dy);
+      hr = image->comps[compno].h;
+      hrr = int_ceildivpow2(image->comps[compno].h, image->comps[compno].factor);
+      
+      max = image->comps[compno].prec > 8 ? 255 : (1 << image->comps[compno].prec) - 1;
+      
+      image->comps[compno].x0 = int_ceildivpow2(image->comps[compno].x0 - int_ceildiv(image->x0, image->comps[compno].dx), image->comps[compno].factor);
+      image->comps[compno].y0 = int_ceildivpow2(image->comps[compno].y0 - int_ceildiv(image->y0, image->comps[compno].dy), image->comps[compno].factor);
+      
+      fprintf(fdest, "P5\n%d %d\n%d\n", wrr, hrr, max);
+      adjust = image->comps[compno].prec > 8 ? image->comps[compno].prec - 8 : 0;
+
+      for (i = 0; i < wrr * hrr; i++) {
+        int l;
+        unsigned char lc;
+        l = image->comps[compno].data[i / wrr * wr + i % wrr];
+        l += (image->comps[compno].sgnd ? 1 << (image->comps[compno].prec - 1) : 0);
+        lc = (unsigned char) ((l >> adjust)+((l >> (adjust-1))%2));
+        fprintf(fdest, "%c", lc);
+      }
+      fclose(fdest);
+    }
   }
-  fclose(f);
-  return 1;
+
+  return 0;
 }
diff --git a/codec/convert.h b/codec/convert.h
index 337dae76..dfc447d7 100644
--- a/codec/convert.h
+++ b/codec/convert.h
@@ -1,7 +1,9 @@
 /*
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2002-2003,  Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
+ * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
+ * Copyright (c) 2005, HervŽ Drolon, FreeImage Team
+ * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,14 +28,27 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "j2k.h"
 
-int bmptoimage(char *filename, j2k_image_t * img, int subsampling_dx,
-	       int subsampling_dy, int Dim[2]);
+#ifndef __J2K_CONVERT_H
+#define __J2K_CONVERT_H
 
-int pgxtoimage(char *filename, j2k_image_t * img, int tdy,
-	       int subsampling_dx, int subsampling_dy, int Dim[2],
-	       j2k_cp_t cp);
+opj_image_t* bmptoimage(char *filename, opj_cparameters_t *parameters);
+
+int imagetobmp(opj_image_t *image, char *outfile);
+
+/**
+Load a single image component encoded in PGX file format
+@param filename Name of the PGX file to load
+@param parameters *List ?*
+@return Returns a greyscale image if successful, returns NULL otherwise
+*/
+opj_image_t* pgxtoimage(char *filename, opj_cparameters_t *parameters);
+
+int imagetopgx(opj_image_t *image, char *outfile);
+
+opj_image_t* pnmtoimage(char *filename, opj_cparameters_t *parameters);
+
+int imagetopnm(opj_image_t *image, char *outfile);
+
+#endif /* __J2K_CONVERT_H */
 
-int pnmtoimage(char *filename, j2k_image_t * img, int subsampling_dx,
-	       int subsampling_dy, int Dim[2]);
diff --git a/codec/image_to_j2k.c b/codec/image_to_j2k.c
index b73941fa..0c623e0b 100644
--- a/codec/image_to_j2k.c
+++ b/codec/image_to_j2k.c
@@ -1,7 +1,9 @@
 /*
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2002-2003,  Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
+ * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
+ * Copyright (c) 2005, HervŽ Drolon, FreeImage Team
+ * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,55 +29,41 @@
  */
 
 
-
-//MEMORY LEAK
-
-#ifdef _DEBUG
-
-#define _CRTDBG_MAP_ALLOC
-
-#include <stdlib.h>  // Must be included first
-
-#include <crtdbg.h>
-
-#endif
-
-//MEM
-
-#include <openjpeg.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
 #include <string.h>
-#ifndef DONT_HAVE_GETOPT
-#include <getopt.h>
-#else
+#include <stdlib.h>
+
+#include "openjpeg.h"
 #include "compat/getopt.h"
-#endif
 #include "convert.h"
 
-void help_display()
-{
+#define J2K_CFMT 0
+#define JP2_CFMT 1
+#define JPT_CFMT 2
+#define MJ2_CFMT 3
+#define PXM_DFMT 0
+#define PGX_DFMT 1
+#define BMP_DFMT 2
+#define YUV_DFMT 3
+
+/* ----------------------------------------------------------------------- */
+
+void encode_help_display() {
   fprintf(stdout,"HELP\n----\n\n");
   fprintf(stdout,"- the -h option displays this help information on screen\n\n");
 
 
-  fprintf(stdout,"List of parameters for the coder JPEG 2000:\n");
+  fprintf(stdout,"List of parameters for the JPEG 2000 encoder:\n");
   fprintf(stdout,"\n");
   fprintf(stdout,"REMARKS:\n");
   fprintf(stdout,"---------\n");
   fprintf(stdout,"\n");
-  fprintf
-    (stdout,"The markers written to the main_header are : SOC SIZ COD QCD COM.\n");
-  fprintf
-    (stdout,"COD and QCD never appear in the tile_header.\n");
+  fprintf(stdout,"The markers written to the main_header are : SOC SIZ COD QCD COM.\n");
+  fprintf(stdout,"COD and QCD never appear in the tile_header.\n");
   fprintf(stdout,"\n");
-  fprintf
-    (stdout,"- This coder can encode a mega image, a test was made on a 24000x24000 pixels \n");
-  fprintf
-    (stdout,"color image.  You need enough disk space memory (twice the original) to encode \n");
-  fprintf
-    (stdout,"the image,i.e. for a 1.5 GB image you need a minimum of 3GB of disk memory)\n");
+  fprintf(stdout,"- This coder can encode a mega image, a test was made on a 24000x24000 pixels \n");
+  fprintf(stdout,"color image.  You need enough disk space memory (twice the original) to encode \n");
+  fprintf(stdout,"the image,i.e. for a 1.5 GB image you need a minimum of 3GB of disk memory)\n");
   fprintf(stdout,"\n");
   fprintf(stdout,"By default:\n");
   fprintf(stdout,"------------\n");
@@ -99,25 +87,21 @@ void help_display()
   fprintf(stdout,"Parameters:\n");
   fprintf(stdout,"------------\n");
   fprintf(stdout,"\n");
-  fprintf
-    (stdout,"Required Parameters (except with -h):\n");
+  fprintf(stdout,"Required Parameters (except with -h):\n");
   fprintf(stdout,"\n");
-  fprintf
-    (stdout,"-i           : source file  (-i source.pnm also *.pgm, *.ppm) \n");
+  fprintf(stdout,"-i           : source file  (-i source.pnm also *.pgm, *.ppm) \n");
   fprintf(stdout,"\n");
-  fprintf
-    (stdout,"-o           : destination file (-o dest.j2k or .jp2) \n");
+  fprintf(stdout,"-o           : destination file (-o dest.j2k or .jp2) \n");
   fprintf(stdout,"\n");
-  fprintf
-    (stdout,"Optional Parameters:\n");
+  fprintf(stdout,"Optional Parameters:\n");
   fprintf(stdout,"\n");
   fprintf(stdout,"-h           : display the help information \n ");
   fprintf(stdout,"\n");
   fprintf(stdout,"-r           : different compression ratios for successive layers (-r 20,10,5)\n ");
-  fprintf(stdout,"	         - The rate specified for each quality level is the desired \n");
-  fprintf(stdout,"	           compression factor.\n");
-  fprintf(stdout,"		   Example: -r 20,10,1 means quality 1: compress 20x, \n");
-  fprintf(stdout,"		     quality 2: compress 10x and quality 3: compress lossless\n");
+  fprintf(stdout,"           - The rate specified for each quality level is the desired \n");
+  fprintf(stdout,"             compression factor.\n");
+  fprintf(stdout,"       Example: -r 20,10,1 means quality 1: compress 20x, \n");
+  fprintf(stdout,"         quality 2: compress 10x and quality 3: compress lossless\n");
   fprintf(stdout,"\n");
   fprintf(stdout,"               (options -r and -q cannot be used together)\n ");
   fprintf(stdout,"\n");
@@ -135,43 +119,29 @@ void help_display()
   fprintf(stdout,"\n");
   fprintf(stdout,"-t           : size of tile (-t 512,512) \n");
   fprintf(stdout,"\n");
-  fprintf
-    (stdout,"-p           : progression order (-p LRCP) [LRCP, RLCP, RPCL, PCRL, CPRL] \n");
+  fprintf(stdout,"-p           : progression order (-p LRCP) [LRCP, RLCP, RPCL, PCRL, CPRL] \n");
   fprintf(stdout,"\n");
-  fprintf
-    (stdout,"-s           : subsampling factor (-s 2,2) [-s X,Y] \n");
-  fprintf(stdout,"	     Remark: subsampling bigger than 2 can produce error\n");
+  fprintf(stdout,"-s           : subsampling factor (-s 2,2) [-s X,Y] \n");
+  fprintf(stdout,"       Remark: subsampling bigger than 2 can produce error\n");
   fprintf(stdout,"\n");
-  fprintf
-    (stdout,"-SOP         : write SOP marker before each packet \n");
+  fprintf(stdout,"-SOP         : write SOP marker before each packet \n");
   fprintf(stdout,"\n");
-  fprintf
-    (stdout,"-EPH         : write EPH marker after each header packet \n");
+  fprintf(stdout,"-EPH         : write EPH marker after each header packet \n");
   fprintf(stdout,"\n");
-  fprintf
-    (stdout,"-M           : mode switch (-M 3) [1=BYPASS(LAZY) 2=RESET 4=RESTART(TERMALL)\n");
-  fprintf
-    (stdout,"                 8=VSC 16=ERTERM(SEGTERM) 32=SEGMARK(SEGSYM)] \n");
-  fprintf
-    (stdout,"                 Indicate multiple modes by adding their values. \n");
-  fprintf
-    (stdout,"                 ex: RESTART(4) + RESET(2) + SEGMARK(32) = -M 38\n");
+  fprintf(stdout,"-M           : mode switch (-M 3) [1=BYPASS(LAZY) 2=RESET 4=RESTART(TERMALL)\n");
+  fprintf(stdout,"                 8=VSC 16=ERTERM(SEGTERM) 32=SEGMARK(SEGSYM)] \n");
+  fprintf(stdout,"                 Indicate multiple modes by adding their values. \n");
+  fprintf(stdout,"                 ex: RESTART(4) + RESET(2) + SEGMARK(32) = -M 38\n");
   fprintf(stdout,"\n");
-  fprintf
-    (stdout,"-x           : create an index file *.Idx (-x index_name.Idx) \n");
+  fprintf(stdout,"-x           : create an index file *.Idx (-x index_name.Idx) \n");
   fprintf(stdout,"\n");
-  fprintf
-    (stdout,"-ROI         : c=%%d,U=%%d : quantization indices upshifted \n");
-  fprintf
-    (stdout,"               for component c=%%d [%%d = 0,1,2]\n");
-  fprintf
-    (stdout,"               with a value of U=%%d [0 <= %%d <= 37] (i.e. -ROI:c=0,U=25) \n");
+  fprintf(stdout,"-ROI         : c=%%d,U=%%d : quantization indices upshifted \n");
+  fprintf(stdout,"               for component c=%%d [%%d = 0,1,2]\n");
+  fprintf(stdout,"               with a value of U=%%d [0 <= %%d <= 37] (i.e. -ROI:c=0,U=25) \n");
   fprintf(stdout,"\n");
-  fprintf
-    (stdout,"-d           : offset of the origin of the image (-d 150,300) \n");
+  fprintf(stdout,"-d           : offset of the origin of the image (-d 150,300) \n");
   fprintf(stdout,"\n");
-  fprintf
-    (stdout,"-T           : offset of the origin of the tiles (-T 100,75) \n");
+  fprintf(stdout,"-T           : offset of the origin of the tiles (-T 100,75) \n");
   fprintf(stdout,"\n");
   fprintf(stdout,"-I           : use the irreversible DWT 9-7 (-I) \n");
   fprintf(stdout,"\n");
@@ -204,801 +174,618 @@ void help_display()
   fprintf(stdout,"TotalDisto\n\n");
 }
 
-int give_progression(char progression[4])
-{
-  if (progression[0] == 'L' && progression[1] == 'R'
-      && progression[2] == 'C' && progression[3] == 'P') {
-    return 0;
-  } else {
-    if (progression[0] == 'R' && progression[1] == 'L'
-	&& progression[2] == 'C' && progression[3] == 'P') {
-      return 1;
-    } else {
-      if (progression[0] == 'R' && progression[1] == 'P'
-	  && progression[2] == 'C' && progression[3] == 'L') {
-	return 2;
-      } else {
-	if (progression[0] == 'P' && progression[1] == 'C'
-	    && progression[2] == 'R' && progression[3] == 'L') {
-	  return 3;
-	} else {
-	  if (progression[0] == 'C' && progression[1] == 'P'
-	      && progression[2] == 'R' && progression[3] == 'L') {
-	    return 4;
-	  } else {
-	    return -1;
-	  }
-	}
-      }
-    }
+OPJ_PROG_ORDER give_progression(char progression[4]) {
+  if(strncmp(progression, "LRCP", 4) == 0) {
+    return LRCP;
   }
-}
-
-double dwt_norms_97[4][10] = {
-  {1.000, 1.965, 4.177, 8.403, 16.90, 33.84, 67.69, 135.3, 270.6, 540.9},
-  {2.022, 3.989, 8.355, 17.04, 34.27, 68.63, 137.3, 274.6, 549.0},
-  {2.022, 3.989, 8.355, 17.04, 34.27, 68.63, 137.3, 274.6, 549.0},
-  {2.080, 3.865, 8.307, 17.18, 34.71, 69.59, 139.3, 278.6, 557.2}
-};
-
-int floorlog2(int a)
-{
-  int l;
-  for (l = 0; a > 1; l++) {
-    a >>= 1;
+  if(strncmp(progression, "RLCP", 4) == 0) {
+    return RLCP;
+  }
+  if(strncmp(progression, "RPCL", 4) == 0) {
+    return RPCL;
+  }
+  if(strncmp(progression, "PCRL", 4) == 0) {
+    return PCRL;
+  }
+  if(strncmp(progression, "CPRL", 4) == 0) {
+    return CPRL;
   }
-  return l;
-}
 
-void encode_stepsize(float stepsize, int numbps, int *expn, int *mant)
-{
-  int p, n, stepsizeTMP;
-  stepsizeTMP=(int) floor(stepsize * 8192.0);
-  p = floorlog2(stepsizeTMP) - 13;
-  n = 11 - floorlog2(stepsizeTMP);
-  *mant = (n < 0 ? stepsizeTMP >> -n : stepsizeTMP << n) & 0x7ff;
-  *expn = numbps - p;
+  return PROG_UNKNOWN;
 }
 
-void calc_explicit_stepsizes(j2k_tccp_t * tccp, int prec)
-{
-  int numbands, bandno;
-  numbands = 3 * tccp->numresolutions - 2;
-  for (bandno = 0; bandno < numbands; bandno++) {
-    float stepsize;
-
-    int resno, level, orient, gain;
-    resno = bandno == 0 ? 0 : (bandno - 1) / 3 + 1;
-    orient = bandno == 0 ? 0 : (bandno - 1) % 3 + 1;
-    level = tccp->numresolutions - 1 - resno;
-    gain =
-      tccp->qmfbid == 0 ? 0 : (orient ==
-			       0 ? 0 : (orient == 1
-					|| orient == 2 ? 1 : 2));
-    if (tccp->qntsty == J2K_CCP_QNTSTY_NOQNT) {
-      stepsize = 1.0;
-    } else {
-      double norm = dwt_norms_97[orient][level];
-      stepsize = (1 << (gain + 1)) / norm;
+int get_file_format(char *filename) {
+  int i;
+  static const char *extension[] = {"pgx", "pnm", "pgm", "ppm", "bmp", "j2k", "jp2" };
+  static const int format[] = { PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, J2K_CFMT, JP2_CFMT };
+  char * ext = strrchr(filename, '.') + 1;
+  for(i = 0; i < sizeof(format); i++) {
+    if(strnicmp(ext, extension[i], 3) == 0) {
+      return format[i];
     }
-    encode_stepsize(stepsize, prec + gain,
-		    &tccp->stepsizes[bandno].expn,
-		    &tccp->stepsizes[bandno].mant);
   }
+
+  return -1;
 }
 
-int main(int argc, char **argv)
-{
-  int len;
-  int NumResolution, numD_min;	/*   NumResolution : number of resolution                     */
-  int Tile_arg;			/*   Tile_arg = 0 (not in argument) ou = 1 (in argument)      */
-  int CSty;			/*   CSty : coding style                                      */
-  int Prog_order;		/*   progression order (default LRCP)                         */
-  char progression[4];
-  int numpocs, numpocs_tile;	/*   Number of progression order change (POC) default 0       */
-  int prcw_init[J2K_MAXRLVLS];	/*   Initialisation Precinct width                            */
-  int prch_init[J2K_MAXRLVLS];	/*   Initialisation Precinct height                           */
-  //int prcw_init, prch_init;                     /*   Initialisation precincts' size                           */
-  int cblockw_init, cblockh_init;	/*   Initialisation codeblocks' size                          */
-  int mode, value;		/*   Mode switch (cblk_style)                                 */
-  int subsampling_dx, subsampling_dy;	/* subsampling value for dx and dy                    */
-  int ROI_compno, ROI_shift;	/*   region of interrest                                      */
-  int Dim[2];			/*   portion of the image coded                               */
-  int TX0, TY0;			/*   tile off-set                                             */
-  j2k_image_t img;
-  j2k_cp_t cp, cp_init;		/*   cp_init is used to initialise in multiple tiles          */
-  j2k_tcp_t *tcp, *tcp_init;	/*   tcp_init is used to initialise in multiple tile          */
-  j2k_poc_t POC[32];		/*   POC : used in case of Progression order change           */
-  j2k_poc_t *tcp_poc;
-  j2k_tccp_t *tccp;
-  int i, tileno, j;
-  char *infile = 0;
-  char *outfile = 0;
-  char *index = 0;
-  char *s, S1, S2, S3;
-  int ir = 0;
-  int res_spec = 0;		/*   For various precinct sizes specification                 */
-  char sep;
-  char *j2k_codestream;
-  char *jp2_codestream;
-  FILE *f;
-  int depth_0, sign, depth;
-
-
-  /* default value */
-  /* ------------- */
-  NumResolution = 6;
-  CSty = 0;
-  cblockw_init = 64;
-  cblockh_init = 64;
-  cp.tw = 1;
-  cp.th = 1;
-  cp.index_on = 0;
-  Prog_order = 0;
-  numpocs = 0;
-  mode = 0;
-  subsampling_dx = 1;
-  subsampling_dy = 1;
-  ROI_compno = -1;		/* no ROI */
-  ROI_shift = 0;
-  Dim[0] = 0;
-  Dim[1] = 0;
-  TX0 = 0;
-  TY0 = 0;
-  cp.comment = "Created by OpenJPEG version 0.9";
-  cp.disto_alloc = 0;
-  cp.fixed_alloc = 0;
-  cp.fixed_quality = 0;		//add fixed_quality
-  /* img.PPT=0; */
-
-  Tile_arg = 0;
-  cp_init.tcps = (j2k_tcp_t *) malloc(sizeof(j2k_tcp_t));	/* initialisation if only one tile */
-  tcp_init = &cp_init.tcps[0];
-  tcp_init->numlayers = 0;
-
-  cp.intermed_file = 1;
+/* ------------------------------------------------------------------------------------ */
+
+int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters) {
+  int i, j;
+
+  /* parse the command line */
 
   while (1) {
-    int c = getopt(argc, argv,
-		   "i:o:r:q:f:t:n:c:b:x:p:s:d:h:P:S:E:M:R:T:C:I");
+    int c = getopt(argc, argv, "i:o:r:q:f:t:n:c:b:x:p:s:d:h:P:S:E:M:R:T:C:I");
     if (c == -1)
       break;
     switch (c) {
-    case 'i':			/* IN fill */
-      infile = optarg;
-      s = optarg;
-      while (*s) {
-	s++;
-      }
-      s--;
-      S3 = *s;
-      s--;
-      S2 = *s;
-      s--;
-      S1 = *s;
-
-      if ((S1 == 'p' && S2 == 'g' && S3 == 'x')
-	  || (S1 == 'P' && S2 == 'G' && S3 == 'X')) {
-	cp.decod_format = PGX_DFMT;
-	break;
+      case 'i':     /* input file */
+      {
+        char *infile = optarg;
+        parameters->decod_format = get_file_format(infile);
+        switch(parameters->decod_format) {
+          case PGX_DFMT:
+          case PXM_DFMT:
+          case BMP_DFMT:
+            break;
+          default:
+            fprintf(stderr, 
+              "!! Unrecognized format for infile : %s [accept only *.pnm, *.pgm, *.ppm, *.pgx or *.bmp] !!\n\n", 
+              infile);
+            return 1;
+            break;
+        }
+        strncpy(parameters->infile, infile, MAX_PATH);
       }
+      break;
+        
+        /* ----------------------------------------------------- */
 
-      if ((S1 == 'p' && S2 == 'n' && S3 == 'm')
-	  || (S1 == 'P' && S2 == 'N' && S3 == 'M')
-	  || (S1 == 'p' && S2 == 'g' && S3 == 'm') || (S1 == 'P'
-						       && S2 == 'G'
-						       && S3 == 'M')
-	  || (S1 == 'P' && S2 == 'P' && S3 == 'M') || (S1 == 'p'
-						       && S2 == 'p'
-						       && S3 == 'm')) {
-	cp.decod_format = PXM_DFMT;
-	break;
+      case 'o':     /* output file */
+      {
+        char *outfile = optarg;
+        parameters->cod_format = get_file_format(outfile);
+        switch(parameters->cod_format) {
+          case J2K_CFMT:
+          case JP2_CFMT:
+            break;
+          default:
+            fprintf(stderr, "Unknown output format image %s [only *.j2k, *.jp2]!! \n", outfile);
+            return 1;
+            break;
+        }
+        strncpy(parameters->outfile, outfile, MAX_PATH);
       }
+      break;
 
-      if ((S1 == 'b' && S2 == 'm' && S3 == 'p')
-	  || (S1 == 'B' && S2 == 'M' && S3 == 'P')) {
-	cp.decod_format = BMP_DFMT;
-	break;
+        /* ----------------------------------------------------- */
+      
+      case 'r':     /* rates rates/distorsion */
+      {
+        char *s = optarg;
+        while (sscanf(s, "%d", &parameters->tcp_rates[parameters->tcp_numlayers]) == 1) {
+          parameters->tcp_numlayers++;
+          while (*s && *s != ',') {
+            s++;
+          }
+          if (!*s)
+            break;
+          s++;
+        }
+        parameters->cp_disto_alloc = 1;
       }
-      fprintf(stderr,
-	      "!! Unrecognized format for infile : %c%c%c [accept only *.pnm, *.pgm, *.ppm, *.pgx or *.bmp] !!\n\n",
-	      S1, S2, S3);
-      return 1;
       break;
-      /* ----------------------------------------------------- */
-    case 'o':			/* OUT fill */
-      outfile = optarg;
-      while (*outfile) {
-	outfile++;
-      }
-      outfile--;
-      S3 = *outfile;
-      outfile--;
-      S2 = *outfile;
-      outfile--;
-      S1 = *outfile;
-
-      outfile = optarg;
-
-      if ((S1 == 'j' && S2 == '2' && S3 == 'k')
-	  || (S1 == 'J' && S2 == '2' && S3 == 'K'))
-	cp.cod_format = J2K_CFMT;
-      else if ((S1 == 'j' && S2 == 'p' && S3 == '2')
-	       || (S1 == 'J' && S2 == 'P' && S3 == '2'))
-	cp.cod_format = JP2_CFMT;
-      else {
-	fprintf(stderr,
-		"Unknown output format image *.%c%c%c [only *.j2k, *.jp2]!! \n",
-		S1, S2, S3);
-	return 1;
+        
+        /* ----------------------------------------------------- */
+      
+      case 'q':     /* add fixed_quality */
+      {
+        char *s = optarg;
+        while (sscanf(s, "%f", &parameters->tcp_distoratio[parameters->tcp_numlayers]) == 1) {
+          parameters->tcp_numlayers++;
+          while (*s && *s != ',') {
+            s++;
+          }
+          if (!*s)
+            break;
+          s++;
+        }
+        parameters->cp_fixed_quality = 1;
       }
+      break;
+        
+        /* dda */
+        /* ----------------------------------------------------- */
 
-
-
+      case 'f':     /* mod fixed_quality (before : -q) */
+      {
+        int *row = NULL, *col = NULL;
+        int numlayers = 0, numresolution = 0, matrix_width = 0;
+
+        char *s = optarg;
+        sscanf(s, "%d", &numlayers);
+        s++;
+        if (numlayers > 9)
+          s++;
+
+        parameters->tcp_numlayers = numlayers;
+        numresolution = parameters->numresolution;
+        matrix_width = numresolution * 3;
+        parameters->cp_matrice = (int *) malloc(numlayers * matrix_width * sizeof(int));
+        s = s + 2;
+
+        for (i = 0; i < numlayers; i++) {
+          row = &parameters->cp_matrice[i * matrix_width];
+          col = row;
+          parameters->tcp_rates[i] = 1;
+          sscanf(s, "%d,", &col[0]);
+          s += 2;
+          if (col[0] > 9)
+            s++;
+          col[1] = 0;
+          col[2] = 0;
+          for (j = 1; j < numresolution; j++) {
+            col += 3;
+            sscanf(s, "%d,%d,%d", &col[0], &col[1], &col[2]);
+            s += 6;
+            if (col[0] > 9)
+              s++;
+            if (col[1] > 9)
+              s++;
+            if (col[2] > 9)
+              s++;
+          }
+          if (i < numlayers - 1)
+            s++;
+        }
+        parameters->cp_fixed_alloc = 1;
+      }
       break;
-      /* ----------------------------------------------------- */
-    case 'r':			/* rates rates/distorsion */
-      s = optarg;
-      while (sscanf(s, "%d", &tcp_init->rates[tcp_init->numlayers]) == 1) {
-	tcp_init->numlayers++;
-	while (*s && *s != ',') {
-	  s++;
-	}
-	if (!*s)
-	  break;
-	s++;
+        
+        /* ----------------------------------------------------- */
+
+      case 't':     /* tiles */
+      {
+        sscanf(optarg, "%d,%d", &parameters->cp_tdx, &parameters->cp_tdy);
+        parameters->tile_size_on = true;
       }
-      cp.disto_alloc = 1;
-      cp.matrice = NULL;
       break;
-      /* ----------------------------------------------------- */
-    case 'q':			/* add fixed_quality */
-      s = optarg;
-      while (sscanf(s, "%f", &tcp_init->distoratio[tcp_init->numlayers])
-	     == 1) {
-	tcp_init->numlayers++;
-	while (*s && *s != ',') {
-	  s++;
-	}
-	if (!*s)
-	  break;
-	s++;
+        
+        /* ----------------------------------------------------- */
+      
+      case 'n':     /* resolution */
+      {
+        sscanf(optarg, "%d", &parameters->numresolution);
       }
-      cp.fixed_quality = 1;
-      cp.matrice = NULL;
       break;
-      /* dda */
-      /* ----------------------------------------------------- */
-    case 'f':			/* mod fixed_quality (before : -q) */
-      s = optarg;
-      sscanf(s, "%d", &tcp_init->numlayers);
-      s++;
-      if (tcp_init->numlayers > 9)
-	s++;
-      cp.matrice =
-	(int *) malloc(tcp_init->numlayers * NumResolution * 3 *
-		       sizeof(int));
-      s = s + 2;
-      for (i = 0; i < tcp_init->numlayers; i++) {
-	tcp_init->rates[i] = 1;
-	sscanf(s, "%d,", &cp.matrice[i * NumResolution * 3]);
-	s += 2;
-	if (cp.matrice[i * NumResolution * 3] > 9)
-	  s++;
-	cp.matrice[i * NumResolution * 3 + 1] = 0;
-	cp.matrice[i * NumResolution * 3 + 2] = 0;
-	for (j = 1; j < NumResolution; j++) {
-	  sscanf(s, "%d,%d,%d",
-		 &cp.matrice[i * NumResolution * 3 + j * 3 + 0],
-		 &cp.matrice[i * NumResolution * 3 + j * 3 + 1],
-		 &cp.matrice[i * NumResolution * 3 + j * 3 + 2]);
-	  s += 6;
-	  if (cp.matrice[i * NumResolution * 3 + j * 3] > 9)
-	    s++;
-	  if (cp.matrice[i * NumResolution * 3 + j * 3 + 1] > 9)
-	    s++;
-	  if (cp.matrice[i * NumResolution * 3 + j * 3 + 2] > 9)
-	    s++;
-	}
-	if (i < tcp_init->numlayers - 1)
-	  s++;
+        
+        /* ----------------------------------------------------- */
+      case 'c':     /* precinct dimension */
+      {
+        char sep;
+        int res_spec = 0;
+
+        char *s = optarg;
+        do {
+          sep = 0;
+          sscanf(s, "[%d,%d]%c", &parameters->prcw_init[res_spec], &parameters->prch_init[res_spec], &sep);
+          parameters->csty |= 0x01;
+          res_spec++;
+          s = strpbrk(s, "]") + 2;
+        }
+        while (sep == ',');
+        parameters->res_spec = res_spec;
       }
-      cp.fixed_alloc = 1;
       break;
-      /* ----------------------------------------------------- */
-    case 't':			/* tiles */
-      sscanf(optarg, "%d,%d", &cp.tdx, &cp.tdy);
-      Tile_arg = 1;
+        
+        /* ----------------------------------------------------- */
+      
+      case 'b':     /* code-block dimension */
+      {
+        int cblockw_init = 0, cblockh_init = 0;
+        sscanf(optarg, "%d,%d", &cblockw_init, &cblockh_init);
+        if (cblockw_init * cblockh_init > 4096 || cblockw_init > 1024
+          || cblockw_init < 4 || cblockh_init > 1024 || cblockh_init < 4) {
+          fprintf(stderr,
+            "!! Size of code_block error (option -b) !!\n\nRestriction :\n    * width*height<=4096\n    * 4<=width,height<= 1024\n\n");
+          return 1;
+        }
+        parameters->cblockw_init = cblockw_init;
+        parameters->cblockh_init = cblockh_init;
+      }
       break;
-      /* ----------------------------------------------------- */
-    case 'n':			/* resolution */
-      sscanf(optarg, "%d", &NumResolution);
+        
+        /* ----------------------------------------------------- */
+      
+      case 'x':     /* creation of index file */
+      {
+        char *index = optarg;
+        strncpy(parameters->index, index, MAX_PATH);
+        parameters->index_on = 1;
+      }
       break;
-      /* ----------------------------------------------------- */
-    case 'c':			/* precinct dimension */
-      s = optarg;
-      do {
-	sep = 0;
-	sscanf(s, "[%d,%d]%c", &prcw_init[res_spec],
-	       &prch_init[res_spec], &sep);
-	CSty |= 0x01;
-	res_spec++;
-	s = strpbrk(s, "]") + 2;
+        
+        /* ----------------------------------------------------- */
+      
+      case 'p':     /* progression order */
+      {
+        char progression[4];
+
+        strncpy(progression, optarg, 4);
+        parameters->prog_order = give_progression(progression);
+        if (parameters->prog_order == -1) {
+          fprintf(stderr, "Unrecognized progression order [LRCP, RLCP, RPCL, PCRL, CPRL] !!\n");
+          return 1;
+        }
       }
-      while (sep == ',');
       break;
-      /* ----------------------------------------------------- */
-    case 'b':			/* code-block dimension */
-      sscanf(optarg, "%d,%d", &cblockw_init, &cblockh_init);
-      if (cblockw_init * cblockh_init > 4096 || cblockw_init > 1024
-	  || cblockw_init < 4 || cblockh_init > 1024 || cblockh_init < 4) {
-	fprintf(stderr,
-		"!! Size of code_block error (option -b) !!\n\nRestriction :\n    * width*height<=4096\n    * 4<=width,height<= 1024\n\n");
-	return 1;
+        
+        /* ----------------------------------------------------- */
+      
+      case 's':     /* subsampling factor */
+      {
+        if (sscanf(optarg, "%d,%d", &parameters->subsampling_dx, &parameters->subsampling_dy) != 2) {
+          fprintf(stderr, "'-s' sub-sampling argument error !  [-s dx,dy]\n");
+          return 1;
+        }
       }
       break;
-      /* ----------------------------------------------------- */
-    case 'x':			/* creation of index file */
-      index = optarg;
-      cp.index_on = 1;
+        
+        /* ----------------------------------------------------- */
+      
+      case 'd':     /* coordonnate of the reference grid */
+      {
+        if (sscanf(optarg, "%d,%d", &parameters->image_offset_x0, &parameters->image_offset_y0) != 2) {
+          fprintf(stderr, "-d 'coordonnate of the reference grid' argument error !! [-d x0,y0]\n");
+          return 1;
+        }
+      }
       break;
-      /* ----------------------------------------------------- */
-    case 'p':			/* progression order */
-      s = optarg;
-      for (i = 0; i < 4; i++) {
-	progression[i] = *s;
-	s++;
+        
+        /* ----------------------------------------------------- */
+      
+      case 'h':     /* display an help description */
+      {
+        encode_help_display();
+        return 1;
       }
-      Prog_order = give_progression(progression);
+      break;
+        
+        /* ----------------------------------------------------- */
 
-      if (Prog_order == -1) {
-	fprintf(stderr,
-		"Unrecognized progression order [LRCP, RLCP, RPCL, PCRL, CPRL] !!\n");
-	return 1;
+      case 'P':     /* POC */
+      {
+        int numpocs = 0;    /* number of progression order change (POC) default 0 */
+        opj_poc_t *POC = NULL;  /* POC : used in case of Progression order change */
+
+        char *s = optarg;
+        POC = parameters->POC;
+
+        fprintf(stderr, "/----------------------------------\\\n");
+        fprintf(stderr, "|  POC option not fully tested !!  |\n");
+        fprintf(stderr, "\\----------------------------------/\n");
+        
+        while (sscanf(s, "T%d=%d,%d,%d,%d,%d,%s", &POC[numpocs].tile,
+          &POC[numpocs].resno0, &POC[numpocs].compno0,
+          &POC[numpocs].layno1, &POC[numpocs].resno1,
+          &POC[numpocs].compno1, POC[numpocs].progorder) == 7) {
+          POC[numpocs].prg = give_progression(POC[numpocs].progorder);
+          /* POC[numpocs].tile; */
+          numpocs++;
+          while (*s && *s != '/') {
+            s++;
+          }
+          if (!*s) {
+            break;
+          }
+          s++;
+        }
+        parameters->numpocs = numpocs;
       }
       break;
-      /* ----------------------------------------------------- */
-    case 's':			/* subsampling factor */
-      if (sscanf(optarg, "%d,%d", &subsampling_dx, &subsampling_dy) != 2) {
-	fprintf(stderr,
-		"'-s' sub-sampling argument error !  [-s dx,dy]\n");
-	return 1;
+        
+        /* ------------------------------------------------------ */
+        
+      case 'S':     /* SOP marker */
+      {
+        parameters->csty |= 0x02;
       }
       break;
-      /* ----------------------------------------------------- */
-    case 'd':			/* coordonnate of the reference grid */
-      if (sscanf(optarg, "%d,%d", &Dim[0], &Dim[1]) != 2) {
-	fprintf(stderr,
-		"-d 'coordonnate of the reference grid' argument error !! [-d x0,y0]\n");
-	return 1;
+        
+        /* ------------------------------------------------------ */
+      
+      case 'E':     /* EPH marker */
+      {
+        parameters->csty |= 0x04;
       }
       break;
-      /* ----------------------------------------------------- */
-    case 'h':			/* Display an help description */
-      help_display();
-      return 0;
-      break;
-      /* ----------------------------------------------------- */
-    case 'P':			/* POC */
-      fprintf(stderr, "/----------------------------------\\\n");
-      fprintf(stderr, "|  POC option not fully tested !!  |\n");
-      fprintf(stderr, "\\----------------------------------/\n");
-
-      s = optarg;
-      while (sscanf(s, "T%d=%d,%d,%d,%d,%d,%s", &POC[numpocs].tile,
-		    &POC[numpocs].resno0, &POC[numpocs].compno0,
-		    &POC[numpocs].layno1, &POC[numpocs].resno1,
-		    &POC[numpocs].compno1, POC[numpocs].progorder) == 7) {
-	POC[numpocs].prg = give_progression(POC[numpocs].progorder);
-	/* POC[numpocs].tile; */
-	numpocs++;
-	while (*s && *s != '/') {
-	  s++;
-	}
-	if (!*s)
-	  break;
-	s++;
+        
+        /* ------------------------------------------------------ */
+      
+      case 'M':     /* Mode switch pas tous au point !! */
+      {
+        int value = 0;
+        if (sscanf(optarg, "%d", &value) == 1) {
+          for (i = 0; i <= 5; i++) {
+            int cache = value & (1 << i);
+            if (cache)
+              parameters->mode |= (1 << i);
+          }
+        }
       }
       break;
-      /* ------------------------------------------------------ */
-    case 'S':			/* SOP marker */
-      CSty |= 0x02;
-      break;
-      /* ------------------------------------------------------ */
-    case 'E':			/* EPH marker */
-      CSty |= 0x04;
-      break;
-      /* ------------------------------------------------------ */
-    case 'M':			/* Mode switch pas tous au point !! */
-      if (sscanf(optarg, "%d", &value) == 1) {
-	for (i = 0; i <= 5; i++) {
-	  int cache = value & (1 << i);
-	  if (cache)
-	    mode |= (1 << i);
-	}
+        
+        /* ------------------------------------------------------ */
+      
+      case 'R':     /* ROI */
+      {
+        if (sscanf(optarg, "OI:c=%d,U=%d", &parameters->roi_compno, &parameters->roi_shift) != 2) {
+          fprintf(stderr, "ROI error !! [-ROI:c='compno',U='shift']\n");
+          return 1;
+        }
       }
       break;
-      /* ------------------------------------------------------ */
-    case 'R':			/* ROI */
-      if (sscanf(optarg, "OI:c=%d,U=%d", &ROI_compno, &ROI_shift) != 2) {
-	fprintf(stderr, "ROI error !! [-ROI:c='compno',U='shift']\n");
-	return 1;
+        
+        /* ------------------------------------------------------ */
+      
+      case 'T':     /* Tile offset */
+      {
+        if (sscanf(optarg, "%d,%d", &parameters->cp_tx0, &parameters->cp_ty0) != 2) {
+          fprintf(stderr, "-T 'tile offset' argument error !! [-T X0,Y0]");
+          return 1;
+        }
       }
       break;
-      /* ------------------------------------------------------ */
-    case 'T':			/* Tile offset */
-      if (sscanf(optarg, "%d,%d", &TX0, &TY0) != 2) {
-	fprintf(stderr, "-T 'tile offset' argument error !! [-T X0,Y0]");
-	return 1;
+        
+        /* ------------------------------------------------------ */
+        
+      case 'C':     /* add a comment */
+      {
+        parameters->cp_comment = (char*)malloc(strlen(optarg) + 1);
+        if(parameters->cp_comment) {
+          strcpy(parameters->cp_comment, optarg);
+        }
       }
       break;
-      /* ------------------------------------------------------ */
-    case 'C':			/* Add a comment */
-      cp.comment = optarg;
-      break;
-      /* ------------------------------------------------------ */
-    case 'I':			/* reversible or not */
-      ir = 1;
+        
+        /* ------------------------------------------------------ */
+      
+      case 'I':     /* reversible or not */
+      {
+        parameters->irreversible = 1;
+      }
       break;
-      /* ------------------------------------------------------ */
-    default:
-      return 1;
+        
+        /* ------------------------------------------------------ */
+      
+      default:
+        fprintf(stderr, "ERROR -> this option is not valid \"-%c %s\"\n", c, optarg);
+        return 1;
     }
   }
 
-  cp.tx0 = TX0;
-  cp.ty0 = TY0;
+  /* check for possible errors */
 
-  /* Error messages */
-  /* -------------- */
-  if (!infile || !outfile) {
-    fprintf(stderr,
-	    "usage: image_to_j2k -i image-file -o j2k/jp2-file (+ options)\n");
+  if((parameters->infile[0] == 0) || (parameters->outfile[0] == 0)) {
+    fprintf(stderr, "usage: image_to_j2k -i image-file -o j2k/jp2-file (+ options)\n");
     return 1;
   }
 
-  if ((cp.disto_alloc || cp.fixed_alloc || cp.fixed_quality)
-      && (!(cp.disto_alloc ^ cp.fixed_alloc ^ cp.fixed_quality))) {
-    fprintf(stderr,
-	    "Error: options -r -q and -f cannot be used together !!\n");
+  if ((parameters->cp_disto_alloc || parameters->cp_fixed_alloc || parameters->cp_fixed_quality)
+    && (!(parameters->cp_disto_alloc ^ parameters->cp_fixed_alloc ^ parameters->cp_fixed_quality))) {
+    fprintf(stderr, "Error: options -r -q and -f cannot be used together !!\n");
     return 1;
-  }				// mod fixed_quality
+  }       /* mod fixed_quality */
 
   /* if no rate entered, lossless by default */
-  if (tcp_init->numlayers == 0) {
-    tcp_init->rates[0] = 0;	//MOD antonin : losslessbug
-    tcp_init->numlayers++;
-    cp.disto_alloc = 1;
+  if (parameters->tcp_numlayers == 0) {
+    parameters->tcp_rates[0] = 0; /* MOD antonin : losslessbug */
+    parameters->tcp_numlayers++;
+    parameters->cp_disto_alloc = 1;
   }
 
-  if (TX0 > Dim[0] || TY0 > Dim[1]) {
+  if((parameters->cp_tx0 > parameters->image_offset_x0) || (parameters->cp_ty0 > parameters->image_offset_y0)) {
     fprintf(stderr,
-	    "Error: Tile offset dimension is unnappropriate --> TX0(%d)<=IMG_X0(%d) TYO(%d)<=IMG_Y0(%d) \n",
-	    TX0, Dim[0], TY0, Dim[1]);
+      "Error: Tile offset dimension is unnappropriate --> TX0(%d)<=IMG_X0(%d) TYO(%d)<=IMG_Y0(%d) \n",
+      parameters->cp_tx0, parameters->image_offset_x0, parameters->cp_ty0, parameters->image_offset_y0);
     return 1;
   }
 
-  for (i = 0; i < numpocs; i++) {
-    if (POC[i].prg == -1) {
+  for (i = 0; i < parameters->numpocs; i++) {
+    if (parameters->POC[i].prg == -1) {
       fprintf(stderr,
-	      "Unrecognized progression order in option -P (POC n %d) [LRCP, RLCP, RPCL, PCRL, CPRL] !!\n",
-	      i + 1);
+        "Unrecognized progression order in option -P (POC n %d) [LRCP, RLCP, RPCL, PCRL, CPRL] !!\n",
+        i + 1);
     }
   }
 
-  switch (cp.decod_format) {
-  case PGX_DFMT:
-    if (Tile_arg) {
-      if (!pgxtoimage
-	  (infile, &img, cp.tdy, subsampling_dx, subsampling_dy, Dim, cp))
-      {
-	fprintf(stderr, "not a pgx file\n");
-	return 1;
-      }
-    } else {
-      if (!pgxtoimage
-	  (infile, &img, -1, subsampling_dx, subsampling_dy, Dim, cp)) {
-	fprintf(stderr, " not a pgx file\n");
-	return 1;
-      }
-    }
-    break;
+  return 0;
+}
 
-  case PXM_DFMT:
-    if (!pnmtoimage(infile, &img, subsampling_dx, subsampling_dy, Dim)) {
-      fprintf(stderr, " not a pnm file\n");
-      return 1;
-    }
-    break;
+/* -------------------------------------------------------------------------- */
 
-  case BMP_DFMT:
-    if (!bmptoimage(infile, &img, subsampling_dx, subsampling_dy, Dim)) {
-      fprintf(stderr, " not a bmp file\n");
-      return 1;
-    }
-    break;
-  }
-  /* to respect profile - 0 */
-  /* ---------------------- */
-  numD_min = 0;
-  /*   while (int_ceildiv(img.x1,(1<<numD_min))-int_ceildiv(img.x0,(1<<numD_min))>120 || int_ceildiv(img.y1,(1<<numD_min))-int_ceildiv(img.y0,(1<<numD_min))>160) numD_min++;
-     if ((numD_min+1)>NumResolution)
-     {
-     fprintf(stderr,"\n********************************************************************************\n\n");
-     fprintf(stderr,  "In view to respect Profile-0, the number of resolution used is %d in place of %d\n\n",numD_min+1,NumResolution);
-     fprintf(stderr,  "********************************************************************************\n\n");
-     NumResolution=numD_min+1;
-     } */
-
-  if (Tile_arg == 1) {
-    cp.tw = int_ceildiv(img.x1 - cp.tx0, cp.tdx);
-    cp.th = int_ceildiv(img.y1 - cp.ty0, cp.tdy);
-  } else {
-    cp.tdx = img.x1 - cp.tx0;
-    cp.tdy = img.y1 - cp.ty0;
-  }
+/**
+sample error callback expecting a FILE* client object
+*/
+void error_callback(const char *msg, void *client_data) {
+  FILE *stream = (FILE*)client_data;
+  fprintf(stream, "[ERROR] %s", msg);
+}
+/**
+sample warning callback expecting a FILE* client object
+*/
+void warning_callback(const char *msg, void *client_data) {
+  FILE *stream = (FILE*)client_data;
+  fprintf(stream, "[WARNING] %s", msg);
+}
+/**
+sample debug callback expecting a FILE* client object
+*/
+void info_callback(const char *msg, void *client_data) {
+  FILE *stream = (FILE*)client_data;
+  fprintf(stream, "[INFO] %s", msg);
+}
 
-  /* Initialization for PPM marker */
-  cp.ppm = 0;
-  cp.ppm_data = NULL;
-  cp.ppm_data_first = NULL;
-  cp.ppm_previous = 0;
-  cp.ppm_store = 0;
-
-  /* Init the mutiple tiles */
-  /* ---------------------- */
-  cp.tcps = (j2k_tcp_t *) malloc(cp.tw * cp.th * sizeof(j2k_tcp_t));
-
-  for (tileno = 0; tileno < cp.tw * cp.th; tileno++) {
-    tcp = &cp.tcps[tileno];
-    tcp->numlayers = tcp_init->numlayers;
-    for (j = 0; j < tcp->numlayers; j++) {
-      if (cp.fixed_quality)	// add fixed_quality
-	tcp->distoratio[j] = tcp_init->distoratio[j];
-      else
-	tcp->rates[j] = tcp_init->rates[j];
-    }
-    tcp->csty = CSty;
-    tcp->prg = Prog_order;
-    tcp->mct = img.numcomps == 3 ? 1 : 0;
-    tcp->ppt = 0;
-    tcp->ppt_data = NULL;
-    tcp->ppt_data_first = NULL;
-    tcp->ppt_store = 0;
-
-    numpocs_tile = 0;
-    tcp->POC = 0;
-    if (numpocs) {
-      /* intialisation of POC */
-      tcp->POC = 1;
-      for (i = 0; i < numpocs; i++) {
-	if (tileno == POC[i].tile - 1 || POC[i].tile == -1) {
-	  tcp_poc = &tcp->pocs[numpocs_tile];
-	  tcp_poc->resno0 = POC[numpocs_tile].resno0;
-	  tcp_poc->compno0 = POC[numpocs_tile].compno0;
-	  tcp_poc->layno1 = POC[numpocs_tile].layno1;
-	  tcp_poc->resno1 = POC[numpocs_tile].resno1;
-	  tcp_poc->compno1 = POC[numpocs_tile].compno1;
-	  tcp_poc->prg = POC[numpocs_tile].prg;
-	  tcp_poc->tile = POC[numpocs_tile].tile;
-	  numpocs_tile++;
-	}
-      }
-    }
-    tcp->numpocs = numpocs_tile;
-    tcp->tccps = (j2k_tccp_t *) malloc(img.numcomps * sizeof(j2k_tccp_t));
-
-    for (i = 0; i < img.numcomps; i++) {
-      tccp = &tcp->tccps[i];
-      tccp->csty = CSty & 0x01;	/* 0 => one precinct || 1 => custom precinct  */
-      tccp->numresolutions = NumResolution;
-      tccp->cblkw = int_floorlog2(cblockw_init);
-      tccp->cblkh = int_floorlog2(cblockh_init);
-      tccp->cblksty = mode;
-      tccp->qmfbid = ir ? 0 : 1;
-      tccp->qntsty = ir ? J2K_CCP_QNTSTY_SEQNT : J2K_CCP_QNTSTY_NOQNT;
-      tccp->numgbits = 2;
-      if (i == ROI_compno)
-	tccp->roishift = ROI_shift;
-      else
-	tccp->roishift = 0;
-      if (CSty & J2K_CCP_CSTY_PRT) {
-	int p = 0;
-	for (j = tccp->numresolutions - 1; j >= 0; j--) {
-	  if (p < res_spec) {
-	    if (prcw_init[p] < 1)
-	      tccp->prcw[j] = 1;
-	    else
-	      tccp->prcw[j] = int_floorlog2(prcw_init[p]);
-
-	    if (prch_init[p] < 1)
-	      tccp->prch[j] = 1;
-	    else
-	      tccp->prch[j] = int_floorlog2(prch_init[p]);
-	  } else {
-	    int size_prcw, size_prch;
-	    size_prcw = prcw_init[res_spec - 1] >> (p - (res_spec - 1));
-	    size_prch = prch_init[res_spec - 1] >> (p - (res_spec - 1));
-	    if (size_prcw < 1)
-	      tccp->prcw[j] = 1;
-	    else
-	      tccp->prcw[j] = int_floorlog2(size_prcw);
-	    if (size_prch < 1)
-	      tccp->prch[j] = 1;
-	    else
-	      tccp->prch[j] = int_floorlog2(size_prch);
-	  }
-	  p++;
-	  /*printf("\nsize precinct pour level %d : %d,%d\n", j,
-	     tccp->prcw[j], tccp->prch[j]); */
-	}
-      } else {
-	for (j = 0; j < tccp->numresolutions; j++) {
-	  tccp->prcw[j] = 15;
-	  tccp->prch[j] = 15;
-	}
-      }
-      calc_explicit_stepsizes(tccp, img.comps[i].prec);
-    }
+/* -------------------------------------------------------------------------- */
+
+int main(int argc, char **argv) {
+  bool bSuccess;
+  bool delete_comment = true;
+  opj_cparameters_t parameters; /* compression parameters */
+  opj_event_mgr_t event_mgr;    /* event manager */
+  opj_image_t *image = NULL;
+
+  /* 
+  configure the event callbacks (not required)
+  setting of each callback is optionnal 
+  */
+  memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
+  event_mgr.error_handler = error_callback;
+  event_mgr.warning_handler = warning_callback;
+  event_mgr.info_handler = info_callback;
+
+  /* set encoding parameters to default values */
+  opj_set_default_encoder_parameters(&parameters);
+
+  /* parse input and get user encoding parameters */
+  if(parse_cmdline_encoder(argc, argv, &parameters) == 1) {
+    return 0;
   }
 
+  if(parameters.cp_comment == NULL) {
+    parameters.cp_comment = "Created by OpenJPEG version 0.9";
+    /* no need to delete parameters.cp_comment on exit */
+    delete_comment = false;
+  }
 
+  /* decode the source image */
+  /* ----------------------- */
 
-  if (cp.cod_format == J2K_CFMT) {	/* J2K format output */
-    if (cp.intermed_file == 1) {	/* After the encoding of each tile, j2k_encode 
-					   stores the data in the file */
-      len = j2k_encode(&img, &cp, outfile, cp.tdx * cp.tdy * 2, index);
-      if (len == 0) {
-	fprintf(stderr, "failed to encode image\n");
-	return 1;
+  switch (parameters.decod_format) {
+    case PGX_DFMT:
+      image = pgxtoimage(parameters.infile, &parameters);
+      if (!image) {
+        fprintf(stderr, " unable to load pgx file\n");
+        return 1;
       }
-    } else {
-      j2k_codestream = (char *) malloc(cp.tdx * cp.tdy * cp.tw * cp.th * 2);
-      /* Allocate memory for all tiles */
-      cio_init(j2k_codestream, cp.tdx * cp.tdy * cp.tw * cp.th * 2);
-      len =
-	j2k_encode(&img, &cp, j2k_codestream,
-		   cp.tdx * cp.tdy * cp.tw * cp.th * 2, index);
-      if (len == 0) {
-	fprintf(stderr, "failed to encode image\n");
-	return 1;
-      }
-      f = fopen(outfile, "wb");
-      if (!f) {
-	fprintf(stderr, "failed to open %s for writing\n", outfile);
-	return 1;
+      break;
+    
+    case PXM_DFMT:
+      image = pnmtoimage(parameters.infile, &parameters);
+      if (!image) {
+        fprintf(stderr, " not a pnm file\n");
+        return 1;
       }
-      fwrite(j2k_codestream, 1, len, f);
-      free(j2k_codestream);
-      fclose(f);
-    }
-  } else {			/* JP2 format output */
-    jp2_struct_t *jp2_struct;
-
-    if (cp.intermed_file == 1) {
-      /*For the moment, JP2 format does not use intermediary 
-      files for each tile */
-      cp.intermed_file = 0;
-    }
-    j2k_codestream = (char *) malloc(cp.tdx * cp.tdy * cp.tw * cp.th * 2);
-    jp2_codestream = (char *) malloc(cp.tdx * cp.tdy * cp.tw * cp.th * 2);
+      break;
 
-    cio_init(j2k_codestream, cp.tdx * cp.tdy * cp.tw * cp.th * 2);
-    len = j2k_encode(&img, &cp, j2k_codestream,
-      cp.tdx * cp.tdy * cp.tw * cp.th * 2, index);
-    if (len == 0) {
-      fprintf(stderr, "failed to encode image\n");
-      return 1;
-    }
+    case BMP_DFMT:
+      image = bmptoimage(parameters.infile, &parameters);
+      if (!image) {
+        fprintf(stderr, " not a bmp file\n");
+        return 1;
+      }
+      break;
+  }
 
-    jp2_struct = (jp2_struct_t *) malloc(sizeof(jp2_struct_t));
-    jp2_struct->image = &img;
-    jp2_struct->j2k_codestream_len = len;
+  /* encode the destination image */
+  /* ---------------------------- */
 
-    /* Initialising the standard JP2 box content */
-    /* If you wish to modify those boxes, you have to modify 
-    the jp2_struct content */
+  if (parameters.cod_format == J2K_CFMT) {  /* J2K format output */
+    int codestream_length;
+    opj_cio_t *cio = NULL;
+    FILE *f = NULL;
 
-    jp2_struct->numcomps = img.numcomps;	// NC
+    /* get a J2K compressor handle */
+    opj_cinfo_t* cinfo = opj_create_compress(CODEC_J2K);
 
-    if (jp2_init_stdjp2(jp2_struct)) {
-      fprintf(stderr, "Error with jp2 initialization");
-      return 1;
-    };
+    /* catch events using our callbacks and give a local context */
+    opj_set_event_mgr((opj_common_ptr)cinfo, &event_mgr, stderr);     
 
-    jp2_struct->h = img.y1 - img.y0;	// HEIGHT
-    jp2_struct->w = img.x1 - img.x0;	// WIDTH
+    /* setup the encoder parameters using the current image and using user parameters */
+    opj_setup_encoder(cinfo, &parameters, image);
 
-    depth_0 = img.comps[0].prec - 1;
-    sign = img.comps[0].sgnd;
-    jp2_struct->bpc = depth_0 + (sign << 7);
+    /* open a byte stream for writing */
+    /* allocate memory for all tiles */
+    cio = opj_cio_open((opj_common_ptr)cinfo, NULL, 0);
 
-    for (i = 1; i < img.numcomps; i++) {
-      depth = img.comps[i].prec - 1;
-      sign = img.comps[i].sgnd;
-      if (depth_0 != depth)
-	jp2_struct->bpc = 255;
+    /* encode the image */
+    bSuccess = opj_encode(cinfo, cio, image, parameters.index);
+    if (!bSuccess) {
+      opj_cio_close(cio);
+      fprintf(stderr, "failed to encode image\n");
+      return 1;
     }
+    codestream_length = cio_tell(cio);
 
-    for (i = 0; i < img.numcomps; i++)
-      jp2_struct->comps[i].bpcc =
-      img.comps[i].prec - 1 + (img.comps[i].sgnd << 7);
-    
-    if ((img.numcomps == 1 || img.numcomps == 3)
-      && (jp2_struct->bpc != 255))
-      jp2_struct->meth = 1;
-    else
-      jp2_struct->meth = 2;
-    
-    if (jp2_struct->meth == 1) {
-      if (img.color_space == 1)
-	jp2_struct->enumcs = 16;
-      else if (img.color_space == 2)
-	jp2_struct->enumcs = 17;
-      else if (img.color_space == 3)
-	jp2_struct->enumcs = 18;	// YUV                          
-    } else
-      jp2_struct->enumcs = 0;	// PROFILE (??)
-
-    cio_init(jp2_codestream, cp.tdx * cp.tdy * cp.tw * cp.th * 2);
-    len = jp2_wrap_j2k(jp2_struct, j2k_codestream, jp2_codestream);
-    f = fopen(outfile, "wb");
+    /* write the buffer to disk */
+    f = fopen(parameters.outfile, "wb");
     if (!f) {
-      fprintf(stderr, "failed to open %s for writing\n", outfile);
+      fprintf(stderr, "failed to open %s for writing\n", parameters.outfile);
       return 1;
     }
-    fwrite(jp2_codestream, 1, len, f);
-    free(jp2_codestream);
-    free(j2k_codestream);
-    free(jp2_struct->comps);
-    free(jp2_struct->cl);
-    free(jp2_struct);
+    fwrite(cio->buffer, 1, codestream_length, f);
     fclose(f);
-  }
 
-  /* Remove the temporary files */
-  /* -------------------------- */
-  if (cp.decod_format != PGX_DFMT) {		/* PNM PGM PPM or BMP */
-    for (i = 0; i < img.numcomps; i++) {
-      char tmp;
-      sprintf(&tmp, "Compo%d", i);
-      if (remove(&tmp) == -1) {
-	fprintf(stderr, "failed to kill %s file !\n", &tmp);
-      }
-    }
-  } else {			/* PGX */
-    for (i = 0; i < cp.th; i++) {
-      char tmp;
-      sprintf(&tmp, "bandtile%d", i + 1);
+    /* close and free the byte stream */
+    opj_cio_close(cio);
 
-      if (remove(&tmp) == -1) {
-	fprintf(stderr, "failed to kill %s file !\n", &tmp);
-      }
-    }
-  }
+    /* free remaining compression structures */
+    opj_destroy_compress(cinfo);
 
-  /* Free memory */
-  free(img.comps);
-  free(cp_init.tcps);
-  if (tcp_init->numlayers > 9)
-    free(cp.matrice);
-  for (tileno = 0; tileno < cp.tw * cp.th; tileno++)
-    free(cp.tcps[tileno].tccps);
-  free(cp.tcps);
+  } else {      /* JP2 format output */
+    int codestream_length;
+    opj_cio_t *cio = NULL;
+    FILE *f = NULL;
 
+    /* get a JP2 compressor handle */
+    opj_cinfo_t* cinfo = opj_create_compress(CODEC_JP2);
 
+    /* catch events using our callbacks and give a local context */
+    opj_set_event_mgr((opj_common_ptr)cinfo, &event_mgr, stderr);     
 
+    /* setup the encoder parameters using the current image and using user parameters */
+    opj_setup_encoder(cinfo, &parameters, image);
+
+    /* open a byte stream for writing */
+    /* allocate memory for all tiles */
+    cio = opj_cio_open((opj_common_ptr)cinfo, NULL, 0);
+
+    /* encode the image */
+    bSuccess = opj_encode(cinfo, cio, image, parameters.index);
+    if (!bSuccess) {
+      opj_cio_close(cio);
+      fprintf(stderr, "failed to encode image\n");
+      return 1;
+    }
+    codestream_length = cio_tell(cio);
 
+    /* write the buffer to disk */
+    f = fopen(parameters.outfile, "wb");
+    if (!f) {
+      fprintf(stderr, "failed to open %s for writing\n", parameters.outfile);
+      return 1;
+    }
+    fwrite(cio->buffer, 1, codestream_length, f);
+    fclose(f);
 
-  //MEMORY LEAK
+    /* close and free the byte stream */
+    opj_cio_close(cio);
 
-  #ifdef _DEBUG
+    /* free remaining compression structures */
+    opj_destroy_compress(cinfo);
 
-    _CrtDumpMemoryLeaks();
+  }
 
-  #endif
+  /* free user parameters structure */
+  if(delete_comment) {
+    if(parameters.cp_comment) free(parameters.cp_comment);
+  }
+  if(parameters.cp_matrice) free(parameters.cp_matrice);
 
-  //MEM
+  /* free image data */
+  opj_image_destroy(image);
 
   return 0;
 }
+
diff --git a/codec/image_to_j2k.dsp b/codec/image_to_j2k.dsp
index 07e5a0a2..cbb6f8f9 100644
--- a/codec/image_to_j2k.dsp
+++ b/codec/image_to_j2k.dsp
@@ -41,15 +41,15 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../libopenjpeg" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "DONT_HAVE_GETOPT" /YX /FD /c
-# ADD BASE RSC /l 0x80c /d "NDEBUG"
-# ADD RSC /l 0x80c /i "../libopenjpeg" /d "NDEBUG"
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../libopenjpeg" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x40c /d "NDEBUG"
+# ADD RSC /l 0x40c /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
 
 !ELSEIF  "$(CFG)" == "image_to_j2k - Win32 Debug"
 
@@ -62,18 +62,17 @@ LINK32=link.exe
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "Debug"
 # PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../libopenjpeg" /D "_DEBUG" /D "DONT_HAVE_GETOPT" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x80c /d "_DEBUG"
-# ADD RSC /l 0x80c /d "_DEBUG"
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../libopenjpeg" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x40c /d "_DEBUG"
+# ADD RSC /l 0x40c /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 
 !ENDIF 
 
@@ -81,108 +80,17 @@ LINK32=link.exe
 
 # Name "image_to_j2k - Win32 Release"
 # Name "image_to_j2k - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\libopenjpeg\bio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\cio.c
-# End Source File
 # Begin Source File
 
 SOURCE=.\convert.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\dwt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\fix.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\compat\getopt.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\image_to_j2k.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\int.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\j2k.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\jp2.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\jpt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\mct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\mqc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\pi.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\raw.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\t1.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\t2.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\tcd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\tgt.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\libopenjpeg\bio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\cio.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\convert.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\dwt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\fix.h
+SOURCE=.\compat\getopt.c
 # End Source File
 # Begin Source File
 
@@ -190,60 +98,7 @@ SOURCE=.\compat\getopt.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\int.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\j2k.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\jp2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\jpt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\mct.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\mqc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\openjpeg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\pi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\raw.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\t1.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\t2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\tcd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\tgt.h
+SOURCE=.\image_to_j2k.c
 # End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
 # End Target
 # End Project
diff --git a/codec/j2k_to_image.c b/codec/j2k_to_image.c
index 3a6dcce1..d3593c0a 100644
--- a/codec/j2k_to_image.c
+++ b/codec/j2k_to_image.c
@@ -1,62 +1,57 @@
-/* Copyright (c) 2001 David Janssens
-* Copyright (c) 2002-2003 Yannick Verschueren
-* Copyright (c) 2002-2003 Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
-* 
-* 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.
-*/
-
-
-
-//MEMORY LEAK
-
-#ifdef _DEBUG
-
-#define _CRTDBG_MAP_ALLOC
-
-#include <stdlib.h>  // Must be included first
-
-#include <crtdbg.h>
+/*
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
+ * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
+ * 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 <stdio.h>
+#include <string.h>
+#include <stdlib.h>
 
-#endif
+#include "openjpeg.h"
+#include "compat/getopt.h"
+#include "convert.h"
 
-//MEM
+#define J2K_CFMT 0
+#define JP2_CFMT 1
+#define JPT_CFMT 2
+#define MJ2_CFMT 3
+#define PXM_DFMT 0
+#define PGX_DFMT 1
+#define BMP_DFMT 2
+#define YUV_DFMT 3
 
+/* ----------------------------------------------------------------------- */
 
+void decode_help_display() {
+  fprintf(stdout,"HELP\n----\n\n");
+  fprintf(stdout,"- the -h option displays this help information on screen\n\n");
 
-#include <openjpeg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifndef DONT_HAVE_GETOPT
-#include <getopt.h>
-#else
-#include "compat/getopt.h"
-#endif
-
-void usage_display(char *prgm)
-{
-  fprintf(stdout,"Usage:\n");
-  fprintf(stdout,"  %s...\n",prgm);
+  fprintf(stdout,"List of parameters for the JPEG 2000 encoder:\n");
+  fprintf(stdout,"\n");
   fprintf(stdout,"  -i <compressed file>\n");
   fprintf(stdout,"    REQUIRED\n");
   fprintf(stdout,"    Currently accepts J2K-files, JP2-files and JPT-files. The file type\n");
@@ -79,668 +74,316 @@ void usage_display(char *prgm)
   fprintf(stdout,"    Set the maximum number of quality layers to decode. If there are\n");
   fprintf(stdout,"    less quality layers than the specified number, all the quality layers\n");
   fprintf(stdout,"    are decoded.\n");
-  fprintf(stdout,"  -u\n");
-  fprintf(stdout,"    print an usage statement\n");
   fprintf(stdout,"\n");
 }
 
-int main(int argc, char **argv)
-{
-  FILE *fsrc=NULL;
-  FILE *fdest=NULL;
-  char *infile=NULL;
-  char *outfile=NULL;
-  char *tmp=NULL;
-  char S1, S2, S3;
-  
-  char *src=NULL; 
-  
-  int len;
-  
-  j2k_image_t img;
-  j2k_cp_t cp;
-  jp2_struct_t *jp2_struct=NULL;
-  
-  int w, wr, wrr, h, hr, hrr, max;
-  int i, compno, pad, j;
-  int adjust;
-  
-  cp.layer=0;
-  cp.reduce=0;
-  cp.decod_format=-1;
-  cp.cod_format=-1;
-  
+/* -------------------------------------------------------------------------- */
+
+int get_file_format(char *filename) {
+  int i;
+  static const char *extension[] = {"pgx", "pnm", "pgm", "ppm", "bmp", "j2k", "jp2", "jpt" };
+  static const int format[] = { PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, J2K_CFMT, JP2_CFMT, JPT_CFMT };
+  char * ext = strrchr(filename, '.') + 1;
+  if(ext) {
+    for(i = 0; i < sizeof(format); i++) {
+      if(strnicmp(ext, extension[i], 3) == 0) {
+        return format[i];
+      }
+    }
+  }
+
+  return -1;
+}
+
+/* -------------------------------------------------------------------------- */
+
+int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters) {
+  /* parse the command line */
+
   while (1) {
-    int c = getopt(argc, argv,"i:o:r:l:u");
+    int c = getopt(argc, argv, "i:o:r:q:f:t:n:c:b:x:p:s:d:h:P:S:E:M:R:T:C:I");
     if (c == -1)
       break;
     switch (c) {
-      
-      //Input file
-    case 'i':
-      infile = optarg;
-      tmp = optarg;
-      while (*tmp) {
-	tmp++;
-      }
-      tmp--;
-      S3 = *tmp;
-      tmp--;
-      S2 = *tmp;
-      tmp--;
-      S1 = *tmp;
-      
-      /* J2K format */
-      if ((S1 == 'j' && S2 == '2' && S3 == 'k')
-	|| (S1 == 'J' && S2 == '2' && S3 == 'K') 
-	|| (S1 == 'j' && S2 == '2' && S3 == 'c')
-	|| (S1 == 'J' && S2 == '2' && S3 == 'C')) {
-	cp.cod_format=J2K_CFMT;
-	break;
-      }
-      
-      /* JP2 format */
-      if ((S1 == 'j' && S2 == 'p' && S3 == '2')
-	|| (S1 == 'J' && S2 == 'P' && S3 == '2')) {
-	cp.cod_format=JP2_CFMT;
-	break;
+      case 'i':     /* input file */
+      {
+        char *infile = optarg;
+        parameters->decod_format = get_file_format(infile);
+        switch(parameters->decod_format) {
+          case J2K_CFMT:
+          case JP2_CFMT:
+          case JPT_CFMT:
+            break;
+          default:
+            fprintf(stderr, 
+              "!! Unrecognized format for infile : %s [accept only *.j2k, *.jp2, *.jpc or *.jpt] !!\n\n", 
+              infile);
+            return 1;
+            break;
+        }
+        strncpy(parameters->infile, infile, MAX_PATH);
       }
-      
-      /* JPT format */
-      if ((S1 == 'j' && S2 == 'p' && S3 == 't')
-	|| (S1 == 'J' && S2 == 'P' && S3 == 'T')) {
-	cp.cod_format=JPT_CFMT;
-	break;
-      }
-      
-      fprintf(stderr,
-	"j2k_to_image : Unknown input image format *.%c%c%c [only *.j2k, *.jp2, *.jpc or *.jpt]!! \n",
-	S1, S2, S3);
-      return 1;
       break;
-      
-      /* ----------------------------------------------------- */
-      
-      //Output file
-    case 'o':
-      outfile = optarg;
-      tmp = optarg;
-      while (*tmp) {
-	tmp++;
-      }
-      tmp--;
-      S3 = *tmp;
-      tmp--;
-      S2 = *tmp;
-      tmp--;
-      S1 = *tmp;
-      
-      // PGX format      
-      if ((S1 == 'p' && S2 == 'g' && S3 == 'x')
-	|| (S1 == 'P' && S2 == 'G' && S3 == 'X')) {
-	cp.decod_format = PGX_DFMT;
-	break;
-      }
-      
-      // PxM format 
-      if ((S1 == 'p' && S2 == 'n' && S3 == 'm')
-	|| (S1 == 'P' && S2 == 'N' && S3 == 'M') 
-	|| (S1 == 'p' && S2 == 'g' && S3 == 'm')
-	|| (S1 == 'P' && S2 == 'G' && S3 == 'M') 
-	|| (S1 == 'P' && S2 == 'P' && S3 == 'M')
-	|| (S1 == 'p' && S2 == 'p' && S3 == 'm')) {
-	cp.decod_format = PXM_DFMT;
-	break;
-      }
-      
-      // BMP format 
-      if ((S1 == 'b' && S2 == 'm' && S3 == 'p')
-	|| (S1 == 'B' && S2 == 'M' && S3 == 'P')) {
-	cp.decod_format = BMP_DFMT;
-	break;
+        
+        /* ----------------------------------------------------- */
+
+      case 'o':     /* output file */
+      {
+        char *outfile = optarg;
+        parameters->cod_format = get_file_format(outfile);
+        switch(parameters->cod_format) {
+          case PGX_DFMT:
+          case PXM_DFMT:
+          case BMP_DFMT:
+            break;
+          default:
+            fprintf(stderr, "Unknown output format image %s [only *.pnm, *.pgm, *.ppm, *.pgx or *.bmp]!! \n", outfile);
+            return 1;
+            break;
+        }
+        strncpy(parameters->outfile, outfile, MAX_PATH);
       }
-      
-      // otherwise : error
-      fprintf(stderr,
-	"!! Unrecognized output image format *.%c%c%c [only *.pnm, *.pgm, *.ppm, *.pgx or *.bmp] !!\n",
-	S1, S2, S3);
-      
-      return 1;
       break;
       
-      /* ----------------------------------------------------- */
+        /* ----------------------------------------------------- */
       
-      //Reduce option
-    case 'r':
-      tmp=optarg;
-      sscanf(tmp, "%d", &cp.reduce);
+    
+      case 'r':   /* reduce option */
+      {
+        sscanf(optarg, "%d", &parameters->cp_reduce);
+      }
       break;
       
-      /* ----------------------------------------------------- */
+        /* ----------------------------------------------------- */
       
-      //Layering option
-    case 'l':
-      tmp=optarg;
-      sscanf(tmp, "%d", &cp.layer);
+
+      case 'l':   /* layering option */
+      {
+        sscanf(optarg, "%d", &parameters->cp_layer);
+      }
       break;
       
-      /* ----------------------------------------------------- */
-      
-    case 'u':			
-      usage_display(argv[0]);
-      return 0;
-      break;
-      /* ----------------------------------------------------- */
+        /* ----------------------------------------------------- */
       
-    default:
-      fprintf(stderr,"WARNING -> this option is not valid \"-%c %s\"\n",c,optarg);
+      case 'h':       /* display an help description */
+      {
+        decode_help_display();
+        return 1;
+      }
       break;
+            
+        /* ----------------------------------------------------- */
       
+      default:
+        fprintf(stderr,"WARNING -> this option is not valid \"-%c %s\"\n",c, optarg);
+        break;
     }
   }
-  
-  //Check required arguments
-  //------------------------
-  if (!infile || !outfile) {
-    fprintf(stderr,"ERROR -> At least one required argument is missing\nCheck j2k_to_image -u for usage information\n");
+
+  /* check for possible errors */
+
+  if((parameters->infile[0] == 0) || (parameters->outfile[0] == 0)) {
+    fprintf(stderr,"ERROR -> At least one required argument is missing\nCheck j2k_to_image -h for usage information\n");
     return 1;
   }
+
+  return 0;
+}
+
+/* -------------------------------------------------------------------------- */
+
+/**
+sample error callback expecting a FILE* client object
+*/
+void error_callback(const char *msg, void *client_data) {
+  FILE *stream = (FILE*)client_data;
+  fprintf(stream, "[ERROR] %s", msg);
+}
+/**
+sample warning callback expecting a FILE* client object
+*/
+void warning_callback(const char *msg, void *client_data) {
+  FILE *stream = (FILE*)client_data;
+  fprintf(stream, "[WARNING] %s", msg);
+}
+/**
+sample debug callback expecting no client object
+*/
+void info_callback(const char *msg, void *client_data) {
+  fprintf(stdout, "[INFO] %s", msg);
+}
+
+/* -------------------------------------------------------------------------- */
+
+int main(int argc, char **argv) {
+  opj_dparameters_t parameters; /* decompression parameters */
+  opj_event_mgr_t event_mgr;    /* event manager */
+  opj_image_t *image = NULL;
+  FILE *fsrc = NULL;
+  unsigned char *src = NULL; 
+  int file_length;
+
+  opj_dinfo_t* dinfo = NULL;  /* handle to a decompressor */
+  opj_cio_t *cio = NULL;
+
+  /* configure the event callbacks (not required) */
+  memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
+  event_mgr.error_handler = error_callback;
+  event_mgr.warning_handler = warning_callback;
+  event_mgr.info_handler = info_callback;
+
+  /* set decoding parameters to default values */
+  opj_set_default_decoder_parameters(&parameters);
+
+  /* parse input and get user decoding parameters */
+  if(parse_cmdline_decoder(argc, argv, &parameters) == 1) {
+    return 0;
+  }
   
-  //Read the input file and put it in memory
-  //----------------------------------------
-  fsrc = fopen(infile, "rb");
+  /* read the input file and put it in memory */
+  /* ---------------------------------------- */
+  fsrc = fopen(parameters.infile, "rb");
   if (!fsrc) {
-    fprintf(stderr, "ERROR -> failed to open %s for reading\n", infile);
+    fprintf(stderr, "ERROR -> failed to open %s for reading\n", parameters.infile);
     return 1;
-  }
+  }  
   fseek(fsrc, 0, SEEK_END);
-  len = ftell(fsrc);
+  file_length = ftell(fsrc);
   fseek(fsrc, 0, SEEK_SET);
-  src = (char *) malloc(len);
-  fread(src, 1, len, fsrc);
+  src = (unsigned char *) malloc(file_length);
+  fread(src, 1, file_length, fsrc);
   fclose(fsrc);
   
-  //Decode the code-stream
-  //----------------------
-  switch(cp.cod_format) {
-    
-  case J2K_CFMT:
-    if (!j2k_decode(src, len, &img, &cp)) {
-      fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
-      return 1;
-    }
-    break;
-    
-  case JP2_CFMT:
-    jp2_struct = (jp2_struct_t *) malloc(sizeof(jp2_struct_t));
-    jp2_struct->image = &img;
-    
-    if (jp2_read_struct(src, jp2_struct, len)) {
-      fprintf(stderr, "ERROR -> j2k_to_image: failed to decode jp2 structure!\n");
-      return 1;
-    }
-    
-    if (!j2k_decode(src + jp2_struct->j2k_codestream_offset, jp2_struct->j2k_codestream_len, &img, &cp)) {
-      fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
-      return 1;
-    }
-    
-    /* Insert code here if you want to create actions on jp2_struct before deleting it */
-    
-    free(jp2_struct);
-    break;
-    
-  case JPT_CFMT:
-    if (!j2k_decode_jpt_stream(src, len, &img, &cp)) {
-      fprintf(stderr, "ERROR -> j2k_to_image: failed to decode JPT-file!\n");
-      return 1;
-    }
-    break;
-    
-  default:
-    fprintf(stderr,
-      "ERROR -> j2k_to_image : Unknown input image format\n");
-    return 1;
-    break;
-  }
-  
-  //Free the memory containing the code-stream
-  //------------------------------------------
-  
-  free(src);
-  
-  
-  //Create output image
-  //-------------------
-  
-  /* ---------------------------- / */
-  /* /                            / */
-  /* /  FORMAT : PNM, PGM or PPM  / */
-  /* /                            / */
-  /* ---------------------------- / */
-  
-  switch (cp.decod_format) {
-  case PXM_DFMT:			/* PNM PGM PPM */
-    
-    tmp=outfile;
-    while (*tmp) {
-      tmp++;
-    }
-    tmp--;
-    tmp--;
-    S2 = *tmp;
-    
-    if (img.numcomps == 3 && img.comps[0].dx == img.comps[1].dx
-      && img.comps[1].dx == img.comps[2].dx
-      && img.comps[0].dy == img.comps[1].dy
-      && img.comps[1].dy == img.comps[2].dy
-      && img.comps[0].prec == img.comps[1].prec
-      && img.comps[1].prec == img.comps[2].prec
-      && S2 !='g' && S2 !='G') {
-      
-      fdest = fopen(outfile, "wb");
-      if (!fdest) {
-	fprintf(stderr, "ERROR -> failed to open %s for writing\n", outfile);
-	return 1;
-      }
-      
-      w = int_ceildiv(img.x1 - img.x0, img.comps[0].dx);
-      // wr = int_ceildiv(int_ceildivpow2(img.x1 - img.x0,img.factor),img.comps[0].dx);
-      wr = img.comps[0].w;
-      wrr = int_ceildivpow2(img.comps[0].w, img.comps[0].factor);
-      
-      h = int_ceildiv(img.y1 - img.y0, img.comps[0].dy);
-      // hr = int_ceildiv(int_ceildivpow2(img.y1 - img.y0,img.factor), img.comps[0].dy);
-      hr = img.comps[0].h;
-      hrr = int_ceildivpow2(img.comps[0].h, img.comps[0].factor);
-      
-      max = img.comps[0].prec > 8 ? 255 : (1 << img.comps[0].prec) - 1;
-      
-      img.comps[0].x0 =
-	int_ceildivpow2(img.comps[0].x0 -
-	int_ceildiv(img.x0, img.comps[0].dx),
-	img.comps[0].factor);
-      img.comps[0].y0 =
-	int_ceildivpow2(img.comps[0].y0 -
-	int_ceildiv(img.y0, img.comps[0].dy),
-	img.comps[0].factor);
-      
+  /* decode the code-stream */
+  /* ---------------------- */
+
+    switch(parameters.decod_format) {
+    case J2K_CFMT:
+    {
+      /* JPEG-2000 codestream */
+
+      /* get a decoder handle */
+      dinfo = opj_create_decompress(CODEC_J2K);
       
-      fprintf(fdest, "P6\n%d %d\n%d\n", wrr, hrr, max);
-      adjust = img.comps[0].prec > 8 ? img.comps[0].prec - 8 : 0;
-      for (i = 0; i < wrr * hrr; i++) {
-	int r, g, b;
-        unsigned char rc,gc,bc;
-	r = img.comps[0].data[i / wrr * wr + i % wrr];
-	r += (img.comps[0].sgnd ? 1 << (img.comps[0].prec - 1) : 0);
-	rc = (unsigned char) ((r >> adjust)+((r >> (adjust-1))%2));
-	
-	g = img.comps[1].data[i / wrr * wr + i % wrr];
-	g += (img.comps[1].sgnd ? 1 << (img.comps[1].prec - 1) : 0);
-	gc = (unsigned char) ((g >> adjust)+((g >> (adjust-1))%2));
-	
-	b = img.comps[2].data[i / wrr * wr + i % wrr];
-	b += (img.comps[2].sgnd ? 1 << (img.comps[2].prec - 1) : 0);
-	bc = (unsigned char) ((b >> adjust)+((b >> (adjust-1))%2));
-	
-	fprintf(fdest, "%c%c%c", rc, gc, bc);
+      /* catch events using our callbacks and give a local context */
+      opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);     
+
+      /* setup the decoder decoding parameters using user parameters */
+      opj_setup_decoder(dinfo, &parameters);
+
+      /* open a byte stream */
+      cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length);
+
+      /* decode the stream and fill the image structure */
+      image = opj_decode(dinfo, cio);
+      if(!image) {
+        fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
+        opj_destroy_decompress(dinfo);
+        opj_cio_close(cio);
+        return 1;
       }
-      free(img.comps[0].data);
-      free(img.comps[1].data);
-      free(img.comps[2].data);
-      fclose(fdest);
       
-    } else {
-      int ncomp=(S2=='g' || S2=='G')?1:img.numcomps;
-      if (img.numcomps>ncomp) {
-	fprintf(stderr,"WARNING -> [PGM files] Only the first component\n");
-	fprintf(stderr,"           is written to the file\n");
-      }
-      for (compno = 0; compno < ncomp; compno++) {
-	char name[256];
-	if (ncomp > 1) {
-	  sprintf(name, "%d.%s", compno, outfile);
-	} else {
-	  sprintf(name, "%s", outfile);
-	}
-	
-	fdest = fopen(name, "wb");
-	if (!fdest) {
-	  fprintf(stderr, "ERROR -> failed to open %s for writing\n", name);
-	  return 1;
-	}
-	
-	w = int_ceildiv(img.x1 - img.x0, img.comps[compno].dx);
-	// wr = int_ceildiv(int_ceildivpow2(img.x1 - img.x0,img.factor),img.comps[compno].dx);
-	wr = img.comps[compno].w;
-	wrr =
-	  int_ceildivpow2(img.comps[compno].w, img.comps[compno].factor);
-	
-	h = int_ceildiv(img.y1 - img.y0, img.comps[compno].dy);
-	// hr = int_ceildiv(int_ceildivpow2(img.y1 - img.y0,img.factor), img.comps[compno].dy);
-	hr = img.comps[compno].h;
-	hrr =
-	  int_ceildivpow2(img.comps[compno].h, img.comps[compno].factor);
-	
-	max =
-	  img.comps[compno].prec >
-	  8 ? 255 : (1 << img.comps[compno].prec) - 1;
-	
-	img.comps[compno].x0 =
-	  int_ceildivpow2(img.comps[compno].x0 -
-	  int_ceildiv(img.x0,
-				      img.comps[compno].dx),
-				      img.comps[compno].factor);
-	img.comps[compno].y0 =
-	  int_ceildivpow2(img.comps[compno].y0 -
-	  int_ceildiv(img.y0,
-				      img.comps[compno].dy),
-				      img.comps[compno].factor);
-	
-	fprintf(fdest, "P5\n%d %d\n%d\n", wrr, hrr, max);
-	adjust =
-	  img.comps[compno].prec > 8 ? img.comps[compno].prec - 8 : 0;
-	for (i = 0; i < wrr * hrr; i++) {
-	  int l;
-          unsigned char lc;
-	  l = img.comps[compno].data[i / wrr * wr + i % wrr];
-	  l += (img.comps[compno].
-	    sgnd ? 1 << (img.comps[compno].prec - 1) : 0);
-	  lc = (unsigned char) ((l >> adjust)+((l >> (adjust-1))%2));
-	  fprintf(fdest, "%c", lc);
-	}
-	fclose(fdest);
-	free(img.comps[compno].data);
-      }
+      /* close the byte stream */
+      opj_cio_close(cio);
     }
     break;
-    
-    /* ------------------------ / */
-    /* /                        / */
-    /* /     FORMAT : PGX       / */
-    /* /                        / */
-    /* /----------------------- / */
-  case PGX_DFMT:			/* PGX */
-    for (compno = 0; compno < img.numcomps; compno++) {
-      j2k_comp_t *comp = &img.comps[compno];
-      char name[256];
-      int nbytes = 0;
-      tmp = outfile;
-      while (*tmp) {
-	tmp++;
-      }
-      while (*tmp!='.') {
-	tmp--;
-      }
-      *tmp='\0';
-      
-      if (img.numcomps > 1)
-        sprintf(name, "%s-%d.pgx", outfile, compno);
-      else
-        sprintf(name, "%s.pgx", outfile);
-      
-      fdest = fopen(name, "wb");
-      if (!fdest) {
-	fprintf(stderr, "ERROR -> failed to open %s for writing\n", name);
-	return 1;
-      }
-      
-      // w = int_ceildiv(img.x1 - img.x0, comp->dx);
-      // wr = int_ceildiv(int_ceildivpow2(img.x1 - img.x0,img.factor), comp->dx);
-      w = img.comps[compno].w;
-      wr = int_ceildivpow2(img.comps[compno].w, img.comps[compno].factor);
-      
-      // h = int_ceildiv(img.y1 - img.y0, comp->dy);
-      // hr = int_ceildiv(int_ceildivpow2(img.y1 - img.y0,img.factor), comp->dy);
-      h = img.comps[compno].h;
-      hr = int_ceildivpow2(img.comps[compno].h, img.comps[compno].factor);
-      
-      fprintf(fdest, "PG ML %c %d %d %d\n", comp->sgnd ? '-' : '+',
-	comp->prec, wr, hr);
-      
-      if (comp->prec <= 8)
-	nbytes = 1;
-      
-      else if (comp->prec <= 16)
-	nbytes = 2;
+
+    case JP2_CFMT:
+    {
+      /* JPEG 2000 compressed image data */
+
+      /* get a decoder handle */
+      dinfo = opj_create_decompress(CODEC_JP2);
       
-      else
-	nbytes = 4;
-      for (i = 0; i < wr * hr; i++) {
-	int v = img.comps[compno].data[i / wr * w + i % wr];
-	
-	for (j = nbytes - 1; j >= 0; j--) {
-	  
-	  char byte = (char) (v >> (j * 8));
-	  
-	  fwrite(&byte, 1, 1, fdest);
-	  
-	}
+      /* catch events using our callbacks and give a local context */
+      opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);     
+
+      /* setup the decoder decoding parameters using the current image and using user parameters */
+      opj_setup_decoder(dinfo, &parameters);
+
+      /* open a byte stream */
+      cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length);
+
+      /* decode the stream and fill the image structure */
+      image = opj_decode(dinfo, cio);
+      if(!image) {
+        fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
+        opj_destroy_decompress(dinfo);
+        opj_cio_close(cio);
+        return 1;
       }
-      free(img.comps[compno].data);
-      fclose(fdest);
+
+      /* close the byte stream */
+      opj_cio_close(cio);
+
     }
     break;
-    
-    /* ------------------------ / */
-    /* /                        / */
-    /* /     FORMAT : BMP       / */
-    /* /                        / */
-    /* /----------------------- / */
-    
-  case BMP_DFMT:			/* BMP */
-    if (img.numcomps == 3 && img.comps[0].dx == img.comps[1].dx
-      && img.comps[1].dx == img.comps[2].dx
-      && img.comps[0].dy == img.comps[1].dy
-      && img.comps[1].dy == img.comps[2].dy
-      && img.comps[0].prec == img.comps[1].prec
-      && img.comps[1].prec == img.comps[2].prec) {
-      /* -->> -->> -->> -->>
-      
-       24 bits color
-       
-      <<-- <<-- <<-- <<-- */
-      
-      fdest = fopen(outfile, "wb");
-      if (!fdest) {
-	fprintf(stderr, "ERROR -> failed to open %s for writing\n", outfile);
-	return 1;
-      }
-      
-      // w = int_ceildiv(img.x1 - img.x0, img.comps[0].dx);
-      // wr = int_ceildiv(int_ceildivpow2(img.x1 - img.x0,img.factor), img.comps[0].dx);
-      w = img.comps[0].w;
-      wr = int_ceildivpow2(img.comps[0].w, img.comps[0].factor);
-      
-      // h = int_ceildiv(img.y1 - img.y0, img.comps[0].dy);
-      // hr = int_ceildiv(int_ceildivpow2(img.y1 - img.y0,img.factor), img.comps[0].dy);
-      h = img.comps[0].h;
-      hr = int_ceildivpow2(img.comps[0].h, img.comps[0].factor);
-      
-      fprintf(fdest, "BM");
-      
-      /* FILE HEADER */
-      /* ------------- */
-      fprintf(fdest, "%c%c%c%c",
-	(unsigned char) (hr * wr * 3 + 3 * hr * (wr % 2) +
-	54) & 0xff,
-	(unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2) + 54)
-	>> 8) & 0xff,
-	(unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2) + 54)
-	>> 16) & 0xff,
-	(unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2) + 54)
-	>> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
-	((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (54) & 0xff, ((54) >> 8) & 0xff,
-	((54) >> 16) & 0xff, ((54) >> 24) & 0xff);
-      
-      /* INFO HEADER   */
-      /* ------------- */
-      fprintf(fdest, "%c%c%c%c", (40) & 0xff, ((40) >> 8) & 0xff,
-	((40) >> 16) & 0xff, ((40) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (unsigned char) ((wr) & 0xff),
-	(unsigned char) ((wr) >> 8) & 0xff,
-	(unsigned char) ((wr) >> 16) & 0xff,
-	(unsigned char) ((wr) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (unsigned char) ((hr) & 0xff),
-	(unsigned char) ((hr) >> 8) & 0xff,
-	(unsigned char) ((hr) >> 16) & 0xff,
-	(unsigned char) ((hr) >> 24) & 0xff);
-      fprintf(fdest, "%c%c", (1) & 0xff, ((1) >> 8) & 0xff);
-      fprintf(fdest, "%c%c", (24) & 0xff, ((24) >> 8) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
-	((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c",
-	(unsigned char) (3 * hr * wr +
-	3 * hr * (wr % 2)) & 0xff,
-	(unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2)) >>
-	8) & 0xff,
-	(unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2)) >>
-	16) & 0xff,
-	(unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2)) >>
-	24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,
-	((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,
-	((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
-	((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
-	((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-      
-      for (i = 0; i < wr * hr; i++) {
-	unsigned char R, G, B;
-	/* a modifier */
-	// R = img.comps[0].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];
-	R = img.comps[0].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
-	// G = img.comps[1].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];
-	G = img.comps[1].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
-	// B = img.comps[2].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];
-	B = img.comps[2].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
-	fprintf(fdest, "%c%c%c", B, G, R);
-	
-	if ((i + 1) % wr == 0) {
-	  for (pad = (3 * wr) % 4 ? 4 - (3 * wr) % 4 : 0; pad > 0; pad--)	/* ADD */
-	    fprintf(fdest, "%c", 0);
-	}
-      }
-      fclose(fdest);
-      free(img.comps[1].data);
-      free(img.comps[2].data);
-    } else {			/* Gray-scale */
-      
-				/* -->> -->> -->> -->>
-				
-				 8 bits non code (Gray scale)
-				 
-	<<-- <<-- <<-- <<-- */
-      fdest = fopen(outfile, "wb");
-      // w = int_ceildiv(img.x1 - img.x0, img.comps[0].dx);
-      // wr = int_ceildiv(int_ceildivpow2(img.x1 - img.x0,img.factor), img.comps[0].dx);
-      w = img.comps[0].w;
-      wr = int_ceildivpow2(img.comps[0].w, img.comps[0].factor);
-      
-      // h = int_ceildiv(img.y1 - img.y0, img.comps[0].dy);
-      // hr = int_ceildiv(int_ceildivpow2(img.y1 - img.y0,img.factor), img.comps[0].dy);
-      h = img.comps[0].h;
-      hr = int_ceildivpow2(img.comps[0].h, img.comps[0].factor);
-      
-      fprintf(fdest, "BM");
-      
-      /* FILE HEADER */
-      /* ------------- */
-      fprintf(fdest, "%c%c%c%c",
-	(unsigned char) (hr * wr + 54 + 1024 +
-	hr * (wr % 2)) & 0xff,
-	(unsigned char) ((hr * wr + 54 + 1024 + hr * (wr % 2))
-	>> 8) & 0xff,
-	(unsigned char) ((hr * wr + 54 + 1024 + hr * (wr % 2))
-	>> 16) & 0xff,
-	(unsigned char) ((hr * wr + 54 + 1024 + wr * (wr % 2))
-	>> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
-	((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (54 + 1024) & 0xff,
-	((54 + 1024) >> 8) & 0xff, ((54 + 1024) >> 16) & 0xff,
-	((54 + 1024) >> 24) & 0xff);
+
+    case JPT_CFMT:
+    {
+      /* JPEG 2000, JPIP */
+
+      /* get a decoder handle */
+      dinfo = opj_create_decompress(CODEC_JPT);
       
-      /* INFO HEADER */
-      /* ------------- */
-      fprintf(fdest, "%c%c%c%c", (40) & 0xff, ((40) >> 8) & 0xff,
-	((40) >> 16) & 0xff, ((40) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (unsigned char) ((wr) & 0xff),
-	(unsigned char) ((wr) >> 8) & 0xff,
-	(unsigned char) ((wr) >> 16) & 0xff,
-	(unsigned char) ((wr) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (unsigned char) ((hr) & 0xff),
-	(unsigned char) ((hr) >> 8) & 0xff,
-	(unsigned char) ((hr) >> 16) & 0xff,
-	(unsigned char) ((hr) >> 24) & 0xff);
-      fprintf(fdest, "%c%c", (1) & 0xff, ((1) >> 8) & 0xff);
-      fprintf(fdest, "%c%c", (8) & 0xff, ((8) >> 8) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
-	((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c",
-	(unsigned char) (hr * wr + hr * (wr % 2)) & 0xff,
-	(unsigned char) ((hr * wr + hr * (wr % 2)) >> 8) &
-	0xff,
-	(unsigned char) ((hr * wr + hr * (wr % 2)) >> 16) &
-	0xff,
-	(unsigned char) ((hr * wr + hr * (wr % 2)) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,
-	((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,
-	((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (256) & 0xff, ((256) >> 8) & 0xff,
-	((256) >> 16) & 0xff, ((256) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (256) & 0xff, ((256) >> 8) & 0xff,
-	((256) >> 16) & 0xff, ((256) >> 24) & 0xff);
-    }
-    
-    for (i = 0; i < 256; i++) {
-      fprintf(fdest, "%c%c%c%c", i, i, i, 0);
-    }
-    
-    for (i = 0; i < wr * hr; i++) {
-      /* a modifier !! */
-      // fprintf(fdest, "%c", img.comps[0].data[w * h - ((i) / (w) + 1) * w + (i) % (w)]);
-      fprintf(fdest, "%c",
-	img.comps[0].data[w * hr - ((i) / (wr) + 1) * w +
-	(i) % (wr)]);
-	/*if (((i + 1) % w == 0 && w % 2))
-      fprintf(fdest, "%c", 0); */
-      if ((i + 1) % wr == 0) {
-	for (pad = wr % 4 ? 4 - wr % 4 : 0; pad > 0; pad--)	/* ADD */
-	  fprintf(fdest, "%c", 0);
-      }
+      /* catch events using our callbacks and give a local context */
+      opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);     
+
+      /* setup the decoder decoding parameters using user parameters */
+      opj_setup_decoder(dinfo, &parameters);
+
+      /* open a byte stream */
+      cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length);
+
+      /* decode the stream and fill the image structure */
+      image = opj_decode(dinfo, cio);
+      if(!image) {
+        fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");        
+        opj_destroy_decompress(dinfo);
+        opj_cio_close(cio);
+        return 1;
+      } 
+
+      /* close the byte stream */
+      opj_cio_close(cio);
     }
-    fclose(fdest);
-    free(img.comps[0].data);
     break;
 
-  default:
-    fprintf(stderr,
-      "ERROR -> j2k_to_image : Unknown output image format\n");
-    return 1;
-    break;
+    default:
+      fprintf(stderr, "ERROR -> j2k_to_image : Unknown input image format\n");
+      return 1;
+      break;
   }
   
-  
-  // Free remaining structures
-  //--------------------------
-  j2k_dec_release();
-  
-  
-  
-  // Check memory leaks if debug mode
-  //---------------------------------
-  
-#ifdef _DEBUG
-  
-  _CrtDumpMemoryLeaks();
-  
-#endif
-  
+  /* free the memory containing the code-stream */
+  free(src);
+  src = NULL;
+
+  /* create output image */
+  /* ------------------- */
+
+  switch (parameters.cod_format) {
+    case PXM_DFMT:      /* PNM PGM PPM */
+      imagetopnm(image, parameters.outfile);
+      break;
+            
+    case PGX_DFMT:      /* PGX */
+      imagetopgx(image, parameters.outfile);
+      break;
+    
+    case BMP_DFMT:      /* BMP */
+      imagetobmp(image, parameters.outfile);
+      break;
+  }
+
+  /* free remaining structures */
+  if(dinfo) {
+    opj_destroy_decompress(dinfo);
+  }
+
+  /* free image data structure */
+  opj_image_destroy(image);
+   
   return 0;
 }
+
diff --git a/codec/j2k_to_image.dsp b/codec/j2k_to_image.dsp
index 6a633191..826e2890 100644
--- a/codec/j2k_to_image.dsp
+++ b/codec/j2k_to_image.dsp
@@ -39,40 +39,41 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "Release"
 # PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../libopenjpeg" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "DONT_HAVE_GETOPT" /YX /FD /c
-# ADD BASE RSC /l 0x80c /d "NDEBUG"
-# ADD RSC /l 0x80c /d "NDEBUG"
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../libopenjpeg" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x40c /d "NDEBUG"
+# ADD RSC /l 0x40c /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
 
 !ELSEIF  "$(CFG)" == "j2k_to_image - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "j2k_to_image___Win32_Debug"
-# PROP BASE Intermediate_Dir "j2k_to_image___Win32_Debug"
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "j2k_to_image___Win32_Debug"
-# PROP Intermediate_Dir "j2k_to_image___Win32_Debug"
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../libopenjpeg" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "DONT_HAVE_GETOPT" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x80c /d "_DEBUG"
-# ADD RSC /l 0x80c /d "_DEBUG"
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../libopenjpeg" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x40c /d "_DEBUG"
+# ADD RSC /l 0x40c /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 
 !ENDIF 
 
@@ -80,24 +81,13 @@ LINK32=link.exe
 
 # Name "j2k_to_image - Win32 Release"
 # Name "j2k_to_image - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\libopenjpeg\bio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\cio.c
-# End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\dwt.c
+SOURCE=.\convert.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\fix.c
+SOURCE=.\convert.h
 # End Source File
 # Begin Source File
 
@@ -105,136 +95,11 @@ SOURCE=.\compat\getopt.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\int.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\j2k.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\j2k_to_image.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\jp2.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\jpt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\mct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\mqc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\pi.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\raw.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\t1.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\t2.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\tcd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\tgt.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\libopenjpeg\bio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\cio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\dwt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\fix.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\compat\getopt.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\int.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\j2k.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\jp2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\jpt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\mct.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\mqc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\openjpeg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\pi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\raw.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\t1.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\t2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\tcd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\tgt.h
+SOURCE=.\j2k_to_image.c
 # End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
 # End Target
 # End Project