Reformatage : indent -kr -i2 -ci2 $(find . -name '*.c') $(find . -name '*.h')

4 files changed, 1946 insertions, 1998 deletions

diff --git a/codec/compat/getopt.c b/codec/compat/getopt.c
index f2854ff3..d0082c51 100644
--- a/codec/compat/getopt.c
+++ b/codec/compat/getopt.c
@@ -61,57 +61,56 @@ 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 */
-	optreset = 0;
-	if (optind >= nargc || *(place = nargv[optind]) != '-') {
-	    place = EMSG;
-	    return (-1);
-	}
-	if (place[1] && *++place == '-') {	/* found "--" */
-	    ++optind;
-	    place = EMSG;
-	    return (-1);
-	}
-    }				/* option letter okay? */
-    if ((optopt = (int) *place++) == (int) ':' ||
-	!(oli = strchr(ostr, optopt))) {
-	/*
-	 * if the user didn't specify '-' as an option,
-	 * assume it means -1.
-	 */
-	if (optopt == (int) '-')
-	    return (-1);
-	if (!*place)
-	    ++optind;
-	if (opterr && *ostr != ':')
-	    (void) fprintf(stderr,
-			   "%s: illegal option -- %c\n", __progname,
-			   optopt);
-	return (BADCH);
+  if (optreset || !*place) {	/* update scanning pointer */
+    optreset = 0;
+    if (optind >= nargc || *(place = nargv[optind]) != '-') {
+      place = EMSG;
+      return (-1);
     }
-    if (*++oli != ':') {	/* don't need argument */
-	optarg = NULL;
-	if (!*place)
-	    ++optind;
-    } else {			/* need an argument */
-	if (*place)		/* no white space */
-	    optarg = place;
-	else if (nargc <= ++optind) {	/* no arg */
-	    place = EMSG;
-	    if (*ostr == ':')
-		return (BADARG);
-	    if (opterr)
-		(void) fprintf(stderr,
-			       "%s: option requires an argument -- %c\n",
-			       __progname, optopt);
-	    return (BADCH);
-	} else			/* white space */
-	    optarg = nargv[optind];
-	place = EMSG;
-	++optind;
+    if (place[1] && *++place == '-') {	/* found "--" */
+      ++optind;
+      place = EMSG;
+      return (-1);
     }
-    return (optopt);		/* dump back option letter */
+  }				/* option letter okay? */
+  if ((optopt = (int) *place++) == (int) ':' ||
+      !(oli = strchr(ostr, optopt))) {
+    /*
+     * if the user didn't specify '-' as an option,
+     * assume it means -1.
+     */
+    if (optopt == (int) '-')
+      return (-1);
+    if (!*place)
+      ++optind;
+    if (opterr && *ostr != ':')
+      (void) fprintf(stderr,
+		     "%s: illegal option -- %c\n", __progname, optopt);
+    return (BADCH);
+  }
+  if (*++oli != ':') {		/* don't need argument */
+    optarg = NULL;
+    if (!*place)
+      ++optind;
+  } else {			/* need an argument */
+    if (*place)			/* no white space */
+      optarg = place;
+    else if (nargc <= ++optind) {	/* no arg */
+      place = EMSG;
+      if (*ostr == ':')
+	return (BADARG);
+      if (opterr)
+	(void) fprintf(stderr,
+		       "%s: option requires an argument -- %c\n",
+		       __progname, optopt);
+      return (BADCH);
+    } else			/* white space */
+      optarg = nargv[optind];
+    place = EMSG;
+    ++optind;
+  }
+  return (optopt);		/* dump back option letter */
 }
diff --git a/codec/convert.c b/codec/convert.c
index 575eec11..864cbd47 100644
--- a/codec/convert.c
+++ b/codec/convert.c
@@ -45,482 +45,465 @@ typedef unsigned short int UINT2;
 typedef unsigned long int UINT4;
 
 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                  */
+  UINT2 bfType;			/* 'BM' for Bitmap (19776) */
+  UINT4 bfSize;			/* Size of the file        */
+  UINT2 bfReserved1;		/* Reserved : 0            */
+  UINT2 bfReserved2;		/* Reserved : 0            */
+  UINT4 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) */
+  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) */
 } BITMAPINFOHEADER_t;
 
 int bmptoimage(char *filename, j2k_image_t * img, int subsampling_dx,
 	       int subsampling_dy, int Dim[2])
 {
-    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;
-    int i, w, h, PAD, type = 0;
-    int gray_scale = 1, not_end_file = 1, line = 0, col = 0;
-    unsigned char v, v2;
-    UINT4 W, H;
-
-    IN = fopen(filename, "rb");
-    if (!IN) {
+  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;
+  int i, w, h, PAD, type = 0;
+  int gray_scale = 1, not_end_file = 1, line = 0, col = 0;
+  unsigned char v, v2;
+  UINT4 W, H;
+
+  IN = fopen(filename, "rb");
+  if (!IN) {
+    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) {
+    printf("Error, not a BMP file!\n");
+    return 0;
+  } else {
+    /* FILE HEADER */
+    /* ------------- */
+    File_h.bfSize = getc(IN);
+    File_h.bfSize = (getc(IN) << 8) + File_h.bfSize;
+    File_h.bfSize = (getc(IN) << 16) + File_h.bfSize;
+    File_h.bfSize = (getc(IN) << 24) + File_h.bfSize;
+
+    File_h.bfReserved1 = getc(IN);
+    File_h.bfReserved1 = (getc(IN) << 8) + File_h.bfReserved1;
+
+    File_h.bfReserved2 = getc(IN);
+    File_h.bfReserved2 = (getc(IN) << 8) + File_h.bfReserved2;
+
+    File_h.bfOffBits = getc(IN);
+    File_h.bfOffBits = (getc(IN) << 8) + File_h.bfOffBits;
+    File_h.bfOffBits = (getc(IN) << 16) + File_h.bfOffBits;
+    File_h.bfOffBits = (getc(IN) << 24) + File_h.bfOffBits;
+
+    /* INFO HEADER */
+    /* ------------- */
+
+    Info_h.biSize = getc(IN);
+    Info_h.biSize = (getc(IN) << 8) + Info_h.biSize;
+    Info_h.biSize = (getc(IN) << 16) + Info_h.biSize;
+    Info_h.biSize = (getc(IN) << 24) + Info_h.biSize;
+
+    Info_h.biWidth = getc(IN);
+    Info_h.biWidth = (getc(IN) << 8) + Info_h.biWidth;
+    Info_h.biWidth = (getc(IN) << 16) + Info_h.biWidth;
+    Info_h.biWidth = (getc(IN) << 24) + Info_h.biWidth;
+    w = Info_h.biWidth;
+
+    Info_h.biHeight = getc(IN);
+    Info_h.biHeight = (getc(IN) << 8) + Info_h.biHeight;
+    Info_h.biHeight = (getc(IN) << 16) + Info_h.biHeight;
+    Info_h.biHeight = (getc(IN) << 24) + Info_h.biHeight;
+    h = Info_h.biHeight;
+
+    Info_h.biPlanes = getc(IN);
+    Info_h.biPlanes = (getc(IN) << 8) + Info_h.biPlanes;
+
+    Info_h.biBitCount = getc(IN);
+    Info_h.biBitCount = (getc(IN) << 8) + Info_h.biBitCount;
+
+    Info_h.biCompression = getc(IN);
+    Info_h.biCompression = (getc(IN) << 8) + Info_h.biCompression;
+    Info_h.biCompression = (getc(IN) << 16) + Info_h.biCompression;
+    Info_h.biCompression = (getc(IN) << 24) + Info_h.biCompression;
+
+    Info_h.biSizeImage = getc(IN);
+    Info_h.biSizeImage = (getc(IN) << 8) + Info_h.biSizeImage;
+    Info_h.biSizeImage = (getc(IN) << 16) + Info_h.biSizeImage;
+    Info_h.biSizeImage = (getc(IN) << 24) + Info_h.biSizeImage;
+
+    Info_h.biXpelsPerMeter = getc(IN);
+    Info_h.biXpelsPerMeter = (getc(IN) << 8) + Info_h.biXpelsPerMeter;
+    Info_h.biXpelsPerMeter = (getc(IN) << 16) + Info_h.biXpelsPerMeter;
+    Info_h.biXpelsPerMeter = (getc(IN) << 24) + Info_h.biXpelsPerMeter;
+
+    Info_h.biYpelsPerMeter = getc(IN);
+    Info_h.biYpelsPerMeter = (getc(IN) << 8) + Info_h.biYpelsPerMeter;
+    Info_h.biYpelsPerMeter = (getc(IN) << 16) + Info_h.biYpelsPerMeter;
+    Info_h.biYpelsPerMeter = (getc(IN) << 24) + Info_h.biYpelsPerMeter;
+
+    Info_h.biClrUsed = getc(IN);
+    Info_h.biClrUsed = (getc(IN) << 8) + Info_h.biClrUsed;
+    Info_h.biClrUsed = (getc(IN) << 16) + Info_h.biClrUsed;
+    Info_h.biClrUsed = (getc(IN) << 24) + Info_h.biClrUsed;
+
+    Info_h.biClrImportant = getc(IN);
+    Info_h.biClrImportant = (getc(IN) << 8) + Info_h.biClrImportant;
+    Info_h.biClrImportant = (getc(IN) << 16) + Info_h.biClrImportant;
+    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->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 %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) {
-	printf("Error, not a BMP file!\n");
-	return 0;
-    } else {
-	/* FILE HEADER */
-	/* ------------- */
-	File_h.bfSize = getc(IN);
-	File_h.bfSize = (getc(IN) << 8) + File_h.bfSize;
-	File_h.bfSize = (getc(IN) << 16) + File_h.bfSize;
-	File_h.bfSize = (getc(IN) << 24) + File_h.bfSize;
-
-	File_h.bfReserved1 = getc(IN);
-	File_h.bfReserved1 = (getc(IN) << 8) + File_h.bfReserved1;
-
-	File_h.bfReserved2 = getc(IN);
-	File_h.bfReserved2 = (getc(IN) << 8) + File_h.bfReserved2;
-
-	File_h.bfOffBits = getc(IN);
-	File_h.bfOffBits = (getc(IN) << 8) + File_h.bfOffBits;
-	File_h.bfOffBits = (getc(IN) << 16) + File_h.bfOffBits;
-	File_h.bfOffBits = (getc(IN) << 24) + File_h.bfOffBits;
-
-	/* INFO HEADER */
-	/* ------------- */
-
-	Info_h.biSize = getc(IN);
-	Info_h.biSize = (getc(IN) << 8) + Info_h.biSize;
-	Info_h.biSize = (getc(IN) << 16) + Info_h.biSize;
-	Info_h.biSize = (getc(IN) << 24) + Info_h.biSize;
-
-	Info_h.biWidth = getc(IN);
-	Info_h.biWidth = (getc(IN) << 8) + Info_h.biWidth;
-	Info_h.biWidth = (getc(IN) << 16) + Info_h.biWidth;
-	Info_h.biWidth = (getc(IN) << 24) + Info_h.biWidth;
-	w = Info_h.biWidth;
-
-	Info_h.biHeight = getc(IN);
-	Info_h.biHeight = (getc(IN) << 8) + Info_h.biHeight;
-	Info_h.biHeight = (getc(IN) << 16) + Info_h.biHeight;
-	Info_h.biHeight = (getc(IN) << 24) + Info_h.biHeight;
-	h = Info_h.biHeight;
-
-	Info_h.biPlanes = getc(IN);
-	Info_h.biPlanes = (getc(IN) << 8) + Info_h.biPlanes;
-
-	Info_h.biBitCount = getc(IN);
-	Info_h.biBitCount = (getc(IN) << 8) + Info_h.biBitCount;
-
-	Info_h.biCompression = getc(IN);
-	Info_h.biCompression = (getc(IN) << 8) + Info_h.biCompression;
-	Info_h.biCompression = (getc(IN) << 16) + Info_h.biCompression;
-	Info_h.biCompression = (getc(IN) << 24) + Info_h.biCompression;
-
-	Info_h.biSizeImage = getc(IN);
-	Info_h.biSizeImage = (getc(IN) << 8) + Info_h.biSizeImage;
-	Info_h.biSizeImage = (getc(IN) << 16) + Info_h.biSizeImage;
-	Info_h.biSizeImage = (getc(IN) << 24) + Info_h.biSizeImage;
-
-	Info_h.biXpelsPerMeter = getc(IN);
-	Info_h.biXpelsPerMeter = (getc(IN) << 8) + Info_h.biXpelsPerMeter;
-	Info_h.biXpelsPerMeter = (getc(IN) << 16) + Info_h.biXpelsPerMeter;
-	Info_h.biXpelsPerMeter = (getc(IN) << 24) + Info_h.biXpelsPerMeter;
-
-	Info_h.biYpelsPerMeter = getc(IN);
-	Info_h.biYpelsPerMeter = (getc(IN) << 8) + Info_h.biYpelsPerMeter;
-	Info_h.biYpelsPerMeter = (getc(IN) << 16) + Info_h.biYpelsPerMeter;
-	Info_h.biYpelsPerMeter = (getc(IN) << 24) + Info_h.biYpelsPerMeter;
-
-	Info_h.biClrUsed = getc(IN);
-	Info_h.biClrUsed = (getc(IN) << 8) + Info_h.biClrUsed;
-	Info_h.biClrUsed = (getc(IN) << 16) + Info_h.biClrUsed;
-	Info_h.biClrUsed = (getc(IN) << 24) + Info_h.biClrUsed;
-
-	Info_h.biClrImportant = getc(IN);
-	Info_h.biClrImportant = (getc(IN) << 8) + Info_h.biClrImportant;
-	Info_h.biClrImportant = (getc(IN) << 16) + Info_h.biClrImportant;
-	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->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");
-	    }
-
-	    /* 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));
-
-	    fread(RGB, sizeof(unsigned char), (3 * W + PAD) * H, IN);
-
-	    for (i = 0; i < (3 * W + PAD) * H; i++) {
-		unsigned char elmt;
-		int Wp = 3 * W + PAD;
-
-		elmt = RGB[(H - (i / Wp + 1)) * Wp + i % Wp];
-		if ((i % 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;
-		    }
-		}
-	    }
-
-	    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;
-
-	    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 (i = 0; i < Info_h.biClrUsed; i++) {
-		table_B[i] = getc(IN);
-		table_G[i] = getc(IN);
-		table_R[i] = getc(IN);
-		getc(IN);
-		if (table_R[i] != table_G[i] && table_R[i] != table_B[i]
-		    && table_G[i] != table_B[i])
-		    gray_scale = 0;
-	    }
+		"\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");
+      }
+
+      /* 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));
+
+      fread(RGB, sizeof(unsigned char), (3 * W + PAD) * H, IN);
+
+      for (i = 0; i < (3 * W + PAD) * H; i++) {
+	unsigned char elmt;
+	int Wp = 3 * W + PAD;
+
+	elmt = RGB[(H - (i / Wp + 1)) * Wp + i % Wp];
+	if ((i % 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;
+	  }
+	}
+      }
+
+      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;
+
+      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 (i = 0; i < Info_h.biClrUsed; i++) {
+	table_B[i] = getc(IN);
+	table_G[i] = getc(IN);
+	table_R[i] = getc(IN);
+	getc(IN);
+	if (table_R[i] != table_G[i] && table_R[i] != table_B[i]
+	    && table_G[i] != table_B[i])
+	  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++;
+
+      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 (i = 0; i < W * H; i++) {
+	  if ((i % W < W - 1 && Info_h.biWidth % 2)
+	      || !(Info_h.biWidth % 2))
+	    fprintf(Compo0, "%c",
+		    table_R[RGB[W * H - ((i) / (W) + 1) * W + (i) % (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;
+	}
 
-	    /* 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++;
-
-	    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 (i = 0; i < W * H; i++) {
-		    if ((i % W < W - 1 && Info_h.biWidth % 2)
-			|| !(Info_h.biWidth % 2))
-			fprintf(Compo0, "%c",
-				table_R[RGB
-					[W * H - ((i) / (W) + 1) * W +
-					 (i) % (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 (i = 0; i < W * H; i++) {
-		    if ((i % W < W - 1 && Info_h.biWidth % 2)
-			|| !(Info_h.biWidth % 2)) {
-			fprintf(Compo0, "%c",
-				table_R[RGB
-					[W * H - ((i) / (W) + 1) * W +
-					 (i) % (W)]]);
-			fprintf(Compo1, "%c",
-				table_G[RGB
-					[W * H - ((i) / (W) + 1) * W +
-					 (i) % (W)]]);
-			fprintf(Compo2, "%c",
-				table_B[RGB
-					[W * H - ((i) / (W) + 1) * W +
-					 (i) % (W)]]);
-		    }
-
-		}
-		fclose(Compo0);
-		fclose(Compo1);
-		fclose(Compo2);
-	    }
-	    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;
-
-	    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 (i = 0; i < Info_h.biClrUsed; i++) {
-		table_B[i] = getc(IN);
-		table_G[i] = getc(IN);
-		table_R[i] = getc(IN);
-		getc(IN);
-		if (table_R[i] != table_G[i] && table_R[i] != table_B[i]
-		    && table_G[i] != table_B[i])
-		    gray_scale = 0;
-	    }
+	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");
+	}
 
-	    /* 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");
-		}
-	    }
+	for (i = 0; i < W * H; i++) {
+	  if ((i % W < W - 1 && Info_h.biWidth % 2)
+	      || !(Info_h.biWidth % 2)) {
+	    fprintf(Compo0, "%c",
+		    table_R[RGB[W * H - ((i) / (W) + 1) * W + (i) % (W)]]);
+	    fprintf(Compo1, "%c",
+		    table_G[RGB[W * H - ((i) / (W) + 1) * W + (i) % (W)]]);
+	    fprintf(Compo2, "%c",
+		    table_B[RGB[W * H - ((i) / (W) + 1) * W + (i) % (W)]]);
+	  }
 
-	    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:
-			printf("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);
-		    }
-		}
-	    }
-	    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);
-	    } 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);
+	}
+	fclose(Compo0);
+	fclose(Compo1);
+	fclose(Compo2);
+      }
+      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;
+
+      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 (i = 0; i < Info_h.biClrUsed; i++) {
+	table_B[i] = getc(IN);
+	table_G[i] = getc(IN);
+	table_R[i] = getc(IN);
+	getc(IN);
+	if (table_R[i] != table_G[i] && table_R[i] != table_B[i]
+	    && table_G[i] != table_B[i])
+	  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");
+	}
+      }
+
+      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:
+	    printf("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++;
 	    }
-	    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);
-
-	fclose(IN);
-	return 1;
-    }
+	    if (v % 2)
+	      v2 = getc(IN);
+	  }
+	}
+      }
+      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);
+      } 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);
+      }
+      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);
+
+    fclose(IN);
+    return 1;
+  }
 }
 
 	/* -->> -->> -->> -->>
@@ -532,149 +515,147 @@ int bmptoimage(char *filename, j2k_image_t * img, int subsampling_dx,
 
 unsigned char readuchar(FILE * f)
 {
-    unsigned char c1;
-    fread(&c1, 1, 1, f);
-    return c1;
+  unsigned char c1;
+  fread(&c1, 1, 1, f);
+  return c1;
 }
 
 unsigned short readushort(FILE * f, int bigendian)
 {
-    unsigned char c1, c2;
-    fread(&c1, 1, 1, f);
-    fread(&c2, 1, 1, f);
-    if (bigendian)
-	return (c1 << 8) + c2;
-    else
-	return (c2 << 8) + c1;
+  unsigned char c1, c2;
+  fread(&c1, 1, 1, f);
+  fread(&c2, 1, 1, f);
+  if (bigendian)
+    return (c1 << 8) + c2;
+  else
+    return (c2 << 8) + c1;
 }
 
 unsigned int readuint(FILE * f, int bigendian)
 {
-    unsigned char c1, c2, c3, c4;
-    fread(&c1, 1, 1, f);
-    fread(&c2, 1, 1, f);
-    fread(&c3, 1, 1, f);
-    fread(&c4, 1, 1, f);
-    if (bigendian)
-	return (c1 << 24) + (c2 << 16) + (c3 << 8) + c4;
-    else
-	return (c4 << 24) + (c3 << 16) + (c2 << 8) + c1;
+  unsigned char c1, c2, c3, c4;
+  fread(&c1, 1, 1, f);
+  fread(&c2, 1, 1, f);
+  fread(&c3, 1, 1, f);
+  fread(&c4, 1, 1, f);
+  if (bigendian)
+    return (c1 << 24) + (c2 << 16) + (c3 << 8) + c4;
+  else
+    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;
-    int w, h, prec;
-    int i, compno, bandno;
-    char str[256], endian[16];
-    char sign;
-    int bigendian;
-    j2k_comp_t *comp;
-
-    img->numcomps = 1;
-    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;
+  FILE *f;
+  int w, h, prec;
+  int i, compno, bandno;
+  char str[256], endian[16];
+  char sign;
+  int bigendian;
+  j2k_comp_t *comp;
+
+  img->numcomps = 1;
+  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;
+    }
+    if (fscanf(f, "PG %s %c %d %d %d", endian, &sign, &prec, &w, &h) == 5) {
+      fgetc(f);
+      if (!strcmp(endian, "ML"))
+	bigendian = 1;
+      else
+	bigendian = 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;
+      } else {
+	if (w != img->x1 || h != img->y1)
+	  return 0;
+      }
+
+      if (sign == '-') {
+	comp->sgnd = 1;
+      } else {
+	comp->sgnd = 0;
+      }
+      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);
+      }
+      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 (fscanf(f, "PG %s %c %d %d %d", endian, &sign, &prec, &w, &h) ==
-	    5) {
-	    fgetc(f);
-	    if (!strcmp(endian, "ML"))
-		bigendian = 1;
-	    else
-		bigendian = 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;
-	    } else {
-		if (w != img->x1 || h != img->y1)
-		    return 0;
-	    }
-
-	    if (sign == '-') {
-		comp->sgnd = 1;
-	    } else {
-		comp->sgnd = 0;
-	    }
-	    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);
-	    }
-	    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);
-		    }
-		}
-		if (v > max)
-		    max = v;
-		fprintf(src, "%d ", 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 {
-	    return 0;
+	  if (!comp->sgnd) {
+	    v = readuint(f, bigendian);
+	  } else {
+	    v = (int) readuint(f, bigendian);
+	  }
 	}
-	fclose(f);
-	fclose(src);
-	comp->bpp = int_floorlog2(max) + 1;
+	if (v > max)
+	  max = v;
+	fprintf(src, "%d ", v);
+      }
+    } else {
+      return 0;
     }
-    return 1;
+    fclose(f);
+    fclose(src);
+    comp->bpp = int_floorlog2(max) + 1;
+  }
+  return 1;
 }
 
 /* -->> -->> -->> -->>
@@ -686,239 +667,237 @@ int pgxtoimage(char *filename, j2k_image_t * img, int tdy,
 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;
-    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);
-	return 0;
+  FILE *f;
+  FILE *Compo0, *Compo1, *Compo2;
+  int w, h;
+  int i;
+  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);
+    return 0;
+  }
+
+  if (fgetc(f) != 'P')
+    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);
     }
 
-    if (fgetc(f) != 'P')
-	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;
 
-	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->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);
-	}
-	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);
-	}
+    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");
+    }
+    for (i = 0; i < w * h; i++) {
+      unsigned int l;
+      fscanf(f, "%d", &l);
+      fprintf(Compo0, "%c", l);
+    }
+    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);
+    }
 
-	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;
+    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->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);
-	}
+    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");
+    }
+    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);
+    }
 
-	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->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");
-	}
+    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->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");
-	}
+    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");
-	}
+    Compo2 = fopen("Compo2", "wb");
+    if (!Compo2) {
+      fprintf(stderr,
+	      "\033[0;33mFailed to open Compo2 for writing !\033[0;39m\n");
+    }
 
-	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);
-	}
-	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);
-	}
+    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);
+    }
+    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);
+    }
 
-	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->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");
-	}
+    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->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");
-	}
+    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");
-	}
+    Compo2 = fopen("Compo2", "wb");
+    if (!Compo2) {
+      fprintf(stderr,
+	      "\033[0;33mFailed to open Compo2 for writing !\033[0;39m\n");
+    }
 
-	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);
-	}
-	fclose(Compo0);
-	fclose(Compo1);
-	fclose(Compo2);
-    } else {
-	return 0;
+    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);
     }
-    fclose(f);
-    return 1;
+    fclose(Compo0);
+    fclose(Compo1);
+    fclose(Compo2);
+  } else {
+    return 0;
+  }
+  fclose(f);
+  return 1;
 }
diff --git a/codec/image_to_j2k.c b/codec/image_to_j2k.c
index 0f595806..b2973f6d 100644
--- a/codec/image_to_j2k.c
+++ b/codec/image_to_j2k.c
@@ -40,730 +40,712 @@
 
 void help_display()
 {
-    printf("HELP\n----\n\n");
-    printf
-	("- the option -help displays the readme.txt file on screen\n\n");
-
-
-    printf("List of parameters for the coder JPEG 2000 :\n");
-    printf("\n");
-    printf
-	("- The markers COD and QCD are writed both of two in the main_header and never appear in the tile_header.  The markers in the main header are : SOC SIZ COD QCD COM.\n");
-    printf("\n");
-    printf
-	("- This coder can encode mega image, a test was made on a 24000x24000 pixels color image.  You need enough disk space memory (twice the original) to encode the image. (i.e. for a 1.5 Gb image you need a minimum of 3Gb of disk memory)\n");
-    printf("\n");
-    printf("REMARKS :\n");
-    printf("---------\n");
-    printf("\n");
-    printf
-	("* the value of rate enter in the code line is the compression factor !\n");
-    printf("exemple :\n");
-    printf("\n");
-    printf
-	("-r 20,10,1 means quality 1 : compress 20x, quality 2 : compress 10x and quality 3 : compress 1x = lossless\n");
-    printf("\n");
-    printf("By default :\n");
-    printf("------------\n");
-    printf("\n");
-    printf(" * lossless\n");
-    printf(" * 1 tile\n");
-    printf(" * size of precinct 2^15 x 2^15 (means 1 precinct)\n");
-    printf(" * size of code-block 64 x 64\n");
-    printf(" * Number of resolution : 6\n");
-    printf(" * No SOP marker in the codestream\n");
-    printf(" * No EPH marker in the codestream\n");
-    printf(" * No sub-sampling in x and y direction\n");
-    printf(" * No mode switch activated\n");
-    printf(" * progression order : LRCP\n");
-    printf(" * No index file\n");
-    printf(" * No ROI upshifted\n");
-    printf(" * No offset of the origin of the image\n");
-    printf(" * No offset of the origin of the tiles\n");
-    printf(" * Reversible DWT 5-3\n");
-    printf("\n");
-    printf("Parameters :\n");
-    printf("------------\n");
-    printf("\n");
-    printf
-	("-i             : source file  (-i source.pnm also *.pgm, *.ppm) required\n");
-    printf("\n");
-    printf("-o             : destination file (-o dest.j2k) required\n");
-    printf("\n");
-    printf("-help          : Display the help information optional\n ");
-    printf("\n");
-    printf("-r             : different rates (-r 20,10,5) optional\n ");
-    printf("\n");
-    printf("-n             : Number of resolution (-n 3) optional\n");
-    printf("\n");
-    printf("-b             : size of code block (-b 32,32) optional\n");
-    printf("\n");
-    printf("-c             : size of precinct (-c 128,128) optional\n");
-    printf("\n");
-    printf("-t             : size of tile (-t 512,512) optional\n");
-    printf("\n");
-    printf
-	("-p             : progression order (-p LRCP) [LRCP, RLCP, RPCL, PCRL, CPRL] optional\n");
-    printf("\n");
-    printf
-	("-s             : subsampling factor (-s 2,2) [-s X,Y] optional\n");
-    printf("\n");
-    printf
-	("-SOP           : write SOP marker before each packet optional\n");
-    printf("\n");
-    printf
-	("-EPH           : write EPH marker after each header packet optional\n");
-    printf("\n");
-    printf
-	("-M             : mode switch (-M 3) [1=BYPASS(LAZY) 2=RESET 4=RESTART(TERMALL) 8=VSC 16=ERTERM(SEGTERM) 32=SEGMARK(SEGSYM)] optional\n");
-    printf
-	("                    for several mode switch you have to add the value of each mode you want\n");
-    printf
-	("                    ex : RESTART(4) + RESET(2) + SEGMARK(32) = -M 38\n");
-    printf("\n");
-    printf
-	("-x             : Create an index file *.Idx (-x index_name.Idx) optional\n");
-    printf("\n");
-    printf
-	("-ROI:c=%%d,U=%%d : quantization indices upshifted for component c=%%d [\%%d = 0,1,2]\n");
-    printf
-	("                 with a value of U=%%d [0 <= %%d <= 37] (i.e. -ROI:c=0,U=25) optional\n");
-    printf("\n");
-    printf
-	("-d             : offset of the origin of the image (-d 150,300) optional\n");
-    printf("\n");
-    printf
-	("-T             : offset of the origin of the tiles (-T 100,75) optional\n");
-    printf("\n");
-    printf
-	("-I             : Use the irreversible DWT 9-7 (-I) optional\n");
-    printf("\n");
-    printf("IMPORTANT :\n");
-    printf("-----------\n");
-    printf("\n");
-    printf("* subsampling bigger than 2 can produce error\n");
-    printf("\n");
-    printf("The index file respect the structure below :\n");
-    printf("---------------------------------------------\n");
-    printf("\n");
-    printf("Image_height Image_width\n");
-    printf("progression order\n");
-    printf("Tiles_size_X Tiles_size_Y\n");
-    printf("Components_nb\n");
-    printf("Layers_nb\n");
-    printf("decomposition_levels\n");
-    printf("Precincts_size_X Precincts_size_Y\n");
-    printf("Main_header_end_position\n");
-    printf("Codestream_size\n");
-    printf("Tile0 start_pos end_Theader end_pos\n");
-    printf("Tile1  ''           ''        ''\n");
-    printf("...\n");
-    printf("TileN  ''           ''        ''\n");
-    printf("Tpacket_0 Tile layer res. comp. prec. start_pos end_pos\n");
-    printf("...\n");
-    printf("Tpacket_M  ''    ''   ''   ''    ''       ''       ''\n");
+  printf("HELP\n----\n\n");
+  printf("- the option -help displays the readme.txt file on screen\n\n");
+
+
+  printf("List of parameters for the coder JPEG 2000 :\n");
+  printf("\n");
+  printf
+    ("- The markers COD and QCD are writed both of two in the main_header and never appear in the tile_header.  The markers in the main header are : SOC SIZ COD QCD COM.\n");
+  printf("\n");
+  printf
+    ("- This coder can encode mega image, a test was made on a 24000x24000 pixels color image.  You need enough disk space memory (twice the original) to encode the image. (i.e. for a 1.5 Gb image you need a minimum of 3Gb of disk memory)\n");
+  printf("\n");
+  printf("REMARKS :\n");
+  printf("---------\n");
+  printf("\n");
+  printf
+    ("* the value of rate enter in the code line is the compression factor !\n");
+  printf("exemple :\n");
+  printf("\n");
+  printf
+    ("-r 20,10,1 means quality 1 : compress 20x, quality 2 : compress 10x and quality 3 : compress 1x = lossless\n");
+  printf("\n");
+  printf("By default :\n");
+  printf("------------\n");
+  printf("\n");
+  printf(" * lossless\n");
+  printf(" * 1 tile\n");
+  printf(" * size of precinct 2^15 x 2^15 (means 1 precinct)\n");
+  printf(" * size of code-block 64 x 64\n");
+  printf(" * Number of resolution : 6\n");
+  printf(" * No SOP marker in the codestream\n");
+  printf(" * No EPH marker in the codestream\n");
+  printf(" * No sub-sampling in x and y direction\n");
+  printf(" * No mode switch activated\n");
+  printf(" * progression order : LRCP\n");
+  printf(" * No index file\n");
+  printf(" * No ROI upshifted\n");
+  printf(" * No offset of the origin of the image\n");
+  printf(" * No offset of the origin of the tiles\n");
+  printf(" * Reversible DWT 5-3\n");
+  printf("\n");
+  printf("Parameters :\n");
+  printf("------------\n");
+  printf("\n");
+  printf
+    ("-i             : source file  (-i source.pnm also *.pgm, *.ppm) required\n");
+  printf("\n");
+  printf("-o             : destination file (-o dest.j2k) required\n");
+  printf("\n");
+  printf("-help          : Display the help information optional\n ");
+  printf("\n");
+  printf("-r             : different rates (-r 20,10,5) optional\n ");
+  printf("\n");
+  printf("-n             : Number of resolution (-n 3) optional\n");
+  printf("\n");
+  printf("-b             : size of code block (-b 32,32) optional\n");
+  printf("\n");
+  printf("-c             : size of precinct (-c 128,128) optional\n");
+  printf("\n");
+  printf("-t             : size of tile (-t 512,512) optional\n");
+  printf("\n");
+  printf
+    ("-p             : progression order (-p LRCP) [LRCP, RLCP, RPCL, PCRL, CPRL] optional\n");
+  printf("\n");
+  printf
+    ("-s             : subsampling factor (-s 2,2) [-s X,Y] optional\n");
+  printf("\n");
+  printf
+    ("-SOP           : write SOP marker before each packet optional\n");
+  printf("\n");
+  printf
+    ("-EPH           : write EPH marker after each header packet optional\n");
+  printf("\n");
+  printf
+    ("-M             : mode switch (-M 3) [1=BYPASS(LAZY) 2=RESET 4=RESTART(TERMALL) 8=VSC 16=ERTERM(SEGTERM) 32=SEGMARK(SEGSYM)] optional\n");
+  printf
+    ("                    for several mode switch you have to add the value of each mode you want\n");
+  printf
+    ("                    ex : RESTART(4) + RESET(2) + SEGMARK(32) = -M 38\n");
+  printf("\n");
+  printf
+    ("-x             : Create an index file *.Idx (-x index_name.Idx) optional\n");
+  printf("\n");
+  printf
+    ("-ROI:c=%%d,U=%%d : quantization indices upshifted for component c=%%d [\%%d = 0,1,2]\n");
+  printf
+    ("                 with a value of U=%%d [0 <= %%d <= 37] (i.e. -ROI:c=0,U=25) optional\n");
+  printf("\n");
+  printf
+    ("-d             : offset of the origin of the image (-d 150,300) optional\n");
+  printf("\n");
+  printf
+    ("-T             : offset of the origin of the tiles (-T 100,75) optional\n");
+  printf("\n");
+  printf("-I             : Use the irreversible DWT 9-7 (-I) optional\n");
+  printf("\n");
+  printf("IMPORTANT :\n");
+  printf("-----------\n");
+  printf("\n");
+  printf("* subsampling bigger than 2 can produce error\n");
+  printf("\n");
+  printf("The index file respect the structure below :\n");
+  printf("---------------------------------------------\n");
+  printf("\n");
+  printf("Image_height Image_width\n");
+  printf("progression order\n");
+  printf("Tiles_size_X Tiles_size_Y\n");
+  printf("Components_nb\n");
+  printf("Layers_nb\n");
+  printf("decomposition_levels\n");
+  printf("Precincts_size_X Precincts_size_Y\n");
+  printf("Main_header_end_position\n");
+  printf("Codestream_size\n");
+  printf("Tile0 start_pos end_Theader end_pos\n");
+  printf("Tile1  ''           ''        ''\n");
+  printf("...\n");
+  printf("TileN  ''           ''        ''\n");
+  printf("Tpacket_0 Tile layer res. comp. prec. start_pos end_pos\n");
+  printf("...\n");
+  printf("Tpacket_M  ''    ''   ''   ''    ''       ''       ''\n");
 }
 
 int give_progression(char progression[4])
 {
-    if (progression[0] == 'L' && progression[1] == 'R'
+  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 0;
+      return 1;
     } else {
-	if (progression[0] == 'R' && progression[1] == 'L'
-	    && progression[2] == 'C' && progression[3] == 'P') {
-	    return 1;
+      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] == '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;
-		    }
-		}
-	    }
+	  if (progression[0] == 'C' && progression[1] == 'P'
+	      && progression[2] == 'R' && progression[3] == 'L') {
+	    return 4;
+	  } else {
+	    return -1;
+	  }
 	}
+      }
     }
+  }
 }
 
 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}
+  {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;
-    }
-    return l;
+  int l;
+  for (l = 0; a > 1; l++) {
+    a >>= 1;
+  }
+  return l;
 }
 
 void encode_stepsize(int stepsize, int numbps, int *expn, int *mant)
 {
-    int p, n;
-    p = floorlog2(stepsize) - 13;
-    n = 11 - floorlog2(stepsize);
-    *mant = (n < 0 ? stepsize >> -n : stepsize << n) & 0x7ff;
-    *expn = numbps - p;
+  int p, n;
+  p = floorlog2(stepsize) - 13;
+  n = 11 - floorlog2(stepsize);
+  *mant = (n < 0 ? stepsize >> -n : stepsize << n) & 0x7ff;
+  *expn = numbps - p;
 }
 
 void calc_explicit_stepsizes(j2k_tccp_t * tccp, int prec)
 {
-    int numbands, bandno;
-    numbands = 3 * tccp->numresolutions - 2;
-    for (bandno = 0; bandno < numbands; bandno++) {
-	double 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;
-	}
-	encode_stepsize((int) floor(stepsize * 8192.0), prec + gain,
-			&tccp->stepsizes[bandno].expn,
-			&tccp->stepsizes[bandno].mant);
+  int numbands, bandno;
+  numbands = 3 * tccp->numresolutions - 2;
+  for (bandno = 0; bandno < numbands; bandno++) {
+    double 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;
     }
+    encode_stepsize((int) floor(stepsize * 8192.0), prec + gain,
+		    &tccp->stepsizes[bandno].expn,
+		    &tccp->stepsizes[bandno].mant);
+  }
 }
 
 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, 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;
-
-    /* default value */
-    /* ------------- */
-    NumResolution = 6;
-    CSty = 0;
-    cblockw_init = 64;
-    cblockh_init = 64;
-    cp.tw = 1;
-    cp.th = 1;
-    img.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 = NULL;
-    cp.disto_alloc = 0;
-    cp.fixed_alloc = 0;
-    /* 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;
-
-    while (1) {
-	int c =
-	    getopt(argc, 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, 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;
+
+  /* default value */
+  /* ------------- */
+  NumResolution = 6;
+  CSty = 0;
+  cblockw_init = 64;
+  cblockh_init = 64;
+  cp.tw = 1;
+  cp.th = 1;
+  img.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 = NULL;
+  cp.disto_alloc = 0;
+  cp.fixed_alloc = 0;
+  /* 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;
+
+  while (1) {
+    int c = getopt(argc, argv,
 		   "i:o:r:q: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.image_type = 0;
-		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.image_type = 1;
-		break;
-	    }
-
-	    if ((S1 == 'b' && S2 == 'm' && S3 == 'p')
-		|| (S1 == 'B' && S2 == 'M' && S3 == 'P')) {
-		cp.image_type = 2;
-		break;
-	    }
-	    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;
-	    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++;
-	    }
-	    cp.disto_alloc = 1;
-	    cp.matrice = NULL;
-	    break;
-	    /* ----------------------------------------------------- */
-	case 'q':		/* rates fixed */
-	    s = optarg;
-	    sscanf(s, "%d", &tcp_init->numlayers);
+    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.image_type = 0;
+	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.image_type = 1;
+	break;
+      }
+
+      if ((S1 == 'b' && S2 == 'm' && S3 == 'p')
+	  || (S1 == 'B' && S2 == 'M' && S3 == 'P')) {
+	cp.image_type = 2;
+	break;
+      }
+      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;
+      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++;
+      }
+      cp.disto_alloc = 1;
+      cp.matrice = NULL;
+      break;
+      /* ----------------------------------------------------- */
+    case 'q':			/* rates fixed */
+      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 (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++;
-	    }
-	    cp.fixed_alloc = 1;
-	    break;
-	    /* ----------------------------------------------------- */
-	case 't':		/* tiles */
-	    sscanf(optarg, "%d,%d", &cp.tdx, &cp.tdy);
-	    Tile_arg = 1;
-	    break;
-	    /* ----------------------------------------------------- */
-	case 'n':		/* resolution */
-	    sscanf(optarg, "%d", &NumResolution);
-	    break;
-	    /* ----------------------------------------------------- */
-	case 'c':		/* precinct dimension */
-	    sscanf(optarg, "%d,%d", &prcw_init, &prch_init);
-	    CSty |= 0x01;
-	    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;
-	    }
-	    break;
-	    /* ----------------------------------------------------- */
-	case 'x':		/* creation of index file */
-	    index = optarg;
-	    img.index_on = 1;
-	    break;
-	    /* ----------------------------------------------------- */
-	case 'p':		/* progression order */
-	    s = optarg;
-	    for (i = 0; i < 4; i++) {
-		progression[i] = *s;
-		s++;
-	    }
-	    Prog_order = give_progression(progression);
-
-	    if (Prog_order == -1) {
-		fprintf(stderr,
-			"Unrecognized progression order [LRCP, RLCP, RPCL, PCRL, CPRL] !!\n");
-		return 1;
-	    }
-	    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;
-	    }
-	    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;
-	    }
-	    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++;
-	    }
-	    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);
-		}
-	    }
-	    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;
-	    }
-	    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;
-	    }
-	    break;
-	    /* ------------------------------------------------------ */
-	case 'C':		/* Add a comment */
-	    cp.comment = optarg;
-	    break;
-	    /* ------------------------------------------------------ */
-	case 'I':		/* reversible or not */
-	    ir = 1;
-	    break;
-	    /* ------------------------------------------------------ */
-	default:
-	    return 1;
 	}
