diff options
| author | Freeimage <freeimage@aliceadsl.fr> | 2006-01-26 20:02:04 +0000 |
|---|---|---|
| committer | Freeimage <freeimage@aliceadsl.fr> | 2006-01-26 20:02:04 +0000 |
| commit | 8a662fa4b1dc489a8d6d5fe687499f25f856ba67 (patch) | |
| tree | 52da800230f0ad989574402e9c1ce146c08b3824 /libopenjpeg/jp2.c | |
| parent | 7546f19b51511ceae65e5b81448d89f18aa2dd75 (diff) | |
fixed various minor warnings occuring under gcc, added corrections proposed in the forum
Diffstat (limited to 'libopenjpeg/jp2.c')
| -rw-r--r-- | libopenjpeg/jp2.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c index e224f4c6..c411f7e0 100644 --- a/libopenjpeg/jp2.c +++ b/libopenjpeg/jp2.c @@ -81,7 +81,7 @@ Read the FTYP box - File type box @return Returns true if successful, returns false otherwise */ static bool jp2_read_ftyp(opj_jp2_t *jp2, opj_cio_t *cio); -static int jp2_write_jp2c(opj_jp2_t *jp2, opj_cio_t *cio, char *index); +static int jp2_write_jp2c(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, char *index); static bool jp2_read_jp2c(opj_jp2_t *jp2, opj_cio_t *cio, unsigned int *j2k_codestream_length, unsigned int *j2k_codestream_offset); static void jp2_write_jp(opj_cio_t *cio); /** @@ -414,12 +414,11 @@ static bool jp2_read_ftyp(opj_jp2_t *jp2, opj_cio_t *cio) { return true; } -static int jp2_write_jp2c(opj_jp2_t *jp2, opj_cio_t *cio, char *index) { +static int jp2_write_jp2c(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, char *index) { unsigned int j2k_codestream_offset, j2k_codestream_length; opj_jp2_box_t box; opj_j2k_t *j2k = jp2->j2k; - opj_image_t *image = jp2->image; box.init_pos = cio_tell(cio); cio_skip(cio, 4); @@ -635,8 +634,6 @@ void jp2_setup_encoder(opj_jp2_t *jp2, opj_cparameters_t *parameters, opj_image_ /* Image Header box */ - jp2->image = image; - jp2->numcomps = image->numcomps; /* NC */ jp2->comps = (opj_jp2_comps_t*) opj_malloc(jp2->numcomps * sizeof(opj_jp2_comps_t)); jp2->h = image->y1 - image->y0; /* HEIGHT */ @@ -684,7 +681,6 @@ void jp2_setup_encoder(opj_jp2_t *jp2, opj_cparameters_t *parameters, opj_image_ } bool jp2_encode(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, char *index) { - (void)image; /* JP2 encoding */ @@ -697,7 +693,7 @@ bool jp2_encode(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, char *index) /* J2K encoding */ - if(!jp2_write_jp2c(jp2, cio, index)) { + if(!jp2_write_jp2c(jp2, cio, image, index)) { opj_event_msg(jp2->cinfo, EVT_ERROR, "Failed to encode image\n"); return false; } |