Also dump the image info as well as cp info.

diff --git a/ChangeLog b/ChangeLog
index 35aa1f43c53421190e41bb2a73385cbcd200d8a3..0b2a409fb6487a8880893f98346297df0f517e3f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ What's New for OpenJPEG
 
 June 22, 2010
 + [MM] Apply patch from w. szukalski (sent to list)
++ [MM] Also dump the image info as well as cp info.
 
 June 21, 2010
 + [MM] Added a j2k_dump to simply dump the parameter of a J2K file

diff --git a/codec/j2k_dump.c b/codec/j2k_dump.c
index a63c9946f1e9873219136f2a8a59958280be5803..3d485e9dd864aa2f679825f325f7d441fdb721eb 100644 (file)
--- a/codec/j2k_dump.c
+++ b/codec/j2k_dump.c
@@ -302,8 +302,6 @@ void info_callback(const char *msg, void *client_data) {
        fprintf(stdout, "[INFO] %s", msg);
 }
 
-//void j2k_dump_cp(FILE *fd, opj_image_t * img, opj_cp_t * cp);
-
 /* -------------------------------------------------------------------------- */
 
 int main(int argc, char *argv[])
@@ -425,7 +423,10 @@ int main(int argc, char *argv[])
                                opj_cio_close(cio);
                                return 1;
                        }
-                       /* dump */
+                       /* dump image */
+      j2k_dump_image(stdout, image);
+
+                       /* dump cp */
       j2k_dump_cp(stdout, image, ((opj_j2k_t*)dinfo->j2k_handle)->cp);
 
                        /* close the byte stream */
@@ -469,7 +470,10 @@ int main(int argc, char *argv[])
                                opj_cio_close(cio);
                                return 1;
                        }
-                       /* dump */
+                       /* dump image */
+      j2k_dump_image(stdout, image);
+
+                       /* dump cp */
       j2k_dump_cp(stdout, image, ((opj_jp2_t*)dinfo->jp2_handle)->j2k->cp);
 
                        /* close the byte stream */

diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c
index 89677eb5fa266fd4e3c5c15bde727a11d0592f2a..33ff8545025368bfe8c27d3fac20401e23bfc254 100644 (file)
--- a/libopenjpeg/j2k.c
+++ b/libopenjpeg/j2k.c
@@ -268,6 +268,7 @@ void j2k_dump_image(FILE *fd, opj_image_t * img) {
                fprintf(fd, "  comp %d {\n", compno);
                fprintf(fd, "    dx=%d, dy=%d\n", comp->dx, comp->dy);
                fprintf(fd, "    prec=%d\n", comp->prec);
+               //fprintf(fd, "    bpp=%d\n", comp->bpp);
                fprintf(fd, "    sgnd=%d\n", comp->sgnd);
                fprintf(fd, "  }\n");
        }

diff --git a/libopenjpeg/j2k.h b/libopenjpeg/j2k.h
index 74eba22329d5cd98592f4cb0e1f973b3fa21de5e..bb86e348e4a5777da7f0542afa494d9dd61c6880 100644 (file)
--- a/libopenjpeg/j2k.h
+++ b/libopenjpeg/j2k.h
@@ -438,6 +438,7 @@ Encode an image into a JPEG-2000 codestream
 */
 bool j2k_encode(opj_j2k_t *j2k, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info);
 
+void j2k_dump_image(FILE *fd, opj_image_t * img);
 void j2k_dump_cp(FILE *fd, opj_image_t * img, opj_cp_t * cp);
 /* ----------------------------------------------------------------------- */
 /*@}*/