[trunk] added check for tile component data size overflow (fixes issue 432)

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

diff --git a/src/lib/openjp2/t2.h b/src/lib/openjp2/t2.h
index e608f3e7a52e70fbe963d637da3bdd3eea41556d..931141e057c6b3671a352bcfe1adb15183199013 100644 (file)
--- a/src/lib/openjp2/t2.h
+++ b/src/lib/openjp2/t2.h
@@ -1,10 +1,18 @@
 /*
- * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2007, Professor Benoit Macq
+ * The copyright in this software is being made available under the 2-clauses 
+ * BSD License, included below. This software may be subject to other third 
+ * party and contributor rights, including patent rights, and no such rights
+ * are granted under this license.
+ *
+ * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2008, 2011-2012, Centre National d'Etudes Spatiales (CNES), FR 
+ * Copyright (c) 2012, CS Systemes d'Information, France
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,8 +51,6 @@
 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;
@@ -71,7 +77,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 +102,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,