summaryrefslogtreecommitdiff
path: root/src/lib/openjp2/event.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 /src/lib/openjp2/event.c
parentd7c5c8518f9c9defdff3e0df034fbcac7d8557b8 (diff)
[2.0] Backport all changes since r2798 (included) from trunkopenjpeg-2.0
Diffstat (limited to 'src/lib/openjp2/event.c')
-rw-r--r--src/lib/openjp2/event.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/openjp2/event.c b/src/lib/openjp2/event.c
index 42f59f0f..b6034b42 100644
--- a/src/lib/openjp2/event.c
+++ b/src/lib/openjp2/event.c
@@ -1,6 +1,11 @@
/*
+ * 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) 2005, Herve Drolon, FreeImage Team
- * Copyright (c) 2008;2011-2012, Centre National d'Etudes Spatiales (CNES), France
+ * Copyright (c) 2008, 2011-2012, Centre National d'Etudes Spatiales (CNES), FR
* Copyright (c) 2012, CS Systemes d'Information, France
* All rights reserved.
*