[trunk] fixed a possible overflow in opj_t1_encode_cblks call to opj_int_fix_mul...

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

diff --git a/src/lib/openjp2/pi.h b/src/lib/openjp2/pi.h
index 779d821e852327d9b2e502ee98e57c2204302da8..f239679f5bd387fb013fe68263b78d189d94cd53 100644 (file)
--- a/src/lib/openjp2/pi.h
+++ b/src/lib/openjp2/pi.h
@@ -1,9 +1,15 @@
 /*
- * 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
  * All rights reserved.
  *
@@ -86,7 +92,7 @@ typedef struct opj_pi_iterator {
   /** layer that identify the packet */
   OPJ_UINT32 layno;
   /** 0 if the first packet */
-  opj_bool first;
+  OPJ_BOOL first;
   /** progression order change information */
   opj_poc_t poc;
   /** number of components in the image */
@@ -173,7 +179,7 @@ Modify the packet iterator to point to the next packet
 @param pi Packet iterator to modify
 @return Returns false if pi pointed to the last packet or else returns true
 */
-opj_bool opj_pi_next(opj_pi_iterator_t * pi);
+OPJ_BOOL opj_pi_next(opj_pi_iterator_t * pi);
 /* ----------------------------------------------------------------------- */
 /*@}*/