[trunk] Add some sanity checks when reading Ippm(i) segments

[openjpeg.git] / src / lib / openjp2 / t2.h

diff --git a/src/lib/openjp2/t2.h b/src/lib/openjp2/t2.h
index c09386229dde0a7e99c3eca67de14c29243d8f3b..936073a557a3ef3f5cb1ea13c2af79b19c120499 100644 (file)
--- a/src/lib/openjp2/t2.h
+++ b/src/lib/openjp2/t2.h
@@ -5,6 +5,8 @@
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2008;2011-2012, Centre National d'Etudes Spatiales (CNES), France 
+ * Copyright (c) 2012, CS Systemes d'Information, France
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,13 +45,11 @@
 Tier-2 coding
 */
 typedef struct opj_t2 {
-       /** codec context */
-       opj_common_ptr cinfo;
 
        /** Encoding: pointer to the src image. Decoding: pointer to the dst image. */
        opj_image_t *image;
        /** pointer to the image coding parameters */
-       opj_cp_v2_t *cp;
+       opj_cp_t *cp;
 } opj_t2_t;
 
 /** @name Exported functions */
@@ -71,7 +71,7 @@ Encode the packets of a tile to a destination buffer
 @param pino             FIXME DOC
 @param t2_mode          If == 0 In Threshold calculation ,If == 1 Final pass
 */
-opj_bool opj_t2_encode_packets(        opj_t2_t* t2,
+OPJ_BOOL opj_t2_encode_packets(        opj_t2_t* t2,
                                                                OPJ_UINT32 tileno,
                                                                opj_tcd_tile_t *tile,
                                                                OPJ_UINT32 maxlayers,
@@ -96,7 +96,7 @@ Decode the packets of a tile from a source buffer
 
 @return FIXME DOC
  */
-opj_bool opj_t2_decode_packets(        opj_t2_t *t2,
+OPJ_BOOL opj_t2_decode_packets(        opj_t2_t *t2,
                                 OPJ_UINT32 tileno,
                                 opj_tcd_tile_t *tile,
                                 OPJ_BYTE *src,
@@ -111,7 +111,7 @@ opj_bool opj_t2_decode_packets(     opj_t2_t *t2,
  * @param      p_cp            Image coding parameters.
  * @return             a new T2 handle if successful, NULL otherwise.
 */
-opj_t2_t* opj_t2_create(opj_image_t *p_image, opj_cp_v2_t *p_cp);
+opj_t2_t* opj_t2_create(opj_image_t *p_image, opj_cp_t *p_cp);
 
 /**
 Destroy a T2 handle