diff options
| author | Antonin Descampe <antonin@gmail.com> | 2014-04-10 11:36:37 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2014-04-10 11:36:37 +0000 |
| commit | 5c2a08edd71f75e5aa6b5240b152d9b395523e7e (patch) | |
| tree | 45ae8ab3b0629b96930b5a2c26fc20a088212d6a /src/lib/openjp2/jp2.h | |
| parent | d7c5c8518f9c9defdff3e0df034fbcac7d8557b8 (diff) | |
[2.0] Backport all changes since r2798 (included) from trunkopenjpeg-2.0
Diffstat (limited to 'src/lib/openjp2/jp2.h')
| -rw-r--r-- | src/lib/openjp2/jp2.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/lib/openjp2/jp2.h b/src/lib/openjp2/jp2.h index e793d9a1..c11d2f31 100644 --- a/src/lib/openjp2/jp2.h +++ b/src/lib/openjp2/jp2.h @@ -1,9 +1,14 @@ /* - * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2007, Professor Benoit Macq + * 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) 2002-2014, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2014, Professor Benoit Macq * Copyright (c) 2002-2003, Yannick Verschueren * 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. * |