diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | codec/j2k_dump.c | 12 | ||||
| -rw-r--r-- | libopenjpeg/j2k.c | 1 | ||||
| -rw-r--r-- | libopenjpeg/j2k.h | 1 |
4 files changed, 11 insertions, 4 deletions
@@ -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 a63c9946..3d485e9d 100644 --- 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 89677eb5..33ff8545 100644 --- 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 74eba223..bb86e348 100644 --- 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); /* ----------------------------------------------------------------------- */ /*@}*/ |