diff options
| author | Antonin Descampe <antonin@gmail.com> | 2008-07-31 18:47:41 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2008-07-31 18:47:41 +0000 |
| commit | 7caaea18b728ead4e45226aafc09dba01e514a2d (patch) | |
| tree | 1d5d19df20b82cee63a7de94fc8e04e8426cb7c7 /libopenjpeg/jpt.h | |
| parent | 8407e057c9e10c8fc2b5f4be56e603fae3f9063d (diff) | |
Deleting obsolete files and directories, adding v2-specific files and directories, updating existing files to v2. See README.v2 for more info
Diffstat (limited to 'libopenjpeg/jpt.h')
| -rw-r--r-- | libopenjpeg/jpt.h | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/libopenjpeg/jpt.h b/libopenjpeg/jpt.h index eb01f98e..22af2c2a 100644 --- a/libopenjpeg/jpt.h +++ b/libopenjpeg/jpt.h @@ -3,6 +3,7 @@ * Copyright (c) 2002-2007, Professor Benoit Macq * Copyright (c) 2002-2003, Yannick Verschueren * Copyright (c) 2005, Herve Drolon, FreeImage Team + * Copyright (c) 2008, Jerome Fimes, Communications & Systemes <jerome.fimes@c-s.fr> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,25 +36,28 @@ JPT-stream functions are implemented in J2K.C. */ - +#include "openjpeg.h" +struct opj_stream_private; +struct opj_event_mgr; /** Message Header JPT stream structure */ -typedef struct opj_jpt_msg_header { +typedef struct opj_jpt_msg_header +{ /** In-class Identifier */ - unsigned int Id; + OPJ_UINT32 Id; /** Last byte information */ - unsigned int last_byte; + OPJ_UINT32 last_byte; /** Class Identifier */ - unsigned int Class_Id; + OPJ_UINT32 Class_Id; /** CSn : index identifier */ - unsigned int CSn_Id; + OPJ_UINT32 CSn_Id; /** Message offset */ - unsigned int Msg_offset; + OPJ_UINT32 Msg_offset; /** Message length */ - unsigned int Msg_length; + OPJ_UINT32 Msg_length; /** Auxiliary for JPP case */ - unsigned int Layer_nb; + OPJ_UINT32 Layer_nb; } opj_jpt_msg_header_t; /* ----------------------------------------------------------------------- */ @@ -65,11 +69,15 @@ Initialize the value of the message header structure void jpt_init_msg_header(opj_jpt_msg_header_t * header); /** -Read the message header for a JPP/JPT - stream -@param cinfo Codec context info -@param cio CIO handle -@param header Message header structure + * Read the message header for a JPP/JPT - stream + * @param p_cio stream handle + * @param header JPT Message header structure + * @param p_manager user event manager to display nice messages. */ -void jpt_read_msg_header(opj_common_ptr cinfo, opj_cio_t *cio, opj_jpt_msg_header_t *header); +bool jpt_read_msg_header( + struct opj_stream_private * p_cio, + opj_jpt_msg_header_t * p_header, + OPJ_UINT32 * p_nb_bytes_read, + struct opj_event_mgr * p_manager); #endif |