[trunk] updated copyright and added copyright notice required by ISO, in each file...

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

diff --git a/src/lib/openjp2/bio.h b/src/lib/openjp2/bio.h
index 53e0f0db0fc625cf523e902d07e1f6740bbd667b..fba2428476a555c7a5aaba4915b1a23ff36c1419 100644 (file)
--- a/src/lib/openjp2/bio.h
+++ b/src/lib/openjp2/bio.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.
  *
@@ -57,7 +63,7 @@ typedef struct opj_bio {
        /** temporary place where each byte is read or written */
        OPJ_UINT32 buf;
        /** coder : number of bits free to write. decoder : number of bits read */
-       int ct;
+       OPJ_UINT32 ct;
 } opj_bio_t;
 
 /** @name Exported functions */
@@ -112,13 +118,13 @@ Flush bits
 @param bio BIO handle
 @return Returns OPJ_TRUE if successful, returns OPJ_FALSE otherwise
 */
-opj_bool opj_bio_flush(opj_bio_t *bio);
+OPJ_BOOL opj_bio_flush(opj_bio_t *bio);
 /**
 Passes the ending bits (coming from flushing)
 @param bio BIO handle
 @return Returns OPJ_TRUE if successful, returns OPJ_FALSE otherwise
 */
-opj_bool opj_bio_inalign(opj_bio_t *bio);
+OPJ_BOOL opj_bio_inalign(opj_bio_t *bio);
 /* ----------------------------------------------------------------------- */
 /*@}*/