From 52296999f6779194d2f3cb23ea7d2ce8b250f430 Mon Sep 17 00:00:00 2001
From: Francois-Olivier Devaux <fodevaux@users.noreply.github.com>
Date: Tue, 4 Mar 2008 10:56:03 +0000
Subject: [PATCH] Changed Java files copyright in JavaOpenJPEG module

---
 ChangeLog                                     |  3 ++
 .../org/openJpeg/OpenJPEGJavaDecoder.java     | 34 +++++++++++++++----
 .../org/openJpeg/OpenJPEGJavaEncoder.java     | 34 +++++++++++++++----
 3 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a37ef984..9af7d358 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+March 4, 2008
+! [FOD] Changed Java files copyright in JavaOpenJPEG module
+
 February 28, 2008
 * [FOD] Fixed openjpeg.c for proper initialization of codec context structures (dinfo in opj_create_compress() 
 		and opj_create_decompress(). Bug fix suggested by Andrey V. Kiselev
diff --git a/JavaOpenJPEG/java sources/org/openJpeg/OpenJPEGJavaDecoder.java b/JavaOpenJPEG/java sources/org/openJpeg/OpenJPEGJavaDecoder.java
index f976c27c..0bacc84f 100644
--- a/JavaOpenJPEG/java sources/org/openJpeg/OpenJPEGJavaDecoder.java	
+++ b/JavaOpenJPEG/java sources/org/openJpeg/OpenJPEGJavaDecoder.java	
@@ -1,10 +1,30 @@
-/* 
- * $Id: $ 
- * 
- * Copyright (c) 1999-2007 Telemis SA. All Rights Reserved 
-
- * Author: Patrick Piscaglia, Telemis s.a.
-*/ 
+/*
+ * 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-2007, Patrick Piscaglia, Telemis s.a.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */ 
 package org.openJpeg;
 
 import java.util.Vector;
diff --git a/JavaOpenJPEG/java sources/org/openJpeg/OpenJPEGJavaEncoder.java b/JavaOpenJPEG/java sources/org/openJpeg/OpenJPEGJavaEncoder.java
index 6429534c..2c638cfa 100644
--- a/JavaOpenJPEG/java sources/org/openJpeg/OpenJPEGJavaEncoder.java	
+++ b/JavaOpenJPEG/java sources/org/openJpeg/OpenJPEGJavaEncoder.java	
@@ -1,10 +1,30 @@
-/* 
- * $Id: $ 
- * 
- * Copyright (c) 1999-2007 Telemis SA. All Rights Reserved 
- * 
- * Author: Patrick Piscaglia, Telemis s.a.
- */ 
+/*
+ * 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-2007, Patrick Piscaglia, Telemis s.a.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */  
 package org.openJpeg;
 
 import java.io.File;