summaryrefslogtreecommitdiff
path: root/src/lib/openjp2/openjpeg.c
diff options
context:
space:
mode:
authorAntonin Descampe <antonin@gmail.com>2014-04-03 15:30:57 +0000
committerAntonin Descampe <antonin@gmail.com>2014-04-03 15:30:57 +0000
commitd19a4ab6768c48b542c0add922eba0dcddae9ffe (patch)
tree10bccab2098c5b4929e2e3eaf48ecc502cb76dae /src/lib/openjp2/openjpeg.c
parentf105cb54717cc50e49838d8ecd71efb31a8da73f (diff)
[trunk] updated copyright and added copyright notice required by ISO, in each file; updated AUTHORS, NEWS
Diffstat (limited to 'src/lib/openjp2/openjpeg.c')
-rw-r--r--src/lib/openjp2/openjpeg.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/openjp2/openjpeg.c b/src/lib/openjp2/openjpeg.c
index dfb8093c..89bb75a5 100644
--- a/src/lib/openjp2/openjpeg.c
+++ b/src/lib/openjp2/openjpeg.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.
*