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

12 files changed, 57 insertions, 2 deletions

diff --git a/src/bin/wx/OPJViewer/source/OPJAbout.cpp b/src/bin/wx/OPJViewer/source/OPJAbout.cpp
index f988c727..1f701e26 100644
--- a/src/bin/wx/OPJViewer/source/OPJAbout.cpp
+++ b/src/bin/wx/OPJViewer/source/OPJAbout.cpp
@@ -1,4 +1,9 @@
 /*
+ * 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) 2007, Digital Signal Processing Laboratory, Universita'  degli studi di Perugia (UPG), Italy
  * All rights reserved.
  *
diff --git a/src/bin/wx/OPJViewer/source/OPJDialogs.cpp b/src/bin/wx/OPJViewer/source/OPJDialogs.cpp
index ff96da9c..953cb7ea 100644
--- a/src/bin/wx/OPJViewer/source/OPJDialogs.cpp
+++ b/src/bin/wx/OPJViewer/source/OPJDialogs.cpp
@@ -1,4 +1,9 @@
 /*
+ * 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) 2007, Digital Signal Processing Laboratory, Universita'  degli studi di Perugia (UPG), Italy
  * All rights reserved.
  *
diff --git a/src/bin/wx/OPJViewer/source/OPJThreads.cpp b/src/bin/wx/OPJViewer/source/OPJThreads.cpp
index 14159ac9..e3533a72 100644
--- a/src/bin/wx/OPJViewer/source/OPJThreads.cpp
+++ b/src/bin/wx/OPJViewer/source/OPJThreads.cpp
@@ -1,4 +1,9 @@
 /*
+ * 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) 2007, Digital Signal Processing Laboratory, Universita'  degli studi di Perugia (UPG), Italy
  * All rights reserved.
  *
diff --git a/src/bin/wx/OPJViewer/source/OPJViewer.cpp b/src/bin/wx/OPJViewer/source/OPJViewer.cpp
index 8476d919..bb1ea05d 100644
--- a/src/bin/wx/OPJViewer/source/OPJViewer.cpp
+++ b/src/bin/wx/OPJViewer/source/OPJViewer.cpp
@@ -1,4 +1,9 @@
 /*
+ * 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) 2007, Digital Signal Processing Laboratory, Universita' degli studi di Perugia (UPG), Italy
  * All rights reserved.
  *
diff --git a/src/bin/wx/OPJViewer/source/OPJViewer.h b/src/bin/wx/OPJViewer/source/OPJViewer.h
index f8a7f8df..0d49468a 100644
--- a/src/bin/wx/OPJViewer/source/OPJViewer.h
+++ b/src/bin/wx/OPJViewer/source/OPJViewer.h
@@ -1,4 +1,9 @@
 /*
+ * 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) 2007, Digital Signal Processing Laboratory, Universita degli studi di Perugia (UPG), Italy
  * All rights reserved.
  *
diff --git a/src/bin/wx/OPJViewer/source/imagjpeg2000.cpp b/src/bin/wx/OPJViewer/source/imagjpeg2000.cpp
index c1f0a02e..d9f89968 100644
--- a/src/bin/wx/OPJViewer/source/imagjpeg2000.cpp
+++ b/src/bin/wx/OPJViewer/source/imagjpeg2000.cpp
@@ -1,4 +1,9 @@
 /*
+ * 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) 2007, Digital Signal Processing Laboratory, Universitą degli studi di Perugia (UPG), Italy
  * All rights reserved.
  *
diff --git a/src/bin/wx/OPJViewer/source/imagjpeg2000.h b/src/bin/wx/OPJViewer/source/imagjpeg2000.h
index 6bb31c1b..945bba5a 100644
--- a/src/bin/wx/OPJViewer/source/imagjpeg2000.h
+++ b/src/bin/wx/OPJViewer/source/imagjpeg2000.h
@@ -1,4 +1,9 @@
 /*
+ * 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) 2007, Digital Signal Processing Laboratory, Universita degli studi di Perugia (UPG), Italy
  * All rights reserved.
  *
diff --git a/src/bin/wx/OPJViewer/source/imagmxf.cpp b/src/bin/wx/OPJViewer/source/imagmxf.cpp
index ccfa9f9f..4bf3ce37 100644
--- a/src/bin/wx/OPJViewer/source/imagmxf.cpp
+++ b/src/bin/wx/OPJViewer/source/imagmxf.cpp
@@ -1,4 +1,9 @@
 /*
+ * 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) 2007, Digital Signal Processing Laboratory, Universitą degli studi di Perugia (UPG), Italy
  * All rights reserved.
  *
diff --git a/src/bin/wx/OPJViewer/source/imagmxf.h b/src/bin/wx/OPJViewer/source/imagmxf.h
index 62158b4f..e4cb35df 100644
--- a/src/bin/wx/OPJViewer/source/imagmxf.h
+++ b/src/bin/wx/OPJViewer/source/imagmxf.h
@@ -1,4 +1,9 @@
 /*
+ * 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) 2007, Digital Signal Processing Laboratory, Universita degli studi di Perugia (UPG), Italy
  * All rights reserved.
  *
diff --git a/src/bin/wx/OPJViewer/source/license.txt b/src/bin/wx/OPJViewer/source/license.txt
index 6409db44..919566d1 100644
--- a/src/bin/wx/OPJViewer/source/license.txt
+++ b/src/bin/wx/OPJViewer/source/license.txt
@@ -1,5 +1,5 @@
-Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
-Copyright (c) 2002-2007, Professor Benoit Macq
+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
diff --git a/src/bin/wx/OPJViewer/source/wxj2kparser.cpp b/src/bin/wx/OPJViewer/source/wxj2kparser.cpp
index 284c568a..7c85d873 100644
--- a/src/bin/wx/OPJViewer/source/wxj2kparser.cpp
+++ b/src/bin/wx/OPJViewer/source/wxj2kparser.cpp
@@ -1,4 +1,9 @@
 /*
+ * 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) 2007, Digital Signal Processing Laboratory, Universitą degli studi di Perugia (UPG), Italy
  * All rights reserved.
  *
diff --git a/src/bin/wx/OPJViewer/source/wxjp2parser.cpp b/src/bin/wx/OPJViewer/source/wxjp2parser.cpp
index 182def8b..853c648d 100644
--- a/src/bin/wx/OPJViewer/source/wxjp2parser.cpp
+++ b/src/bin/wx/OPJViewer/source/wxjp2parser.cpp
@@ -1,4 +1,9 @@
 /*
+ * 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) 2007, Digital Signal Processing Laboratory, Universitą degli studi di Perugia (UPG), Italy
  * All rights reserved.
  *