-    }
-
-    cp.tx0 = TX0;
-    cp.ty0 = TY0;
-
-    /* Error messages */
-    /* -------------- */
-    if (!infile || !outfile) {
+	if (i < tcp_init->numlayers - 1)
+	  s++;
+      }
+      cp.fixed_alloc = 1;
+      break;
+      /* ----------------------------------------------------- */
+    case 't':			/* tiles */
+      sscanf(optarg, "%d,%d", &cp.tdx, &cp.tdy);
+      Tile_arg = 1;
+      break;
+      /* ----------------------------------------------------- */
+    case 'n':			/* resolution */
+      sscanf(optarg, "%d", &NumResolution);
+      break;
+      /* ----------------------------------------------------- */
+    case 'c':			/* precinct dimension */
+      sscanf(optarg, "%d,%d", &prcw_init, &prch_init);
+      CSty |= 0x01;
+      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,
-		"usage: image_to_j2k -i image-file -o j2k-file (+ options)\n");
+		"!! Size of code_block error (option -b) !!\n\nRestriction :\n    * width*height<=4096\n    * 4<=width,height<= 1024\n\n");
 	return 1;
-    }
-
-    if (cp.disto_alloc & cp.fixed_alloc) {
+      }
+      break;
+      /* ----------------------------------------------------- */
+    case 'x':			/* creation of index file */
+      index = optarg;
+      img.index_on = 1;
+      break;
+      /* ----------------------------------------------------- */
+    case 'p':			/* progression order */
+      s = optarg;
+      for (i = 0; i < 4; i++) {
+	progression[i] = *s;
+	s++;
+      }
+      Prog_order = give_progression(progression);
+
+      if (Prog_order == -1) {
+	fprintf(stderr,
+		"Unrecognized progression order [LRCP, RLCP, RPCL, PCRL, CPRL] !!\n");
+	return 1;
+      }
+      break;
+      /* ----------------------------------------------------- */
+    case 's':			/* subsampling factor */
+      if (sscanf(optarg, "%d,%d", &subsampling_dx, &subsampling_dy)
+	  != 2) {
 	fprintf(stderr,
-		"Error: option -r and -q can not be used together !!\n");
+		"'-s' sub-sampling argument error !  [-s dx,dy]\n");
+	return 1;
+      }
+      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;
+      }
+      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++;
+      }
+      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);
+	}
+      }
+      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;
+      }
+      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;
+      }
+      break;
+      /* ------------------------------------------------------ */
+    case 'C':			/* Add a comment */
+      cp.comment = optarg;
+      break;
+      /* ------------------------------------------------------ */
+    case 'I':			/* reversible or not */
+      ir = 1;
+      break;
+      /* ------------------------------------------------------ */
+    default:
+      return 1;
     }
