*
* @return true if the image header is valid, false else.
*/
-static opj_bool opj_jp2_read_ihdr( opj_jp2_v2_t *jp2,
+static opj_bool opj_jp2_read_ihdr( opj_jp2_t *jp2,
OPJ_BYTE *p_image_header_data,
OPJ_UINT32 p_image_header_size,
opj_event_mgr_t * p_manager );
*
* @return the data being copied.
*/
-static OPJ_BYTE * opj_jp2_write_ihdr(opj_jp2_v2_t *jp2,
+static OPJ_BYTE * opj_jp2_write_ihdr(opj_jp2_t *jp2,
OPJ_UINT32 * p_nb_bytes_written );
/**
*
* @return the data being copied.
*/
-static OPJ_BYTE * opj_jp2_write_bpcc( opj_jp2_v2_t *jp2,
+static OPJ_BYTE * opj_jp2_write_bpcc( opj_jp2_t *jp2,
OPJ_UINT32 * p_nb_bytes_written );
/**
*
* @return true if the bpc header is valid, fale else.
*/
-static opj_bool opj_jp2_read_bpcc( opj_jp2_v2_t *jp2,
+static opj_bool opj_jp2_read_bpcc( opj_jp2_t *jp2,
OPJ_BYTE * p_bpc_header_data,
OPJ_UINT32 p_bpc_header_size,
opj_event_mgr_t * p_manager );
-static opj_bool opj_jp2_read_cdef( opj_jp2_v2_t * jp2,
+static opj_bool opj_jp2_read_cdef( opj_jp2_t * jp2,
OPJ_BYTE * p_cdef_header_data,
OPJ_UINT32 p_cdef_header_size,
opj_event_mgr_t * p_manager );
*
* @return the data being copied.
*/
-static OPJ_BYTE * opj_jp2_write_colr( opj_jp2_v2_t *jp2,
+static OPJ_BYTE * opj_jp2_write_colr( opj_jp2_t *jp2,
OPJ_UINT32 * p_nb_bytes_written );
/**
*
* @return true if writing was successful.
*/
-static opj_bool opj_jp2_write_ftyp( opj_jp2_v2_t *jp2,
+static opj_bool opj_jp2_write_ftyp( opj_jp2_t *jp2,
opj_stream_private_t *cio,
opj_event_mgr_t * p_manager );
*
* @return true if the FTYP box is valid.
*/
-static opj_bool opj_jp2_read_ftyp( opj_jp2_v2_t *jp2,
+static opj_bool opj_jp2_read_ftyp( opj_jp2_t *jp2,
OPJ_BYTE * p_header_data,
OPJ_UINT32 p_header_size,
opj_event_mgr_t * p_manager );
-opj_bool opj_jp2_skip_jp2c( opj_jp2_v2_t *jp2,
+opj_bool opj_jp2_skip_jp2c( opj_jp2_t *jp2,
opj_stream_private_t *cio,
opj_event_mgr_t * p_manager );
*
* @return true if the JP2 Header box was successfully reconized.
*/
-static opj_bool opj_jp2_read_jp2h( opj_jp2_v2_t *jp2,
+static opj_bool opj_jp2_read_jp2h( opj_jp2_t *jp2,
OPJ_BYTE *p_header_data,
OPJ_UINT32 p_header_size,
opj_event_mgr_t * p_manager );
*
* @return true if writing was successful.
*/
-static opj_bool opj_jp2_write_jp2c( opj_jp2_v2_t *jp2,
+static opj_bool opj_jp2_write_jp2c( opj_jp2_t *jp2,
opj_stream_private_t *cio,
opj_event_mgr_t * p_manager );
+#ifdef USE_JPIP
+/**
+ * Write index Finder box
+ * @param cio the stream to write to.
+ * @param jp2 the jpeg2000 file codec.
+ * @param p_manager user event manager.
+*/
+static opj_bool opj_jpip_write_iptr( opj_jp2_t *jp2,
+ opj_stream_private_t *cio,
+ opj_event_mgr_t * p_manager );
+
+/**
+ * Write index Finder box
+ * @param cio the stream to write to.
+ * @param jp2 the jpeg2000 file codec.
+ * @param p_manager user event manager.
+ */
+static opj_bool opj_jpip_write_cidx(opj_jp2_t *jp2,
+ opj_stream_private_t *cio,
+ opj_event_mgr_t * p_manager );
+
+/**
+ * Write file Index (superbox)
+ * @param cio the stream to write to.
+ * @param jp2 the jpeg2000 file codec.
+ * @param p_manager user event manager.
+ */
+static opj_bool opj_jpip_write_fidx(opj_jp2_t *jp2,
+ opj_stream_private_t *cio,
+ opj_event_mgr_t * p_manager );
+#endif /* USE_JPIP */
+
/**
* Reads a jpeg2000 file signature box.
*
*
* @return true if the file signature box is valid.
*/
-static opj_bool opj_jp2_read_jp(opj_jp2_v2_t *jp2,
+static opj_bool opj_jp2_read_jp(opj_jp2_t *jp2,
OPJ_BYTE * p_header_data,
OPJ_UINT32 p_header_size,
opj_event_mgr_t * p_manager);
*
* @return true if writing was successful.
*/
-static opj_bool opj_jp2_write_jp( opj_jp2_v2_t *jp2,
+static opj_bool opj_jp2_write_jp( opj_jp2_t *jp2,
opj_stream_private_t *cio,
opj_event_mgr_t * p_manager );
*
* @return Returns true if successful, returns false otherwise
*/
-static opj_bool opj_jp2_read_pclr( opj_jp2_v2_t *jp2,
+static opj_bool opj_jp2_read_pclr( opj_jp2_t *jp2,
OPJ_BYTE * p_pclr_header_data,
OPJ_UINT32 p_pclr_header_size,
opj_event_mgr_t * p_manager );
* @return Returns true if successful, returns false otherwise
*/
-static opj_bool opj_jp2_read_cmap( opj_jp2_v2_t * jp2,
+static opj_bool opj_jp2_read_cmap( opj_jp2_t * jp2,
OPJ_BYTE * p_cmap_header_data,
OPJ_UINT32 p_cmap_header_size,
opj_event_mgr_t * p_manager );
*
* @return true if the bpc header is valid, fale else.
*/
-static opj_bool opj_jp2_read_colr( opj_jp2_v2_t *jp2,
+static opj_bool opj_jp2_read_colr( opj_jp2_t *jp2,
OPJ_BYTE * p_colr_header_data,
OPJ_UINT32 p_colr_header_size,
opj_event_mgr_t * p_manager );
* Sets up the procedures to do on writing header after the codestream.
* Developpers wanting to extend the library can add their own writing procedures.
*/
-static void opj_jp2_setup_end_header_writing (opj_jp2_v2_t *jp2);
+static void opj_jp2_setup_end_header_writing (opj_jp2_t *jp2);
/**
* Sets up the procedures to do on reading header after the codestream.
* Developpers wanting to extend the library can add their own writing procedures.
*/
-static void opj_jp2_setup_end_header_reading (opj_jp2_v2_t *jp2);
+static void opj_jp2_setup_end_header_reading (opj_jp2_t *jp2);
/**
* Reads a jpeg2000 file header structure.
*
* @return true if the box is valid.
*/
-static opj_bool opj_jp2_read_header_procedure( opj_jp2_v2_t *jp2,
+static opj_bool opj_jp2_read_header_procedure( opj_jp2_t *jp2,
opj_stream_private_t *stream,
opj_event_mgr_t * p_manager );
*
* @return true if all the procedures were successfully executed.
*/
-static opj_bool opj_jp2_exec ( opj_jp2_v2_t * jp2,
+static opj_bool opj_jp2_exec ( opj_jp2_t * jp2,
opj_procedure_list_t * p_procedure_list,
opj_stream_private_t *stream,
opj_event_mgr_t * p_manager );
* Sets up the validation ,i.e. adds the procedures to lauch to make sure the codec parameters
* are valid. Developpers wanting to extend the library can add their own validation procedures.
*/
-static void opj_jp2_setup_encoding_validation (opj_jp2_v2_t *jp2);
+static void opj_jp2_setup_encoding_validation (opj_jp2_t *jp2);
/**
* Sets up the procedures to do on writing header. Developpers wanting to extend the library can add their own writing procedures.
*/
-static void opj_jp2_setup_header_writing (opj_jp2_v2_t *jp2);
+static void opj_jp2_setup_header_writing (opj_jp2_t *jp2);
-opj_bool opj_jp2_default_validation ( opj_jp2_v2_t * jp2,
+opj_bool opj_jp2_default_validation ( opj_jp2_t * jp2,
opj_stream_private_t *cio,
opj_event_mgr_t * p_manager );
* Sets up the validation ,i.e. adds the procedures to lauch to make sure the codec parameters
* are valid. Developpers wanting to extend the library can add their own validation procedures.
*/
-static void opj_jp2_setup_decoding_validation (opj_jp2_v2_t *jp2);
+static void opj_jp2_setup_decoding_validation (opj_jp2_t *jp2);
/**
* Sets up the procedures to do on reading header.
* Developpers wanting to extend the library can add their own writing procedures.
*/
-static void opj_jp2_setup_header_reading (opj_jp2_v2_t *jp2);
+static void opj_jp2_setup_header_reading (opj_jp2_t *jp2);
/* ----------------------------------------------------------------------- */
)
{
/* read header from file */
- unsigned char l_data_header [8];
+ OPJ_BYTE l_data_header [8];
/* preconditions */
assert(cio != 00);
opj_read_bytes(l_data_header,&l_xl_part_size, 4);
if (l_xl_part_size != 0) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Cannot handle box sizes higher than 2^32\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Cannot handle box sizes higher than 2^32\n");
return OPJ_FALSE;
}
opj_read_bytes(l_data_header,&(box->length), 4);
#if 0
static void jp2_write_url(opj_cio_t *cio, char *Idx_file) {
- unsigned int i;
+ OPJ_UINT32 i;
opj_jp2_box_t box;
box.init_pos = cio_tell(cio);
}
#endif
-opj_bool opj_jp2_read_ihdr( opj_jp2_v2_t *jp2,
+opj_bool opj_jp2_read_ihdr( opj_jp2_t *jp2,
OPJ_BYTE *p_image_header_data,
OPJ_UINT32 p_image_header_size,
opj_event_mgr_t * p_manager )
assert(p_manager != 00);
if (p_image_header_size != 14) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Bad image header box (bad size)\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Bad image header box (bad size)\n");
return OPJ_FALSE;
}
/* allocate memory for components */
jp2->comps = (opj_jp2_comps_t*) opj_malloc(jp2->numcomps * sizeof(opj_jp2_comps_t));
if (jp2->comps == 0) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory to handle image header (ihdr)\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to handle image header (ihdr)\n");
return OPJ_FALSE;
}
memset(jp2->comps,0,jp2->numcomps * sizeof(opj_jp2_comps_t));
opj_read_bytes(p_image_header_data,&(jp2->bpc),1); /* BPC */
++ p_image_header_data;
- /* if equal to 0 then need a BPC box (cf. chapter about image header box of the norm) */
- /*if (jp2->bpc == 0){
- indicate with a flag that we will wait a BPC box
- }*/
-
opj_read_bytes(p_image_header_data,&(jp2->C),1); /* C */
++ p_image_header_data;
/* Should be equal to 7 cf. chapter about image header box of the norm */
if (jp2->C != 7){
- opj_event_msg_v2(p_manager, EVT_INFO, "JP2 IHDR box: compression type indicate that the file is not a conforming JP2 file (%d) \n", jp2->C);
+ opj_event_msg(p_manager, EVT_INFO, "JP2 IHDR box: compression type indicate that the file is not a conforming JP2 file (%d) \n", jp2->C);
}
opj_read_bytes(p_image_header_data,&(jp2->UnkC),1); /* UnkC */
return OPJ_TRUE;
}
-OPJ_BYTE * opj_jp2_write_ihdr(opj_jp2_v2_t *jp2,
+OPJ_BYTE * opj_jp2_write_ihdr(opj_jp2_t *jp2,
OPJ_UINT32 * p_nb_bytes_written
)
{
- unsigned char * l_ihdr_data,* l_current_ihdr_ptr;
+ OPJ_BYTE * l_ihdr_data,* l_current_ihdr_ptr;
/* preconditions */
assert(jp2 != 00);
assert(p_nb_bytes_written != 00);
/* default image header is 22 bytes wide */
- l_ihdr_data = (unsigned char *) opj_malloc(22);
+ l_ihdr_data = (OPJ_BYTE *) opj_malloc(22);
if (l_ihdr_data == 00) {
return 00;
}
return l_ihdr_data;
}
-OPJ_BYTE * opj_jp2_write_bpcc( opj_jp2_v2_t *jp2,
+OPJ_BYTE * opj_jp2_write_bpcc( opj_jp2_t *jp2,
OPJ_UINT32 * p_nb_bytes_written
)
{
- unsigned int i;
+ OPJ_UINT32 i;
/* room for 8 bytes for box and 1 byte for each component */
- int l_bpcc_size = 8 + jp2->numcomps;
- unsigned char * l_bpcc_data,* l_current_bpcc_ptr;
+ OPJ_INT32 l_bpcc_size = 8 + jp2->numcomps;
+ OPJ_BYTE * l_bpcc_data,* l_current_bpcc_ptr;
/* preconditions */
assert(jp2 != 00);
assert(p_nb_bytes_written != 00);
- l_bpcc_data = (unsigned char *) opj_malloc(l_bpcc_size);
+ l_bpcc_data = (OPJ_BYTE *) opj_malloc(l_bpcc_size);
if (l_bpcc_data == 00) {
return 00;
}
return l_bpcc_data;
}
-opj_bool opj_jp2_read_bpcc( opj_jp2_v2_t *jp2,
+opj_bool opj_jp2_read_bpcc( opj_jp2_t *jp2,
OPJ_BYTE * p_bpc_header_data,
OPJ_UINT32 p_bpc_header_size,
opj_event_mgr_t * p_manager
assert(jp2 != 00);
assert(p_manager != 00);
- /* TODO MSD */
- /*if (jp2->bpc != 0 ){
- opj_event_msg_v2(p_manager, EVT_WARNING, "A BPCC header box is available although BPC is different to zero (%d)\n",jp2->bpc);
- }*/
+
+ if (jp2->bpc != 255 ){
+ opj_event_msg(p_manager, EVT_WARNING, "A BPCC header box is available although BPC given by the IHDR box (%d) indicate components bit depth is constant\n",jp2->bpc);
+ }
/* and length is relevant */
if (p_bpc_header_size != jp2->numcomps) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Bad BPCC header box (bad size)\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Bad BPCC header box (bad size)\n");
return OPJ_FALSE;
}
return OPJ_TRUE;
}
-OPJ_BYTE * opj_jp2_write_colr( opj_jp2_v2_t *jp2,
+OPJ_BYTE * opj_jp2_write_colr( opj_jp2_t *jp2,
OPJ_UINT32 * p_nb_bytes_written
)
{
/* room for 8 bytes for box 3 for common data and variable upon profile*/
- unsigned int l_colr_size = 11;
- unsigned char * l_colr_data,* l_current_colr_ptr;
+ OPJ_UINT32 l_colr_size = 11;
+ OPJ_BYTE * l_colr_data,* l_current_colr_ptr;
/* preconditions */
assert(jp2 != 00);
return 00;
}
- l_colr_data = (unsigned char *) opj_malloc(l_colr_size);
+ l_colr_data = (OPJ_BYTE *) opj_malloc(l_colr_size);
if (l_colr_data == 00) {
return 00;
}
}
/* Palette mapping: */
- new_comps[pcol].data = (int*)
- opj_malloc(old_comps[cmp].w * old_comps[cmp].h * sizeof(int));
+ new_comps[pcol].data = (OPJ_INT32*)
+ opj_malloc(old_comps[cmp].w * old_comps[cmp].h * sizeof(OPJ_INT32));
new_comps[pcol].prec = channel_size[i];
new_comps[pcol].sgnd = channel_sign[i];
}
}/* apply_pclr() */
-opj_bool opj_jp2_read_pclr( opj_jp2_v2_t *jp2,
+opj_bool opj_jp2_read_pclr( opj_jp2_t *jp2,
OPJ_BYTE * p_pclr_header_data,
OPJ_UINT32 p_pclr_header_size,
opj_event_mgr_t * p_manager
assert(p_pclr_header_data != 00);
assert(jp2 != 00);
assert(p_manager != 00);
- (void)p_pclr_header_size;
+ (void)p_pclr_header_size;
if(jp2->color.jp2_pclr)
return OPJ_FALSE;
for(j = 0; j < nr_entries; ++j) {
for(i = 0; i < nr_channels; ++i) {
- int bytes_to_read = (channel_size[i]+7)>>3;
+ OPJ_INT32 bytes_to_read = (channel_size[i]+7)>>3;
opj_read_bytes(p_pclr_header_data, &l_value , bytes_to_read); /* Cji */
p_pclr_header_data += bytes_to_read;
return OPJ_TRUE;
}
-opj_bool opj_jp2_read_cmap( opj_jp2_v2_t * jp2,
+opj_bool opj_jp2_read_cmap( opj_jp2_t * jp2,
OPJ_BYTE * p_cmap_header_data,
OPJ_UINT32 p_cmap_header_size,
opj_event_mgr_t * p_manager
/* Need nr_channels: */
if(jp2->color.jp2_pclr == NULL) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Need to read a PCLR box before the CMAP box.\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Need to read a PCLR box before the CMAP box.\n");
return OPJ_FALSE;
}
* inside a JP2 Header box' :
*/
if(jp2->color.jp2_pclr->cmap) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Only one CMAP box is allowed.\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Only one CMAP box is allowed.\n");
return OPJ_FALSE;
}
void opj_jp2_apply_cdef(opj_image_t *image, opj_jp2_color_t *color)
{
opj_jp2_cdef_info_t *info;
- OPJ_INT32 color_space;
- OPJ_UINT16 i, n, cn, typ, asoc, acn;
+ OPJ_UINT16 i, n, cn, asoc, acn;
- color_space = image->color_space;
info = color->jp2_cdef->info;
n = color->jp2_cdef->n;
/* WATCH: acn = asoc - 1 ! */
if((asoc = info[i].asoc) == 0) continue;
- cn = info[i].cn; typ = info[i].typ; acn = asoc - 1;
+ cn = info[i].cn;
+ acn = asoc - 1;
if(cn != acn)
{
}/* jp2_apply_cdef() */
-opj_bool opj_jp2_read_cdef( opj_jp2_v2_t * jp2,
+opj_bool opj_jp2_read_cdef( opj_jp2_t * jp2,
OPJ_BYTE * p_cdef_header_data,
OPJ_UINT32 p_cdef_header_size,
opj_event_mgr_t * p_manager
)
{
opj_jp2_cdef_info_t *cdef_info;
- unsigned short i;
+ OPJ_UINT16 i;
OPJ_UINT32 l_value;
/* preconditions */
assert(jp2 != 00);
assert(p_cdef_header_data != 00);
assert(p_manager != 00);
- (void)p_cdef_header_size;
+ (void)p_cdef_header_size;
/* Part 1, I.5.3.6: 'The shall be at most one Channel Definition box
* inside a JP2 Header box.'*/
p_cdef_header_data+= 2;
if ( (OPJ_UINT16)l_value == 0){ /* szukw000: FIXME */
- opj_event_msg_v2(p_manager, EVT_ERROR, "Number of channel description is equal to zero in CDEF box.\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Number of channel description is equal to zero in CDEF box.\n");
return OPJ_FALSE;
}
return OPJ_TRUE;
}
-opj_bool opj_jp2_read_colr( opj_jp2_v2_t *jp2,
+opj_bool opj_jp2_read_colr( opj_jp2_t *jp2,
OPJ_BYTE * p_colr_header_data,
OPJ_UINT32 p_colr_header_size,
opj_event_mgr_t * p_manager
assert(p_manager != 00);
if (p_colr_header_size < 3) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Bad COLR header box (bad size)\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Bad COLR header box (bad size)\n");
return OPJ_FALSE;
}
* Specification boxes after the first.'
*/
if(jp2->color.jp2_has_colr) {
- opj_event_msg_v2(p_manager, EVT_INFO, "A conforming JP2 reader shall ignore all Colour Specification boxes after the first, so we ignore this one.\n");
+ opj_event_msg(p_manager, EVT_INFO, "A conforming JP2 reader shall ignore all Colour Specification boxes after the first, so we ignore this one.\n");
p_colr_header_data += p_colr_header_size;
return OPJ_TRUE;
}
if (jp2->meth == 1) {
if (p_colr_header_size != 7) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Bad BPCC header box (bad size)\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Bad BPCC header box (bad size)\n");
return OPJ_FALSE;
}
}
else if (jp2->meth == 2) {
/* ICC profile */
- int it_icc_value = 0;
- int icc_len = p_colr_header_size - 3;
+ OPJ_INT32 it_icc_value = 0;
+ OPJ_INT32 icc_len = p_colr_header_size - 3;
jp2->color.icc_profile_len = icc_len;
- jp2->color.icc_profile_buf = (unsigned char*) opj_malloc(icc_len);
+ jp2->color.icc_profile_buf = (OPJ_BYTE*) opj_malloc(icc_len);
- memset(jp2->color.icc_profile_buf, 0, icc_len * sizeof(unsigned char));
+ memset(jp2->color.icc_profile_buf, 0, icc_len * sizeof(OPJ_BYTE));
for (it_icc_value = 0; it_icc_value < icc_len; ++it_icc_value)
{
}
}
- else /* TODO MSD */
- opj_event_msg_v2(p_manager, EVT_INFO, "COLR BOX meth value is not a regular value (%d), so we will skip the fields following the approx field.\n", jp2->meth);
+ else
+ opj_event_msg(p_manager, EVT_INFO, "COLR BOX meth value is not a regular value (%d), so we will skip the fields following the approx field.\n", jp2->meth);
jp2->color.jp2_has_colr = 1;
return OPJ_TRUE;
}
-opj_bool opj_jp2_decode(opj_jp2_v2_t *jp2,
+opj_bool opj_jp2_decode(opj_jp2_t *jp2,
opj_stream_private_t *p_stream,
opj_image_t* p_image,
opj_event_mgr_t * p_manager)
/* J2K decoding */
if( ! opj_j2k_decode(jp2->j2k, p_stream, p_image, p_manager) ) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to decode the codestream in the JP2 file\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Failed to decode the codestream in the JP2 file\n");
return OPJ_FALSE;
}
return OPJ_TRUE;
}
-opj_bool OPJ_CALLCONV opj_jp2_write_jp2h(opj_jp2_v2_t *jp2,
+opj_bool opj_jp2_write_jp2h(opj_jp2_t *jp2,
opj_stream_private_t *stream,
opj_event_mgr_t * p_manager
)
opj_jp2_img_header_writer_handler_t l_writers [3];
opj_jp2_img_header_writer_handler_t * l_current_writer;
- int i, l_nb_pass;
+ OPJ_INT32 i, l_nb_pass;
/* size of data for super box*/
- int l_jp2h_size = 8;
+ OPJ_INT32 l_jp2h_size = 8;
opj_bool l_result = OPJ_TRUE;
/* to store the data of the super box */
- unsigned char l_jp2h_data [8];
+ OPJ_BYTE l_jp2h_data [8];
/* preconditions */
assert(stream != 00);
for (i=0;i<l_nb_pass;++i) {
l_current_writer->m_data = l_current_writer->handler(jp2,&(l_current_writer->m_size));
if (l_current_writer->m_data == 00) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory to hold JP2 Header data\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to hold JP2 Header data\n");
l_result = OPJ_FALSE;
break;
}
/* write super box data on stream */
if (opj_stream_write_data(stream,l_jp2h_data,8,p_manager) != 8) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Stream error while writing JP2 Header box\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Stream error while writing JP2 Header box\n");
l_result = OPJ_FALSE;
}
l_current_writer = l_writers;
for (i=0;i<l_nb_pass;++i) {
if (opj_stream_write_data(stream,l_current_writer->m_data,l_current_writer->m_size,p_manager) != l_current_writer->m_size) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Stream error while writing JP2 Header box\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Stream error while writing JP2 Header box\n");
l_result = OPJ_FALSE;
break;
}
return l_result;
}
-opj_bool opj_jp2_write_ftyp(opj_jp2_v2_t *jp2,
+opj_bool opj_jp2_write_ftyp(opj_jp2_t *jp2,
opj_stream_private_t *cio,
opj_event_mgr_t * p_manager )
{
- unsigned int i;
- unsigned int l_ftyp_size = 16 + 4 * jp2->numcl;
- unsigned char * l_ftyp_data, * l_current_data_ptr;
+ OPJ_UINT32 i;
+ OPJ_UINT32 l_ftyp_size = 16 + 4 * jp2->numcl;
+ OPJ_BYTE * l_ftyp_data, * l_current_data_ptr;
opj_bool l_result;
/* preconditions */
assert(jp2 != 00);
assert(p_manager != 00);
- l_ftyp_data = (unsigned char *) opj_malloc(l_ftyp_size);
+ l_ftyp_data = (OPJ_BYTE *) opj_malloc(l_ftyp_size);
if (l_ftyp_data == 00) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory to handle ftyp data\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to handle ftyp data\n");
return OPJ_FALSE;
}
l_result = (opj_stream_write_data(cio,l_ftyp_data,l_ftyp_size,p_manager) == l_ftyp_size);
if (! l_result)
{
- opj_event_msg_v2(p_manager, EVT_ERROR, "Error while writing ftyp data to stream\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Error while writing ftyp data to stream\n");
}
opj_free(l_ftyp_data);
return l_result;
}
-opj_bool opj_jp2_write_jp2c(opj_jp2_v2_t *jp2,
+opj_bool opj_jp2_write_jp2c(opj_jp2_t *jp2,
opj_stream_private_t *cio,
opj_event_mgr_t * p_manager )
{
opj_write_bytes(l_data_header + 4,JP2_JP2C,4); /* JP2C */
if (! opj_stream_seek(cio,jp2->j2k_codestream_offset,p_manager)) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to seek in the stream.\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Failed to seek in the stream.\n");
return OPJ_FALSE;
}
if (opj_stream_write_data(cio,l_data_header,8,p_manager) != 8) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to seek in the stream.\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Failed to seek in the stream.\n");
return OPJ_FALSE;
}
if (! opj_stream_seek(cio,j2k_codestream_exit,p_manager)) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to seek in the stream.\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Failed to seek in the stream.\n");
return OPJ_FALSE;
}
return OPJ_TRUE;
}
-opj_bool opj_jp2_write_jp( opj_jp2_v2_t *jp2,
+opj_bool opj_jp2_write_jp( opj_jp2_t *jp2,
opj_stream_private_t *cio,
opj_event_mgr_t * p_manager )
{
/* 12 bytes will be read */
- unsigned char l_signature_data [12];
+ OPJ_BYTE l_signature_data [12];
/* preconditions */
assert(cio != 00);
/* JP2 decoder interface */
/* ----------------------------------------------------------------------- */
-void opj_jp2_setup_decoder(opj_jp2_v2_t *jp2, opj_dparameters_t *parameters)
+void opj_jp2_setup_decoder(opj_jp2_t *jp2, opj_dparameters_t *parameters)
{
/* setup the J2K codec */
opj_j2k_setup_decoder(jp2->j2k, parameters);
/* JP2 encoder interface */
/* ----------------------------------------------------------------------- */
-void OPJ_CALLCONV opj_jp2_setup_encoder( opj_jp2_v2_t *jp2,
+void opj_jp2_setup_encoder( opj_jp2_t *jp2,
opj_cparameters_t *parameters,
opj_image_t *image,
opj_event_mgr_t * p_manager)
{
OPJ_UINT32 i;
- int depth_0, sign;
+ OPJ_INT32 depth_0, sign;
if(!jp2 || !parameters || !image)
return;
/* Check if number of components respects standard */
if (image->numcomps < 1 || image->numcomps > 16384) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Invalid number of components specified while setting up JP2 encoder\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Invalid number of components specified while setting up JP2 encoder\n");
return;
}
jp2->brand = JP2_JP2; /* BR */
jp2->minversion = 0; /* MinV */
jp2->numcl = 1;
- jp2->cl = (unsigned int*) opj_malloc(jp2->numcl * sizeof(unsigned int));
+ jp2->cl = (OPJ_UINT32*) opj_malloc(jp2->numcl * sizeof(OPJ_UINT32));
jp2->cl[0] = JP2_JP2; /* CL0 : JP2 */
/* Image Header box */
sign = image->comps[0].sgnd;
jp2->bpc = depth_0 + (sign << 7);
for (i = 1; i < image->numcomps; i++) {
- int depth = image->comps[i].prec - 1;
+ OPJ_INT32 depth = image->comps[i].prec - 1;
sign = image->comps[i].sgnd;
if (depth_0 != depth)
jp2->bpc = 255;
}
jp2->precedence = 0; /* PRECEDENCE */
jp2->approx = 0; /* APPROX */
+
+ jp2->jpip_on = parameters->jpip_on;
}
-opj_bool OPJ_CALLCONV opj_jp2_encode(opj_jp2_v2_t *jp2,
+opj_bool opj_jp2_encode(opj_jp2_t *jp2,
opj_stream_private_t *stream,
opj_event_mgr_t * p_manager)
{
return opj_j2k_encode_v2(jp2->j2k, stream, p_manager);
}
-opj_bool opj_jp2_end_decompress(opj_jp2_v2_t *jp2,
+opj_bool opj_jp2_end_decompress(opj_jp2_t *jp2,
opj_stream_private_t *cio,
opj_event_mgr_t * p_manager
)
return opj_j2k_end_decompress(jp2->j2k, cio, p_manager);
}
-opj_bool opj_jp2_end_compress( opj_jp2_v2_t *jp2,
+opj_bool opj_jp2_end_compress( opj_jp2_t *jp2,
opj_stream_private_t *cio,
opj_event_mgr_t * p_manager
)
return opj_jp2_exec(jp2,jp2->m_procedure_list,cio,p_manager);
}
-void opj_jp2_setup_end_header_writing (opj_jp2_v2_t *jp2)
+void opj_jp2_setup_end_header_writing (opj_jp2_t *jp2)
{
/* preconditions */
assert(jp2 != 00);
+#ifdef USE_JPIP
+ if( jp2->jpip_on )
+ opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jpip_write_iptr );
+#endif
opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_write_jp2c );
/* DEVELOPER CORNER, add your custom procedures */
+#ifdef USE_JPIP
+ if( jp2->jpip_on )
+ {
+ opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jpip_write_cidx );
+ opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jpip_write_fidx );
+ }
+#endif
}
-void opj_jp2_setup_end_header_reading (opj_jp2_v2_t *jp2)
+void opj_jp2_setup_end_header_reading (opj_jp2_t *jp2)
{
/* preconditions */
assert(jp2 != 00);
/* DEVELOPER CORNER, add your custom procedures */
}
-opj_bool opj_jp2_default_validation ( opj_jp2_v2_t * jp2,
+opj_bool opj_jp2_default_validation ( opj_jp2_t * jp2,
opj_stream_private_t *cio,
opj_event_mgr_t * p_manager
)
{
opj_bool l_is_valid = OPJ_TRUE;
- unsigned int i;
+ OPJ_UINT32 i;
/* preconditions */
assert(jp2 != 00);
assert(p_manager != 00);
/* JPEG2000 codec validation */
- /*TODO*/
/* STATE checking */
/* make sure the state is at 0 */
return l_is_valid;
}
-opj_bool opj_jp2_read_header_procedure( opj_jp2_v2_t *jp2,
+opj_bool opj_jp2_read_header_procedure( opj_jp2_t *jp2,
opj_stream_private_t *stream,
opj_event_mgr_t * p_manager
)
const opj_jp2_header_handler_t * l_current_handler;
OPJ_UINT32 l_last_data_size = BOX_SIZE;
OPJ_UINT32 l_current_data_size;
- unsigned char * l_current_data = 00;
+ OPJ_BYTE * l_current_data = 00;
/* preconditions */
assert(stream != 00);
assert(jp2 != 00);
assert(p_manager != 00);
- l_current_data = (unsigned char*)opj_malloc(l_last_data_size);
+ l_current_data = (OPJ_BYTE*)opj_malloc(l_last_data_size);
if (l_current_data == 00) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory to handle jpeg2000 file header\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to handle jpeg2000 file header\n");
return OPJ_FALSE;
}
memset(l_current_data, 0 , l_last_data_size);
return OPJ_TRUE;
}
else {
- opj_event_msg_v2(p_manager, EVT_ERROR, "bad placed jpeg codestream\n");
+ opj_event_msg(p_manager, EVT_ERROR, "bad placed jpeg codestream\n");
opj_free(l_current_data);
return OPJ_FALSE;
}
}
else if (box.length == 0) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Cannot handle box of undefined sizes\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Cannot handle box of undefined sizes\n");
opj_free(l_current_data);
return OPJ_FALSE;
}
if (l_current_handler != 00) {
if (l_current_data_size > l_last_data_size) {
- unsigned char* new_current_data = (unsigned char*)opj_realloc(l_current_data,l_current_data_size);
+ OPJ_BYTE* new_current_data = (OPJ_BYTE*)opj_realloc(l_current_data,l_current_data_size);
if (!l_current_data){
opj_free(l_current_data);
- opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory to handle jpeg2000 box\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to handle jpeg2000 box\n");
return OPJ_FALSE;
}
- l_current_data = new_current_data;
+ l_current_data = new_current_data;
l_last_data_size = l_current_data_size;
}
l_nb_bytes_read = opj_stream_read_data(stream,l_current_data,l_current_data_size,p_manager);
if (l_nb_bytes_read != l_current_data_size) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Problem with reading JPEG2000 box, stream error\n");
- /* TODO: LH: why nothing is freed here (as
- all other returns imply a free, even
- in the nominal case)? */
+ opj_event_msg(p_manager, EVT_ERROR, "Problem with reading JPEG2000 box, stream error\n");
+ opj_free(l_current_data);
return OPJ_FALSE;
}
else {
jp2->jp2_state |= JP2_STATE_UNKNOWN;
if (opj_stream_skip(stream,l_current_data_size,p_manager) != l_current_data_size) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Problem with skipping JPEG2000 box, stream error\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Problem with skipping JPEG2000 box, stream error\n");
opj_free(l_current_data);
return OPJ_FALSE;
}
*
* @return true if all the procedures were successfully executed.
*/
-static opj_bool opj_jp2_exec ( opj_jp2_v2_t * jp2,
+static opj_bool opj_jp2_exec ( opj_jp2_t * jp2,
opj_procedure_list_t * p_procedure_list,
opj_stream_private_t *stream,
opj_event_mgr_t * p_manager
)
{
- opj_bool (** l_procedure) (opj_jp2_v2_t * jp2, opj_stream_private_t *, opj_event_mgr_t *) = 00;
+ opj_bool (** l_procedure) (opj_jp2_t * jp2, opj_stream_private_t *, opj_event_mgr_t *) = 00;
opj_bool l_result = OPJ_TRUE;
OPJ_UINT32 l_nb_proc, i;
assert(p_manager != 00);
l_nb_proc = opj_procedure_list_get_nb_procedures(p_procedure_list);
- l_procedure = (opj_bool (**) (opj_jp2_v2_t * jp2, opj_stream_private_t *, opj_event_mgr_t *)) opj_procedure_list_get_first_procedure(p_procedure_list);
+ l_procedure = (opj_bool (**) (opj_jp2_t * jp2, opj_stream_private_t *, opj_event_mgr_t *)) opj_procedure_list_get_first_procedure(p_procedure_list);
for (i=0;i<l_nb_proc;++i) {
l_result = l_result && (*l_procedure) (jp2,stream,p_manager);
return l_result;
}
-opj_bool opj_jp2_start_compress(opj_jp2_v2_t *jp2,
+opj_bool opj_jp2_start_compress(opj_jp2_t *jp2,
opj_stream_private_t *stream,
opj_image_t * p_image,
opj_event_mgr_t * p_manager
*
* @return true if the file signature box is valid.
*/
-static opj_bool opj_jp2_read_jp(opj_jp2_v2_t *jp2,
+static opj_bool opj_jp2_read_jp(opj_jp2_t *jp2,
OPJ_BYTE * p_header_data,
OPJ_UINT32 p_header_size,
opj_event_mgr_t * p_manager
)
{
- unsigned int l_magic_number;
+ OPJ_UINT32 l_magic_number;
/* preconditions */
assert(p_header_data != 00);
assert(p_manager != 00);
if (jp2->jp2_state != JP2_STATE_NONE) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "The signature box must be the first box in the file.\n");
+ opj_event_msg(p_manager, EVT_ERROR, "The signature box must be the first box in the file.\n");
return OPJ_FALSE;
}
/* assure length of data is correct (4 -> magic number) */
if (p_header_size != 4) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Error with JP signature Box size\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Error with JP signature Box size\n");
return OPJ_FALSE;
}
/* rearrange data */
opj_read_bytes(p_header_data,&l_magic_number,4);
if (l_magic_number != 0x0d0a870a ) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Error with JP Signature : bad magic number\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Error with JP Signature : bad magic number\n");
return OPJ_FALSE;
}
*
* @return true if the FTYP box is valid.
*/
-static opj_bool opj_jp2_read_ftyp( opj_jp2_v2_t *jp2,
+static opj_bool opj_jp2_read_ftyp( opj_jp2_t *jp2,
OPJ_BYTE * p_header_data,
OPJ_UINT32 p_header_size,
opj_event_mgr_t * p_manager
assert(p_manager != 00);
if (jp2->jp2_state != JP2_STATE_SIGNATURE) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "The ftyp box must be the second box in the file.\n");
+ opj_event_msg(p_manager, EVT_ERROR, "The ftyp box must be the second box in the file.\n");
return OPJ_FALSE;
}
/* assure length of data is correct */
if (p_header_size < 8) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Error with FTYP signature Box size\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Error with FTYP signature Box size\n");
return OPJ_FALSE;
}
/* the number of remaining bytes should be a multiple of 4 */
if ((l_remaining_bytes & 0x3) != 0) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Error with FTYP signature Box size\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Error with FTYP signature Box size\n");
return OPJ_FALSE;
}
/* div by 4 */
jp2->numcl = l_remaining_bytes >> 2;
if (jp2->numcl) {
- jp2->cl = (unsigned int *) opj_malloc(jp2->numcl * sizeof(unsigned int));
+ jp2->cl = (OPJ_UINT32 *) opj_malloc(jp2->numcl * sizeof(OPJ_UINT32));
if (jp2->cl == 00) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory with FTYP Box\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Not enough memory with FTYP Box\n");
return OPJ_FALSE;
}
- memset(jp2->cl,0,jp2->numcl * sizeof(unsigned int));
+ memset(jp2->cl,0,jp2->numcl * sizeof(OPJ_UINT32));
}
for (i = 0; i < jp2->numcl; ++i)
return OPJ_TRUE;
}
-opj_bool opj_jp2_skip_jp2c( opj_jp2_v2_t *jp2,
+opj_bool opj_jp2_skip_jp2c( opj_jp2_t *jp2,
opj_stream_private_t *stream,
opj_event_mgr_t * p_manager )
{
return OPJ_TRUE;
}
+static opj_bool opj_jpip_skip_iptr( opj_jp2_t *jp2,
+ opj_stream_private_t *stream,
+ opj_event_mgr_t * p_manager )
+{
+ /* preconditions */
+ assert(jp2 != 00);
+ assert(stream != 00);
+ assert(p_manager != 00);
+
+ jp2->jpip_iptr_offset = opj_stream_tell(stream);
+
+ if (opj_stream_skip(stream,24,p_manager) != 24) {
+ return OPJ_FALSE;
+ }
+
+ return OPJ_TRUE;
+}
+
/**
* Reads the Jpeg2000 file Header box - JP2 Header box (warning, this is a super box).
*
*
* @return true if the JP2 Header box was successfully reconized.
*/
-static opj_bool opj_jp2_read_jp2h( opj_jp2_v2_t *jp2,
+static opj_bool opj_jp2_read_jp2h( opj_jp2_t *jp2,
OPJ_BYTE *p_header_data,
OPJ_UINT32 p_header_size,
opj_event_mgr_t * p_manager
/* make sure the box is well placed */
if ((jp2->jp2_state & JP2_STATE_FILE_TYPE) != JP2_STATE_FILE_TYPE ) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "The box must be the first box in the file.\n");
+ opj_event_msg(p_manager, EVT_ERROR, "The box must be the first box in the file.\n");
return OPJ_FALSE;
}
while (p_header_size > 0) {
if (! opj_jp2_read_boxhdr_char(&box,p_header_data,&l_box_size,p_header_size, p_manager)) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Stream error while reading JP2 Header box\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Stream error while reading JP2 Header box\n");
return OPJ_FALSE;
}
if (box.length > p_header_size) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Stream error while reading JP2 Header box: box length is inconsistent.\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Stream error while reading JP2 Header box: box length is inconsistent.\n");
return OPJ_FALSE;
}
assert(p_manager != 00);
if (p_box_max_size < 8) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Cannot handle box of less than 8 bytes\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Cannot handle box of less than 8 bytes\n");
return OPJ_FALSE;
}
/* do we have a "special very large box ?" */
/* read then the XLBox */
if (box->length == 1) {
- unsigned int l_xl_part_size;
+ OPJ_UINT32 l_xl_part_size;
if (p_box_max_size < 16) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Cannot handle XL box of less than 16 bytes\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Cannot handle XL box of less than 16 bytes\n");
return OPJ_FALSE;
}
*p_number_bytes_read += 4;
if (l_xl_part_size != 0) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Cannot handle box sizes higher than 2^32\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Cannot handle box sizes higher than 2^32\n");
return OPJ_FALSE;
}
box->length = (OPJ_INT32)(l_value);
if (box->length == 0) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Cannot handle box of undefined sizes\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Cannot handle box of undefined sizes\n");
return OPJ_FALSE;
}
}
else if (box->length == 0) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Cannot handle box of undefined sizes\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Cannot handle box of undefined sizes\n");
return OPJ_FALSE;
}
}
opj_bool opj_jp2_read_header( opj_stream_private_t *p_stream,
- opj_jp2_v2_t *jp2,
+ opj_jp2_t *jp2,
opj_image_t ** p_image,
opj_event_mgr_t * p_manager
)
p_manager);
}
-void opj_jp2_setup_encoding_validation (opj_jp2_v2_t *jp2)
+void opj_jp2_setup_encoding_validation (opj_jp2_t *jp2)
{
/* preconditions */
assert(jp2 != 00);
/* DEVELOPER CORNER, add your custom validation procedure */
}
-void opj_jp2_setup_decoding_validation (opj_jp2_v2_t *jp2)
+void opj_jp2_setup_decoding_validation (opj_jp2_t *jp2)
{
/* preconditions */
assert(jp2 != 00);
/* DEVELOPER CORNER, add your custom validation procedure */
}
-void opj_jp2_setup_header_writing (opj_jp2_v2_t *jp2)
+void opj_jp2_setup_header_writing (opj_jp2_t *jp2)
{
/* preconditions */
assert(jp2 != 00);
opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_write_jp );
opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_write_ftyp );
opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_write_jp2h );
+ if( jp2->jpip_on )
+ opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jpip_skip_iptr );
opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_skip_jp2c );
/* DEVELOPER CORNER, insert your custom procedures */
}
-void opj_jp2_setup_header_reading (opj_jp2_v2_t *jp2)
+void opj_jp2_setup_header_reading (opj_jp2_t *jp2)
{
/* preconditions */
assert(jp2 != 00);
/* DEVELOPER CORNER, add your custom procedures */
}
-opj_bool opj_jp2_read_tile_header ( opj_jp2_v2_t * p_jp2,
+opj_bool opj_jp2_read_tile_header ( opj_jp2_t * p_jp2,
OPJ_UINT32 * p_tile_index,
OPJ_UINT32 * p_data_size,
OPJ_INT32 * p_tile_x0,
p_manager);
}
-opj_bool OPJ_CALLCONV opj_jp2_write_tile ( opj_jp2_v2_t *p_jp2,
+opj_bool opj_jp2_write_tile ( opj_jp2_t *p_jp2,
OPJ_UINT32 p_tile_index,
OPJ_BYTE * p_data,
OPJ_UINT32 p_data_size,
return opj_j2k_write_tile (p_jp2->j2k,p_tile_index,p_data,p_data_size,p_stream,p_manager);
}
-opj_bool opj_jp2_decode_tile ( opj_jp2_v2_t * p_jp2,
+opj_bool opj_jp2_decode_tile ( opj_jp2_t * p_jp2,
OPJ_UINT32 p_tile_index,
OPJ_BYTE * p_data,
OPJ_UINT32 p_data_size,
return opj_j2k_decode_tile (p_jp2->j2k,p_tile_index,p_data,p_data_size,p_stream,p_manager);
}
-void OPJ_CALLCONV opj_jp2_destroy(opj_jp2_v2_t *jp2)
+void opj_jp2_destroy(opj_jp2_t *jp2)
{
if (jp2) {
/* destroy the J2K codec */
}
}
-opj_bool opj_jp2_set_decode_area( opj_jp2_v2_t *p_jp2,
+opj_bool opj_jp2_set_decode_area( opj_jp2_t *p_jp2,
opj_image_t* p_image,
OPJ_INT32 p_start_x, OPJ_INT32 p_start_y,
OPJ_INT32 p_end_x, OPJ_INT32 p_end_y,
return opj_j2k_set_decode_area(p_jp2->j2k, p_image, p_start_x, p_start_y, p_end_x, p_end_y, p_manager);
}
-opj_bool opj_jp2_get_tile( opj_jp2_v2_t *p_jp2,
+opj_bool opj_jp2_get_tile( opj_jp2_t *p_jp2,
opj_stream_private_t *p_stream,
opj_image_t* p_image,
opj_event_mgr_t * p_manager,
if (!p_image)
return OPJ_FALSE;
- opj_event_msg_v2(p_manager, EVT_WARNING, "JP2 box which are after the codestream will not be read by this function.\n");
+ opj_event_msg(p_manager, EVT_WARNING, "JP2 box which are after the codestream will not be read by this function.\n");
if (! opj_j2k_get_tile(p_jp2->j2k, p_stream, p_image, p_manager, tile_index) ){
- opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to decode the codestream in the JP2 file\n");
+ opj_event_msg(p_manager, EVT_ERROR, "Failed to decode the codestream in the JP2 file\n");
return OPJ_FALSE;
}
/* JP2 encoder interface */
/* ----------------------------------------------------------------------- */
-opj_jp2_v2_t* OPJ_CALLCONV opj_jp2_create(opj_bool p_is_decoder)
+opj_jp2_t* opj_jp2_create(opj_bool p_is_decoder)
{
- opj_jp2_v2_t *jp2 = (opj_jp2_v2_t*)opj_malloc(sizeof(opj_jp2_v2_t));
+ opj_jp2_t *jp2 = (opj_jp2_t*)opj_malloc(sizeof(opj_jp2_t));
if (jp2) {
- memset(jp2,0,sizeof(opj_jp2_v2_t));
+ memset(jp2,0,sizeof(opj_jp2_t));
/* create the J2K codec */
if (! p_is_decoder) {
return jp2;
}
-void jp2_dump(opj_jp2_v2_t* p_jp2, OPJ_INT32 flag, FILE* out_stream)
+void jp2_dump(opj_jp2_t* p_jp2, OPJ_INT32 flag, FILE* out_stream)
{
/* preconditions */
assert(p_jp2 != 00);
out_stream);
}
-opj_codestream_index_t* jp2_get_cstr_index(opj_jp2_v2_t* p_jp2)
+opj_codestream_index_t* jp2_get_cstr_index(opj_jp2_t* p_jp2)
{
return j2k_get_cstr_index(p_jp2->j2k);
}
-opj_codestream_info_v2_t* OPJ_CALLCONV jp2_get_cstr_info(opj_jp2_v2_t* p_jp2)
+opj_codestream_info_v2_t* jp2_get_cstr_info(opj_jp2_t* p_jp2)
{
return j2k_get_cstr_info(p_jp2->j2k);
}
-opj_bool opj_jp2_set_decoded_resolution_factor(opj_jp2_v2_t *p_jp2,
+opj_bool opj_jp2_set_decoded_resolution_factor(opj_jp2_t *p_jp2,
OPJ_UINT32 res_factor,
opj_event_mgr_t * p_manager)
{
return opj_j2k_set_decoded_resolution_factor(p_jp2->j2k, res_factor, p_manager);
}
+/* JPIP specific */
+
+#ifdef USE_JPIP
+static opj_bool opj_jpip_write_iptr(opj_jp2_t *jp2,
+ opj_stream_private_t *cio,
+ opj_event_mgr_t * p_manager )
+{
+ OPJ_OFF_T j2k_codestream_exit;
+ OPJ_BYTE l_data_header [24];
+
+ /* preconditions */
+ assert(jp2 != 00);
+ assert(cio != 00);
+ assert(p_manager != 00);
+ assert(opj_stream_has_seek(cio));
+
+ j2k_codestream_exit = opj_stream_tell(cio);
+ opj_write_bytes(l_data_header, 24, 4); /* size of iptr */
+ opj_write_bytes(l_data_header + 4,JPIP_IPTR,4); /* IPTR */
+#if 0
+ opj_write_bytes(l_data_header + 4 + 4, 0, 8); /* offset */
+ opj_write_bytes(l_data_header + 8 + 8, 0, 8); /* length */
+#else
+ opj_write_double(l_data_header + 4 + 4, 0); /* offset */
+ opj_write_double(l_data_header + 8 + 8, 0); /* length */
+#endif
+
+ if (! opj_stream_seek(cio,jp2->jpip_iptr_offset,p_manager)) {
+ opj_event_msg(p_manager, EVT_ERROR, "Failed to seek in the stream.\n");
+ return OPJ_FALSE;
+ }
+
+ if (opj_stream_write_data(cio,l_data_header,24,p_manager) != 24) {
+ opj_event_msg(p_manager, EVT_ERROR, "Failed to seek in the stream.\n");
+ return OPJ_FALSE;
+ }
+
+ if (! opj_stream_seek(cio,j2k_codestream_exit,p_manager)) {
+ opj_event_msg(p_manager, EVT_ERROR, "Failed to seek in the stream.\n");
+ return OPJ_FALSE;
+ }
+
+ return OPJ_TRUE;
+}
+
+static opj_bool opj_jpip_write_fidx(opj_jp2_t *jp2,
+ opj_stream_private_t *cio,
+ opj_event_mgr_t * p_manager )
+{
+ OPJ_OFF_T j2k_codestream_exit;
+ OPJ_BYTE l_data_header [24];
+
+ /* preconditions */
+ assert(jp2 != 00);
+ assert(cio != 00);
+ assert(p_manager != 00);
+ assert(opj_stream_has_seek(cio));
+
+ opj_write_bytes(l_data_header, 24, 4); /* size of iptr */
+ opj_write_bytes(l_data_header + 4,JPIP_FIDX,4); /* IPTR */
+ opj_write_double(l_data_header + 4 + 4, 0); /* offset */
+ opj_write_double(l_data_header + 8 + 8, 0); /* length */
+
+ if (opj_stream_write_data(cio,l_data_header,24,p_manager) != 24) {
+ opj_event_msg(p_manager, EVT_ERROR, "Failed to seek in the stream.\n");
+ return OPJ_FALSE;
+ }
+
+ j2k_codestream_exit = opj_stream_tell(cio);
+ if (! opj_stream_seek(cio,j2k_codestream_exit,p_manager)) {
+ opj_event_msg(p_manager, EVT_ERROR, "Failed to seek in the stream.\n");
+ return OPJ_FALSE;
+ }
+
+ return OPJ_TRUE;
+}
+
+static opj_bool opj_jpip_write_cidx(opj_jp2_t *jp2,
+ opj_stream_private_t *cio,
+ opj_event_mgr_t * p_manager )
+{
+ OPJ_OFF_T j2k_codestream_exit;
+ OPJ_BYTE l_data_header [24];
+
+ /* preconditions */
+ assert(jp2 != 00);
+ assert(cio != 00);
+ assert(p_manager != 00);
+ assert(opj_stream_has_seek(cio));
+
+ j2k_codestream_exit = opj_stream_tell(cio);
+ opj_write_bytes(l_data_header, 24, 4); /* size of iptr */
+ opj_write_bytes(l_data_header + 4,JPIP_CIDX,4); /* IPTR */
+#if 0
+ opj_write_bytes(l_data_header + 4 + 4, 0, 8); /* offset */
+ opj_write_bytes(l_data_header + 8 + 8, 0, 8); /* length */
+#else
+ opj_write_double(l_data_header + 4 + 4, 0); /* offset */
+ opj_write_double(l_data_header + 8 + 8, 0); /* length */
+#endif
+
+ if (! opj_stream_seek(cio,j2k_codestream_exit,p_manager)) {
+ opj_event_msg(p_manager, EVT_ERROR, "Failed to seek in the stream.\n");
+ return OPJ_FALSE;
+ }
+
+ if (opj_stream_write_data(cio,l_data_header,24,p_manager) != 24) {
+ opj_event_msg(p_manager, EVT_ERROR, "Failed to seek in the stream.\n");
+ return OPJ_FALSE;
+ }
+
+ j2k_codestream_exit = opj_stream_tell(cio);
+ if (! opj_stream_seek(cio,j2k_codestream_exit,p_manager)) {
+ opj_event_msg(p_manager, EVT_ERROR, "Failed to seek in the stream.\n");
+ return OPJ_FALSE;
+ }
+
+ return OPJ_TRUE;
+}
+
+static void write_prxy( int offset_jp2c, int length_jp2c, int offset_idx, int length_idx, opj_stream_private_t *cio,
+ opj_event_mgr_t * p_manager )
+{
+ OPJ_BYTE l_data_header [8];
+ OPJ_OFF_T len, lenp;
+
+ lenp = opj_stream_tell(cio);
+ opj_stream_skip(cio, 4, p_manager); /* L [at the end] */
+ opj_write_bytes(l_data_header,JPIP_PRXY,4); /* IPTR */
+ opj_stream_write_data(cio,l_data_header,4,p_manager);
+
+ opj_write_bytes( l_data_header, offset_jp2c, 8); /* OOFF */
+ opj_stream_write_data(cio,l_data_header,8,p_manager);
+ opj_write_bytes( l_data_header, length_jp2c, 4); /* OBH part 1 */
+ opj_write_bytes( l_data_header+4, JP2_JP2C, 4); /* OBH part 2 */
+ opj_stream_write_data(cio,l_data_header,8,p_manager);
+
+ opj_write_bytes( l_data_header, 1, 1);/* NI */
+ opj_stream_write_data(cio,l_data_header,1,p_manager);
+
+ opj_write_bytes( l_data_header, offset_idx, 8); /* IOFF */
+ opj_stream_write_data(cio,l_data_header,8,p_manager);
+ opj_write_bytes( l_data_header, length_idx, 4); /* IBH part 1 */
+ opj_write_bytes( l_data_header+4, JPIP_CIDX, 4); /* IBH part 2 */
+ opj_stream_write_data(cio,l_data_header,8,p_manager);
+
+ len = opj_stream_tell(cio)-lenp;
+ opj_stream_skip(cio, lenp, p_manager);
+ opj_write_bytes(l_data_header,len,4);/* L */
+ opj_stream_write_data(cio,l_data_header,4,p_manager);
+ opj_stream_seek(cio, lenp+len,p_manager);
+}
+
+
+static int write_fidx( int offset_jp2c, int length_jp2c, int offset_idx, int length_idx, opj_stream_private_t *cio,
+ opj_event_mgr_t * p_manager )
+{
+ OPJ_BYTE l_data_header [4];
+ OPJ_OFF_T len, lenp;
+
+ lenp = opj_stream_tell(cio);
+ opj_stream_skip(cio, 4, p_manager);
+ opj_write_bytes(l_data_header,JPIP_FIDX,4); /* FIDX */
+ opj_stream_write_data(cio,l_data_header,4,p_manager);
+
+ write_prxy( offset_jp2c, length_jp2c, offset_idx, length_idx, cio,p_manager);
+
+ len = opj_stream_tell(cio)-lenp;
+ opj_stream_skip(cio, lenp, p_manager);
+ opj_write_bytes(l_data_header,len,4);/* L */
+ opj_stream_write_data(cio,l_data_header,4,p_manager);
+ opj_stream_seek(cio, lenp+len,p_manager);
+
+ return len;
+}
+#endif /* USE_JPIP */
projects / openjpeg.git / blobdiff