X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=LICENSE;h=e8fa41040dfbe8be524cac5b1bb19d60c6eb0320;hb=cbee7891a0ee664dd83ca09553d2e30da716a883;hp=48469dff45e2f8b5a4b743e6d6850ad558b7c12f;hpb=8210b3c873084735a8f69cf250f6cefa8dfbd315;p=openjpeg.git diff --git a/LICENSE b/LICENSE index 48469dff..e8fa4104 100644 --- a/LICENSE +++ b/LICENSE @@ -1,11 +1,19 @@ /* - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq - * Copyright (c) 2003-2011, Antonin Descampe + * 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) 2003-2014, Antonin Descampe * Copyright (c) 2003-2009, Francois-Olivier Devaux * Copyright (c) 2005, Herve Drolon, FreeImage Team * Copyright (c) 2002-2003, Yannick Verschueren * Copyright (c) 2001-2003, David Janssens + * Copyright (c) 2011-2012, Centre National d'Etudes Spatiales (CNES), France + * Copyright (c) 2012, CS Systemes d'Information, France + * * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -28,4 +36,4 @@ * 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. - */ \ No newline at end of file + */