-
-    /* if no rate entered, lossless by default */
-    if (tcp_init->numlayers == 0) {
-	tcp_init->rates[tcp_init->numlayers] = 1;
-	tcp_init->numlayers++;
-	cp.disto_alloc = 1;
+  }
+
+  cp.tx0 = TX0;
+  cp.ty0 = TY0;
+
+  /* Error messages */
+  /* -------------- */
+  if (!infile || !outfile) {
+    fprintf(stderr,
+	    "usage: image_to_j2k -i image-file -o j2k-file (+ options)\n");
+    return 1;
+  }
+
+  if (cp.disto_alloc & cp.fixed_alloc) {
+    fprintf(stderr,
+	    "Error: option -r and -q can not be used together !!\n");
+    return 1;
+  }
+
+  /* if no rate entered, lossless by default */
+  if (tcp_init->numlayers == 0) {
+    tcp_init->rates[tcp_init->numlayers] = 1;
+    tcp_init->numlayers++;
+    cp.disto_alloc = 1;
+  }
+
+  if (TX0 > Dim[0] || TY0 > Dim[1]) {
+    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]);
+    return 1;
+  }
+
+  for (i = 0; i < numpocs; i++) {
+    if (POC[i].prg == -1) {
+      fprintf(stderr,
+	      "Unrecognized progression order in option -P (POC n %d) [LRCP, RLCP, RPCL, PCRL, CPRL] !!\n",
+	      i + 1);
     }
-
-    if (TX0 > Dim[0] || TY0 > Dim[1]) {
-	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]);
+  }
+
+  switch (cp.image_type) {
+  case 0:
+    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;
 
-    for (i = 0; i < numpocs; i++) {
-	if (POC[i].prg == -1) {
-	    fprintf(stderr,
-		    "Unrecognized progression order in option -P (POC n %d) [LRCP, RLCP, RPCL, PCRL, CPRL] !!\n",
-		    i + 1);
-	}
+  case 1:
+    if (!pnmtoimage(infile, &img, subsampling_dx, subsampling_dy, Dim)) {
+      fprintf(stderr, " not a pnm file\n");
+      return 1;
     }
+    break;
 
-    switch (cp.image_type) {
-    case 0:
-	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;
-
-    case 1:
-	if (!pnmtoimage(infile, &img, subsampling_dx, subsampling_dy, Dim)) {
-	    fprintf(stderr, " not a pnm file\n");
-	    return 1;
-	}
-	break;
-
-    case 2:
-	if (!bmptoimage(infile, &img, subsampling_dx, subsampling_dy, Dim)) {
-	    fprintf(stderr, " not a bmp file\n");
-	    return 1;
-	}
-	break;
+  case 2:
+    if (!bmptoimage(infile, &img, subsampling_dx, subsampling_dy, Dim)) {
+      fprintf(stderr, " not a bmp file\n");
+      return 1;
     }
-    /* 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;
+    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;
+  }
+
+  /* Initialization for PPM marker */
+  cp.ppm = 0;
+  cp.ppm_data = 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++) {
+      tcp->rates[j] = tcp_init->rates[j];
     }
-
-    /* Initialization for PPM marker */
-    cp.ppm = 0;
-    cp.ppm_data = 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++) {
-	    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_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->csty = CSty;
-	tcp->prg = Prog_order;
-	tcp->mct = img.numcomps == 3 ? 1 : 0;
-	tcp->ppt = 0;
-	tcp->ppt_data = 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) {
+
+	for (j = 0; j < tccp->numresolutions; j++) {
+	  int size_prcw, size_prch;
+	  size_prcw = prcw_init >> (tccp->numresolutions - j - 1);
+	  size_prch = prch_init >> (tccp->numresolutions - j - 1);
+	  if (size_prcw < 1) {
+	    tccp->prcw[j] = 1;
+	  } else {
+	    tccp->prcw[j] =
+	      int_floorlog2(prcw_init >> (tccp->numresolutions - j - 1));
+	  }
+	  if (size_prch < 1) {
+	    tccp->prch[j] = 1;
+	  } else {
+	    tccp->prch[j] =
+	      int_floorlog2(prch_init >> (tccp->numresolutions - j - 1));
+	  }
 	}
-	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) {
-
-		for (j = 0; j < tccp->numresolutions; j++) {
-		    int size_prcw, size_prch;
-		    size_prcw =
-			prcw_init >> (tccp->numresolutions - j - 1);
-		    size_prch =
-			prch_init >> (tccp->numresolutions - j - 1);
-		    if (size_prcw < 1) {
-			tccp->prcw[j] = 1;
-		    } else {
-			tccp->prcw[j] =
-			    int_floorlog2(prcw_init >>
-					  (tccp->numresolutions - j - 1));
-		    }
-		    if (size_prch < 1) {
-			tccp->prch[j] = 1;
-		    } else {
-			tccp->prch[j] =
-			    int_floorlog2(prch_init >>
-					  (tccp->numresolutions - j - 1));
-		    }
-		}
-	    } else {
-		for (j = 0; j < tccp->numresolutions; j++) {
-		    tccp->prcw[j] = 15;
-		    tccp->prch[j] = 15;
-		}
-	    }
-	    calc_explicit_stepsizes(tccp, img.comps[i].prec);
+      } else {
+	for (j = 0; j < tccp->numresolutions; j++) {
+	  tccp->prcw[j] = 15;
+	  tccp->prch[j] = 15;
 	}
+      }
+      calc_explicit_stepsizes(tccp, img.comps[i].prec);
     }
