Add missing checks. Fix crash on failed allocation.

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

diff --git a/src/lib/openjp2/mct.h b/src/lib/openjp2/mct.h
index 3752d986a04cc2772d0ba90f871c834392434594..1c1f4d0c4da94cbdbef8280ddacedb2aced8d568 100644 (file)
--- a/src/lib/openjp2/mct.h
+++ b/src/lib/openjp2/mct.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
@@ -100,7 +108,7 @@ FIXME DOC
 @param is_signed        tells if the data is signed
 @return OPJ_FALSE if function encounter a problem, OPJ_TRUE otherwise
 */
-opj_bool opj_mct_encode_custom(
+OPJ_BOOL opj_mct_encode_custom(
                                           OPJ_BYTE * p_coding_data,
                                           OPJ_UINT32 n,
                                           OPJ_BYTE ** p_data,
@@ -115,7 +123,7 @@ FIXME DOC
 @param isSigned         tells if the data is signed
 @return OPJ_FALSE if function encounter a problem, OPJ_TRUE otherwise
 */
-opj_bool opj_mct_decode_custom(
+OPJ_BOOL opj_mct_decode_custom(
                                           OPJ_BYTE * pDecodingData,
                                           OPJ_UINT32 n,
                                           OPJ_BYTE ** pData,