[2.0] Backport all changes since r2798 (included) from trunk

[openjpeg.git] / src / lib / openmj2 / jp2.h

diff --git a/src/lib/openmj2/jp2.h b/src/lib/openmj2/jp2.h
index ec5e7705458c088c36ef4b95eea9d760e9dcbaa6..f1b9c0d3c10b14acea6de5b91b659cfbfbedf6ea 100644 (file)
--- a/src/lib/openmj2/jp2.h
+++ b/src/lib/openmj2/jp2.h
@@ -1,6 +1,11 @@
 /*
- * 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) 2002-2003, Yannick Verschueren
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.