summaryrefslogtreecommitdiff
path: root/wrapping/java/openjp2/JavaOpenJPEGDecoder.c
diff options
context:
space:
mode:
authorAntonin Descampe <antonin@gmail.com>2014-04-10 11:36:37 +0000
committerAntonin Descampe <antonin@gmail.com>2014-04-10 11:36:37 +0000
commit5c2a08edd71f75e5aa6b5240b152d9b395523e7e (patch)
tree45ae8ab3b0629b96930b5a2c26fc20a088212d6a /wrapping/java/openjp2/JavaOpenJPEGDecoder.c
parentd7c5c8518f9c9defdff3e0df034fbcac7d8557b8 (diff)
[2.0] Backport all changes since r2798 (included) from trunkopenjpeg-2.0
Diffstat (limited to 'wrapping/java/openjp2/JavaOpenJPEGDecoder.c')
-rw-r--r--wrapping/java/openjp2/JavaOpenJPEGDecoder.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/wrapping/java/openjp2/JavaOpenJPEGDecoder.c b/wrapping/java/openjp2/JavaOpenJPEGDecoder.c
index 321b592f..80e09c39 100644
--- a/wrapping/java/openjp2/JavaOpenJPEGDecoder.c
+++ b/wrapping/java/openjp2/JavaOpenJPEGDecoder.c
@@ -1,9 +1,10 @@
/*
- * 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
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
+ * Copyright (c) 2003-2014, Antonin Descampe
* Copyright (c) 2005, Herve Drolon, FreeImage Team
* Copyright (c) 2006-2007, Parvatha Elangovan
* Copyright (c) 2007, Patrick Piscaglia (Telemis)