-
-    len = j2k_encode(&img, &cp, outfile, cp.tdx * cp.tdy * 2, index);
-    if (len == 0) {
-	fprintf(stderr, "failed to encode image\n");
-	return 1;
+  }
+
+  len = j2k_encode(&img, &cp, outfile, cp.tdx * cp.tdy * 2, index);
+  if (len == 0) {
+    fprintf(stderr, "failed to encode image\n");
+    return 1;
+  }
+
+  /* Remove the temporary files */
+  /* -------------------------- */
+  if (cp.image_type) {		/* PNM PGM PPM */
+    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);
+      }
     }
-
-    /* Remove the temporary files */
-    /* -------------------------- */
-    if (cp.image_type) {	/* PNM PGM PPM */
-	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);
-
-	    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);
+
+      if (remove(&tmp) == -1) {
+	fprintf(stderr, "failed to kill %s file !\n", &tmp);
+      }
     }
+  }
 
-    return 0;
+  return 0;
 }
diff --git a/codec/j2k_to_image.c b/codec/j2k_to_image.c
index d8bbc334..15edba69 100644
--- a/codec/j2k_to_image.c
+++ b/codec/j2k_to_image.c
@@ -35,488 +35,476 @@
 
 int ceildiv(int a, int b)
 {
-    return (a + b - 1) / b;
+  return (a + b - 1) / b;
 }
 
 int main(int argc, char **argv)
 {
-    FILE *f;
-    char *src, *src_name;
-    char *dest, S1, S2, S3;
-    int len;
-    j2k_image_t *img;
-    j2k_cp_t *cp;
-    j2k_option_t option;
-    int w, wr, wrr, h, hr, hrr, max;
-    int i, image_type = -1, compno, pad;
-    int adjust;
-
-    if (argc < 3) {
-	fprintf(stderr,
-		"usage: %s j2k-file image-file -reduce n (<- optional)\n",
-		argv[0]);
-	return 1;
-    }
-
-    f = fopen(argv[1], "rb");
-    if (!f) {
-	fprintf(stderr, "failed to open %s for reading\n", argv[1]);
-	return 1;
+  FILE *f;
+  char *src, *src_name;
+  char *dest, S1, S2, S3;
+  int len;
+  j2k_image_t *img;
+  j2k_cp_t *cp;
+  j2k_option_t option;
+  int w, wr, wrr, h, hr, hrr, max;
+  int i, image_type = -1, compno, pad;
+  int adjust;
+
+  if (argc < 3) {
+    fprintf(stderr,
+	    "usage: %s j2k-file image-file -reduce n (<- optional)\n",
+	    argv[0]);
+    return 1;
+  }
+
+  f = fopen(argv[1], "rb");
+  if (!f) {
+    fprintf(stderr, "failed to open %s for reading\n", argv[1]);
+    return 1;
+  }
+
+  dest = argv[2];
+
+  option.reduce_on = 0;
+  option.reduce_value = 0;
+
+  /* OPTION REDUCE IS ACTIVE */
+  if (argc == 5) {
+    if (strcmp(argv[3], "-reduce")) {
+      fprintf(stderr,
+	      "usage: options " "-reduce n"
+	      " where n is the factor of reduction [%s]\n", argv[3]);
+      return 1;
     }
-
-    dest = argv[2];
-
-    option.reduce_on = 0;
-    option.reduce_value = 0;
-
-    /* OPTION REDUCE IS ACTIVE */
-    if (argc == 5) {
-	if (strcmp(argv[3], "-reduce")) {
-	    fprintf(stderr,
-		    "usage: options " "-reduce n"
-		    " where n is the factor of reduction [%s]\n", argv[3]);
-	    return 1;
-	}
-	option.reduce_on = 1;
-	sscanf(argv[4], "%d", &option.reduce_value);
-    }
-
-    while (*dest) {
-	dest++;
-    }
-    dest--;
-    S3 = *dest;
-    dest--;
-    S2 = *dest;
-    dest--;
-    S1 = *dest;
-
-    if ((S1 == 'p' && S2 == 'g' && S3 == 'x')
-	|| (S1 == 'P' && S2 == 'G' && S3 == 'X')) {
-	image_type = 0;
-    }
-
-    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')) {
-	image_type = 1;
-    }
-
-    if ((S1 == 'b' && S2 == 'm' && S3 == 'p')
-	|| (S1 == 'B' && S2 == 'M' && S3 == 'P')) {
-	image_type = 2;
+    option.reduce_on = 1;
+    sscanf(argv[4], "%d", &option.reduce_value);
+  }
+
+  while (*dest) {
+    dest++;
+  }
+  dest--;
+  S3 = *dest;
+  dest--;
+  S2 = *dest;
+  dest--;
+  S1 = *dest;
+
+  if ((S1 == 'p' && S2 == 'g' && S3 == 'x')
+      || (S1 == 'P' && S2 == 'G' && S3 == 'X')) {
+    image_type = 0;
+  }
+
+  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')) {
+    image_type = 1;
+  }
+
+  if ((S1 == 'b' && S2 == 'm' && S3 == 'p')
+      || (S1 == 'B' && S2 == 'M' && S3 == 'P')) {
+    image_type = 2;
+  }
+
+  if (image_type == -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;
+  }
+
+  fseek(f, 0, SEEK_END);
+  len = ftell(f);
+  fseek(f, 0, SEEK_SET);
+  src = (char *) malloc(len);
+  fread(src, 1, len, f);
+  fclose(f);
+
+  src_name = argv[1];
+  while (*src_name) {
+    src_name++;
+  }
+  src_name--;
+  S3 = *src_name;
+  src_name--;
+  S2 = *src_name;
+  src_name--;
+  S1 = *src_name;
+
+  if (S1 == 'j' && S2 == '2' && S3 == 'k') {
+    if (!j2k_decode(src, len, &img, &cp, option)) {
+      fprintf(stderr, "j2k_to_image: failed to decode image!\n");
+      return 1;
     }
-
-    if (image_type == -1) {
-	fprintf(stderr,
-		"!! Unrecognized format for infile : %c%c%c [accept only *.pnm, *.pgm, *.ppm, *.pgx or *.bmp] !!\n\n",
-		S1, S2, S3);
+  } else {
+    if (S1 == 'j' && S2 == 'p' && S3 == 't') {
+      if (!j2k_decode_jpt_stream(src, len, &img, &cp)) {
+	fprintf(stderr, "j2k_to_image: failed to decode image!\n");
 	return 1;
+      }
+    } else {
+      fprintf(stderr,
+	      "j2k_to_image : Unknown format image *.%c%c%c [only *.j2k or *.jpt]!! \n",
+	      S1, S2, S3);
+      return 1;
     }
-
-    fseek(f, 0, SEEK_END);
-    len = ftell(f);
-    fseek(f, 0, SEEK_SET);
-    src = (char *) malloc(len);
-    fread(src, 1, len, f);
-    fclose(f);
-
-    src_name = argv[1];
-    while (*src_name) {
-	src_name++;
-    }
-    src_name--;
-    S3 = *src_name;
-    src_name--;
-    S2 = *src_name;
-    src_name--;
-    S1 = *src_name;
-
-    if (S1 == 'j' && S2 == '2' && S3 == 'k') {
-	if (!j2k_decode(src, len, &img, &cp, option)) {
-	    fprintf(stderr, "j2k_to_image: failed to decode image!\n");
-	    return 1;
-	}
+  }
+
+  free(src);
+  /* ------------------  CREATE OUT IMAGE WITH THE RIGHT FORMAT ----------------------- */
+
+  /* ---------------------------- / */
+  /* /                            / */
+  /* /  FORMAT : PNM, PGM or PPM  / */
+  /* /                            / */
+  /* ---------------------------- / */
+
+  switch (image_type) {
+  case 1:			/* PNM PGM PPM */
+    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) {
+      f = fopen(argv[2], "wb");
+      w = ceildiv(img->x1 - img->x0, img->comps[0].dx);
+      // wr = 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 = ceildiv(img->y1 - img->y0, img->comps[0].dy);
+      // hr = 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);
+
+
+      fprintf(f, "P6\n# %d %d %d %d %d\n%d %d\n%d\n",
+	      cp->tcps[cp->tileno[0]].tccps[0].numresolutions, w, h,
+	      img->comps[0].x0, img->comps[0].y0, wrr, hrr, max);
+      adjust = img->comps[0].prec > 8 ? img->comps[0].prec - 8 : 0;
+      for (i = 0; i < wrr * hrr; i++) {
+	char r, g, b;
+	r = img->comps[0].data[i / wrr * wr + i % wrr];
+	r += (img->comps[0].sgnd ? 1 << (img->comps[0].prec - 1) : 0);
+	r = r >> adjust;
+
+	g = img->comps[1].data[i / wrr * wr + i % wrr];
+	g += (img->comps[1].sgnd ? 1 << (img->comps[1].prec - 1) : 0);
+	g = g >> adjust;
+
+	b = img->comps[2].data[i / wrr * wr + i % wrr];
+	b += (img->comps[2].sgnd ? 1 << (img->comps[2].prec - 1) : 0);
+	b = b >> adjust;
+
+	fprintf(f, "%c%c%c", r, g, b);
+      }
+      fclose(f);
     } else {
-	if (S1 == 'j' && S2 == 'p' && S3 == 't') {
-	    if (!j2k_decode_jpt_stream(src, len, &img, &cp)) {
-		fprintf(stderr, "j2k_to_image: failed to decode image!\n");
-		return 1;
-	    }
+      for (compno = 0; compno < img->numcomps; compno++) {
+	char name[256];
+	if (img->numcomps > 1) {
+	  sprintf(name, "%d.%s", compno, argv[2]);
 	} else {
-	    fprintf(stderr,
-		    "j2k_to_image : Unknown format image *.%c%c%c [only *.j2k or *.jpt]!! \n",
-		    S1, S2, S3);
-	    return 1;
+	  sprintf(name, "%s", argv[2]);
+	}
+	f = fopen(name, "wb");
+	w = ceildiv(img->x1 - img->x0, img->comps[compno].dx);
+	// wr = 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 = ceildiv(img->y1 - img->y0, img->comps[compno].dy);
+	// hr = 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(f, "P5\n# %d %d %d %d %d\n%d %d\n%d\n",
+		cp->tcps[cp->tileno[0]].tccps[compno].
+		numresolutions, w, h, img->comps[compno].x0,
+		img->comps[compno].y0, wrr, hrr, max);
+	adjust =
+	  img->comps[compno].prec > 8 ? img->comps[compno].prec - 8 : 0;
+	for (i = 0; i < wrr * hrr; i++) {
+	  char l;
+	  l = img->comps[compno].data[i / wrr * wr + i % wrr];
+	  l += (img->comps[compno].
+		sgnd ? 1 << (img->comps[compno].prec - 1) : 0);
+	  l = l >> adjust;
+	  fprintf(f, "%c", l);
 	}
+	fclose(f);
+      }
     }
-
-    free(src);
-    /* ------------------  CREATE OUT IMAGE WITH THE RIGHT FORMAT ----------------------- */
-
-    /* ---------------------------- / */
-    /* /                            / */
-    /* /  FORMAT : PNM, PGM or PPM  / */
-    /* /                            / */
-    /* ---------------------------- / */
-
-    switch (image_type) {
-    case 1:			/* PNM PGM PPM */
-	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) {
-	    f = fopen(argv[2], "wb");
-	    w = ceildiv(img->x1 - img->x0, img->comps[0].dx);
-	    // wr = 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 = ceildiv(img->y1 - img->y0, img->comps[0].dy);
-	    // hr = 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);
-
-
-	    fprintf(f, "P6\n# %d %d %d %d %d\n%d %d\n%d\n",
-		    cp->tcps[cp->tileno[0]].tccps[0].numresolutions, w, h,
-		    img->comps[0].x0, img->comps[0].y0, wrr, hrr, max);
-	    adjust = img->comps[0].prec > 8 ? img->comps[0].prec - 8 : 0;
-	    for (i = 0; i < wrr * hrr; i++) {
-		char r, g, b;
-		r = img->comps[0].data[i / wrr * wr + i % wrr];
-		r += (img->comps[0].
-		      sgnd ? 1 << (img->comps[0].prec - 1) : 0);
-		r = r >> adjust;
-
-		g = img->comps[1].data[i / wrr * wr + i % wrr];
-		g += (img->comps[1].
-		      sgnd ? 1 << (img->comps[1].prec - 1) : 0);
-		g = g >> adjust;
-
-		b = img->comps[2].data[i / wrr * wr + i % wrr];
-		b += (img->comps[2].
-		      sgnd ? 1 << (img->comps[2].prec - 1) : 0);
-		b = b >> adjust;
-
-		fprintf(f, "%c%c%c", r, g, b);
-	    }
-	    fclose(f);
+    break;
+
+    /* ------------------------ / */
+    /* /                        / */
+    /* /     FORMAT : PGX       / */
+    /* /                        / */
+    /* /----------------------- / */
+  case 0:			/* PGX */
+    for (compno = 0; compno < img->numcomps; compno++) {
+      j2k_comp_t *comp = &img->comps[compno];
+      char name[256];
+      if (img->numcomps > 1)
+	sprintf(name, "%d_%s", compno, argv[2]);
+      else
+	sprintf(name, "%s", argv[2]);
+
+      f = fopen(name, "wb");
+      // w = ceildiv(img->x1 - img->x0, comp->dx);
+      // wr = 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 = ceildiv(img->y1 - img->y0, comp->dy);
+      // hr = 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(f, "PG LM %c %d %d %d\n", comp->sgnd ? '-' : '+',
+	      comp->prec, wr, hr);
+      for (i = 0; i < wr * hr; i++) {
+	int v = img->comps[compno].data[i / wr * w + i % wr];
+	if (comp->prec <= 8) {
+	  char c = (char) v;
+	  fwrite(&c, 1, 1, f);
+	} else if (comp->prec <= 16) {
+	  short s = (short) v;
+	  fwrite(&s, 2, 1, f);
 	} else {
-	    for (compno = 0; compno < img->numcomps; compno++) {
-		char name[256];
-		if (img->numcomps > 1) {
-		    sprintf(name, "%d.%s", compno, argv[2]);
-		} else {
-		    sprintf(name, "%s", argv[2]);
-		}
-		f = fopen(name, "wb");
-		w = ceildiv(img->x1 - img->x0, img->comps[compno].dx);
-		// wr = 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 = ceildiv(img->y1 - img->y0, img->comps[compno].dy);
-		// hr = 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(f, "P5\n# %d %d %d %d %d\n%d %d\n%d\n",
-			cp->tcps[cp->tileno[0]].tccps[compno].
-			numresolutions, w, h, img->comps[compno].x0,
-			img->comps[compno].y0, wrr, hrr, max);
-		adjust =
-		    img->comps[compno].prec >
-		    8 ? img->comps[compno].prec - 8 : 0;
-		for (i = 0; i < wrr * hrr; i++) {
-		    char l;
-		    l = img->comps[compno].data[i / wrr * wr + i % wrr];
-		    l += (img->comps[compno].
-			  sgnd ? 1 << (img->comps[compno].prec - 1) : 0);
-		    l = l >> adjust;
-		    fprintf(f, "%c", l);
-		}
-		fclose(f);
-	    }
-	}
-	break;
-
-	/* ------------------------ / */
-	/* /                        / */
-	/* /     FORMAT : PGX       / */
-	/* /                        / */
-	/* /----------------------- / */
-    case 0:			/* PGX */
-	for (compno = 0; compno < img->numcomps; compno++) {
-	    j2k_comp_t *comp = &img->comps[compno];
-	    char name[256];
-	    if (img->numcomps > 1)
-		sprintf(name, "%d_%s", compno, argv[2]);
-	    else
-		sprintf(name, "%s", argv[2]);
-
-	    f = fopen(name, "wb");
-	    // w = ceildiv(img->x1 - img->x0, comp->dx);
-	    // wr = 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 = ceildiv(img->y1 - img->y0, comp->dy);
-	    // hr = 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(f, "PG LM %c %d %d %d\n", comp->sgnd ? '-' : '+',
-		    comp->prec, wr, hr);
-	    for (i = 0; i < wr * hr; i++) {
-		int v = img->comps[compno].data[i / wr * w + i % wr];
-		if (comp->prec <= 8) {
-		    char c = (char) v;
-		    fwrite(&c, 1, 1, f);
-		} else if (comp->prec <= 16) {
-		    short s = (short) v;
-		    fwrite(&s, 2, 1, f);
-		} else {
-		    fwrite(&v, 4, 1, f);
-		}
-	    }
-	    fclose(f);
+	  fwrite(&v, 4, 1, f);
 	}
-	break;
-
-	/* ------------------------ / */
-	/* /                        / */
-	/* /     FORMAT : BMP       / */
-	/* /                        / */
-	/* /----------------------- / */
-
-    case 2:			/* 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
-
-	       <<-- <<-- <<-- <<-- */
-
-	    f = fopen(argv[2], "wb");
-	    // w = ceildiv(img->x1 - img->x0, img->comps[0].dx);
-	    // wr = 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 = ceildiv(img->y1 - img->y0, img->comps[0].dy);
-	    // hr = 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(f, "BM");
-
-	    /* FILE HEADER */
-	    /* ------------- */
-	    fprintf(f, "%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(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
-		    ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-	    fprintf(f, "%c%c%c%c", (54) & 0xff, ((54) >> 8) & 0xff,
-		    ((54) >> 16) & 0xff, ((54) >> 24) & 0xff);
-
-	    /* INFO HEADER   */
-	    /* ------------- */
-	    fprintf(f, "%c%c%c%c", (40) & 0xff, ((40) >> 8) & 0xff,
-		    ((40) >> 16) & 0xff, ((40) >> 24) & 0xff);
-	    fprintf(f, "%c%c%c%c", (unsigned char) ((wr) & 0xff),
-		    (unsigned char) ((wr) >> 8) & 0xff,
-		    (unsigned char) ((wr) >> 16) & 0xff,
-		    (unsigned char) ((wr) >> 24) & 0xff);
-	    fprintf(f, "%c%c%c%c", (unsigned char) ((hr) & 0xff),
-		    (unsigned char) ((hr) >> 8) & 0xff,
-		    (unsigned char) ((hr) >> 16) & 0xff,
-		    (unsigned char) ((hr) >> 24) & 0xff);
-	    fprintf(f, "%c%c", (1) & 0xff, ((1) >> 8) & 0xff);
-	    fprintf(f, "%c%c", (24) & 0xff, ((24) >> 8) & 0xff);
-	    fprintf(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
-		    ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-	    fprintf(f, "%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(f, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,
-		    ((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
-	    fprintf(f, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,
-		    ((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
-	    fprintf(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
-		    ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-	    fprintf(f, "%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(f, "%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(f, "%c", 0);
-		}
-	    }
-	    fclose(f);
-	} else {		/* Gray-scale */
-
-	    /* -->> -->> -->> -->>
-
-	       8 bits non code (Gray scale)
-
-	       <<-- <<-- <<-- <<-- */
-	    f = fopen(argv[2], "wb");
-	    // w = ceildiv(img->x1 - img->x0, img->comps[0].dx);
-	    // wr = 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 = ceildiv(img->y1 - img->y0, img->comps[0].dy);
-	    // hr = 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(f, "BM");
-
-	    /* FILE HEADER */
-	    /* ------------- */
-	    fprintf(f, "%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(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
-		    ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-	    fprintf(f, "%c%c%c%c", (54 + 1024) & 0xff,
-		    ((54 + 1024) >> 8) & 0xff, ((54 + 1024) >> 16) & 0xff,
-		    ((54 + 1024) >> 24) & 0xff);
-
-	    /* INFO HEADER */
-	    /* ------------- */
-	    fprintf(f, "%c%c%c%c", (40) & 0xff, ((40) >> 8) & 0xff,
-		    ((40) >> 16) & 0xff, ((40) >> 24) & 0xff);
-	    fprintf(f, "%c%c%c%c", (unsigned char) ((wr) & 0xff),
-		    (unsigned char) ((wr) >> 8) & 0xff,
-		    (unsigned char) ((wr) >> 16) & 0xff,
-		    (unsigned char) ((wr) >> 24) & 0xff);
-	    fprintf(f, "%c%c%c%c", (unsigned char) ((hr) & 0xff),
-		    (unsigned char) ((hr) >> 8) & 0xff,
-		    (unsigned char) ((hr) >> 16) & 0xff,
-		    (unsigned char) ((hr) >> 24) & 0xff);
-	    fprintf(f, "%c%c", (1) & 0xff, ((1) >> 8) & 0xff);
-	    fprintf(f, "%c%c", (8) & 0xff, ((8) >> 8) & 0xff);
-	    fprintf(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
-		    ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-	    fprintf(f, "%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(f, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,
-		    ((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
-	    fprintf(f, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,
-		    ((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
-	    fprintf(f, "%c%c%c%c", (256) & 0xff, ((256) >> 8) & 0xff,
-		    ((256) >> 16) & 0xff, ((256) >> 24) & 0xff);
-	    fprintf(f, "%c%c%c%c", (256) & 0xff, ((256) >> 8) & 0xff,
-		    ((256) >> 16) & 0xff, ((256) >> 24) & 0xff);
+      }
+      fclose(f);
+    }
+    break;
+
+    /* ------------------------ / */
+    /* /                        / */
+    /* /     FORMAT : BMP       / */
+    /* /                        / */
+    /* /----------------------- / */
+
+  case 2:			/* 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
+
+         <<-- <<-- <<-- <<-- */
+
+      f = fopen(argv[2], "wb");
+      // w = ceildiv(img->x1 - img->x0, img->comps[0].dx);
+      // wr = 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 = ceildiv(img->y1 - img->y0, img->comps[0].dy);
+      // hr = 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(f, "BM");
+
+      /* FILE HEADER */
+      /* ------------- */
+      fprintf(f, "%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(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
+	      ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
+      fprintf(f, "%c%c%c%c", (54) & 0xff, ((54) >> 8) & 0xff,
+	      ((54) >> 16) & 0xff, ((54) >> 24) & 0xff);
+
+      /* INFO HEADER   */
+      /* ------------- */
+      fprintf(f, "%c%c%c%c", (40) & 0xff, ((40) >> 8) & 0xff,
+	      ((40) >> 16) & 0xff, ((40) >> 24) & 0xff);
+      fprintf(f, "%c%c%c%c", (unsigned char) ((wr) & 0xff),
+	      (unsigned char) ((wr) >> 8) & 0xff,
+	      (unsigned char) ((wr) >> 16) & 0xff,
+	      (unsigned char) ((wr) >> 24) & 0xff);
+      fprintf(f, "%c%c%c%c", (unsigned char) ((hr) & 0xff),
+	      (unsigned char) ((hr) >> 8) & 0xff,
+	      (unsigned char) ((hr) >> 16) & 0xff,
+	      (unsigned char) ((hr) >> 24) & 0xff);
+      fprintf(f, "%c%c", (1) & 0xff, ((1) >> 8) & 0xff);
+      fprintf(f, "%c%c", (24) & 0xff, ((24) >> 8) & 0xff);
+      fprintf(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
+	      ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
+      fprintf(f, "%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(f, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,
+	      ((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
+      fprintf(f, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,
+	      ((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
+      fprintf(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
+	      ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
+      fprintf(f, "%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(f, "%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(f, "%c", 0);
 	}
+      }
+      fclose(f);
+    } else {			/* Gray-scale */
+
+      /* -->> -->> -->> -->>
+
+         8 bits non code (Gray scale)
+
+         <<-- <<-- <<-- <<-- */
+      f = fopen(argv[2], "wb");
+      // w = ceildiv(img->x1 - img->x0, img->comps[0].dx);
+      // wr = 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 = ceildiv(img->y1 - img->y0, img->comps[0].dy);
+      // hr = 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(f, "BM");
+
+      /* FILE HEADER */
+      /* ------------- */
+      fprintf(f, "%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(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
+	      ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
+      fprintf(f, "%c%c%c%c", (54 + 1024) & 0xff,
+	      ((54 + 1024) >> 8) & 0xff, ((54 + 1024) >> 16) & 0xff,
+	      ((54 + 1024) >> 24) & 0xff);
+
+      /* INFO HEADER */
+      /* ------------- */
+      fprintf(f, "%c%c%c%c", (40) & 0xff, ((40) >> 8) & 0xff,
+	      ((40) >> 16) & 0xff, ((40) >> 24) & 0xff);
+      fprintf(f, "%c%c%c%c", (unsigned char) ((wr) & 0xff),
+	      (unsigned char) ((wr) >> 8) & 0xff,
+	      (unsigned char) ((wr) >> 16) & 0xff,
+	      (unsigned char) ((wr) >> 24) & 0xff);
+      fprintf(f, "%c%c%c%c", (unsigned char) ((hr) & 0xff),
+	      (unsigned char) ((hr) >> 8) & 0xff,
+	      (unsigned char) ((hr) >> 16) & 0xff,
+	      (unsigned char) ((hr) >> 24) & 0xff);
+      fprintf(f, "%c%c", (1) & 0xff, ((1) >> 8) & 0xff);
+      fprintf(f, "%c%c", (8) & 0xff, ((8) >> 8) & 0xff);
+      fprintf(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
+	      ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
+      fprintf(f, "%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(f, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,
+	      ((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
+      fprintf(f, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,
+	      ((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
+      fprintf(f, "%c%c%c%c", (256) & 0xff, ((256) >> 8) & 0xff,
+	      ((256) >> 16) & 0xff, ((256) >> 24) & 0xff);
+      fprintf(f, "%c%c%c%c", (256) & 0xff, ((256) >> 8) & 0xff,
+	      ((256) >> 16) & 0xff, ((256) >> 24) & 0xff);
+    }
 
-	for (i = 0; i < 256; i++) {
-	    fprintf(f, "%c%c%c%c", i, i, i, 0);
-	}
+    for (i = 0; i < 256; i++) {
+      fprintf(f, "%c%c%c%c", i, i, i, 0);
+    }
 
-	for (i = 0; i < wr * hr; i++) {
-	    /* a modifier !! */
-	    // fprintf(f, "%c", img->comps[0].data[w * h - ((i) / (w) + 1) * w + (i) % (w)]);
-	    fprintf(f, "%c",
-		    img->comps[0].data[w * hr - ((i) / (wr) + 1) * w +
-				       (i) % (wr)]);
-	    /*if (((i + 1) % w == 0 && w % 2))
-	       fprintf(f, "%c", 0); */
-	    if ((i + 1) % wr == 0) {
-		for (pad = wr % 4 ? 4 - wr % 4 : 0; pad > 0; pad--)	/* ADD */
-		    fprintf(f, "%c", 0);
-	    }
-	}
-	break;
-    default:
-	break;
+    for (i = 0; i < wr * hr; i++) {
+      /* a modifier !! */
+      // fprintf(f, "%c", img->comps[0].data[w * h - ((i) / (w) + 1) * w + (i) % (w)]);
+      fprintf(f, "%c",
+	      img->comps[0].data[w * hr - ((i) / (wr) + 1) * w +
+				 (i) % (wr)]);
+      /*if (((i + 1) % w == 0 && w % 2))
+         fprintf(f, "%c", 0); */
+      if ((i + 1) % wr == 0) {
+	for (pad = wr % 4 ? 4 - wr % 4 : 0; pad > 0; pad--)	/* ADD */
+	  fprintf(f, "%c", 0);
+      }
     }
+    break;
+  default:
+    break;
+  }
 
-    return 0;
+  return 0;
 }