diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-11-15 15:22:29 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-11-15 15:22:29 +0000 |
| commit | d5efeb7df5ba7d5c2d984678cc11ae64b43933b4 (patch) | |
| tree | 81b83d1d4b19c41c05065b8da50a56d5e69bfc7a /src/lib | |
| parent | f663042893ad9b4ca81e0309fd336f8b659b3426 (diff) | |
[trunk]update the copyright, the authors and thanks to respect the license
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/openjp2/cio.c | 2 | ||||
| -rw-r--r-- | src/lib/openjp2/cio.h | 2 | ||||
| -rw-r--r-- | src/lib/openjp2/event.c | 2 | ||||
| -rw-r--r-- | src/lib/openjp2/event.h | 2 | ||||
| -rw-r--r-- | src/lib/openjp2/j2k.c | 3 | ||||
| -rw-r--r-- | src/lib/openjp2/j2k.h | 3 | ||||
| -rw-r--r-- | src/lib/openjp2/jp2.c | 2 | ||||
| -rw-r--r-- | src/lib/openjp2/jp2.h | 2 | ||||
| -rw-r--r-- | src/lib/openjp2/mct.c | 2 | ||||
| -rw-r--r-- | src/lib/openjp2/mct.h | 2 | ||||
| -rw-r--r-- | src/lib/openjp2/openjpeg.c | 2 | ||||
| -rw-r--r-- | src/lib/openjp2/openjpeg.h | 3 | ||||
| -rw-r--r-- | src/lib/openjp2/opj_includes.h | 2 | ||||
| -rw-r--r-- | src/lib/openjp2/t2.c | 2 | ||||
| -rw-r--r-- | src/lib/openjp2/t2.h | 2 | ||||
| -rw-r--r-- | src/lib/openjp2/tcd.c | 2 | ||||
| -rw-r--r-- | src/lib/openjp2/tcd.h | 2 | ||||
| -rw-r--r-- | src/lib/openjp2/tgt.c | 2 | ||||
| -rw-r--r-- | src/lib/openjp2/tgt.h | 2 |
19 files changed, 38 insertions, 3 deletions
diff --git a/src/lib/openjp2/cio.c b/src/lib/openjp2/cio.c index 9f93f841..e6ba8362 100644 --- a/src/lib/openjp2/cio.c +++ b/src/lib/openjp2/cio.c @@ -5,6 +5,8 @@ * Copyright (c) 2002-2003, Yannick Verschueren * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team + * Copyright (c) 2008;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 diff --git a/src/lib/openjp2/cio.h b/src/lib/openjp2/cio.h index 81f6fcfa..8e162a16 100644 --- a/src/lib/openjp2/cio.h +++ b/src/lib/openjp2/cio.h @@ -5,6 +5,8 @@ * Copyright (c) 2002-2003, Yannick Verschueren * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team + * Copyright (c) 2008;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 diff --git a/src/lib/openjp2/event.c b/src/lib/openjp2/event.c index 27b8b712..d23907dd 100644 --- a/src/lib/openjp2/event.c +++ b/src/lib/openjp2/event.c @@ -1,5 +1,7 @@ /* * Copyright (c) 2005, Herve Drolon, FreeImage Team + * Copyright (c) 2008;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 diff --git a/src/lib/openjp2/event.h b/src/lib/openjp2/event.h index 9b2a657e..bc1d575d 100644 --- a/src/lib/openjp2/event.h +++ b/src/lib/openjp2/event.h @@ -1,5 +1,7 @@ /* * Copyright (c) 2005, Herve Drolon, FreeImage Team + * Copyright (c) 2008;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 diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c index a63466a8..495eaaf1 100644 --- a/src/lib/openjp2/j2k.c +++ b/src/lib/openjp2/j2k.c @@ -8,7 +8,8 @@ * Copyright (c) 2008, Jerome Fimes, Communications & Systemes <jerome.fimes@c-s.fr> * Copyright (c) 2006-2007, Parvatha Elangovan * Copyright (c) 2010-2011, Kaori Hagihara - * Copyright (c) 2011-2012, Mickael Savinaud, Communications & Systemes <mickael.savinaud@c-s.fr> + * 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 diff --git a/src/lib/openjp2/j2k.h b/src/lib/openjp2/j2k.h index 70abd075..dda4db5d 100644 --- a/src/lib/openjp2/j2k.h +++ b/src/lib/openjp2/j2k.h @@ -7,7 +7,8 @@ * Copyright (c) 2005, Herve Drolon, FreeImage Team * Copyright (c) 2006-2007, Parvatha Elangovan * Copyright (c) 2008, Jerome Fimes, Communications & Systemes <jerome.fimes@c-s.fr> - * Copyright (c) 2011, Mickael Savinaud, Communications & Systemes <mickael.savinaud@c-s.fr> + * Copyright (c) 2011-2012, Centre National d'Etudes Spatiales (CNES), France + * Copyright (c) 2012, CS Systemes d'Information, France * * All rights reserved. * diff --git a/src/lib/openjp2/jp2.c b/src/lib/openjp2/jp2.c index 730d7f9d..b4a33638 100644 --- a/src/lib/openjp2/jp2.c +++ b/src/lib/openjp2/jp2.c @@ -6,6 +6,8 @@ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team * Copyright (c) 2010-2011, Kaori Hagihara + * Copyright (c) 2008;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 diff --git a/src/lib/openjp2/jp2.h b/src/lib/openjp2/jp2.h index 0abf8e09..e793d9a1 100644 --- a/src/lib/openjp2/jp2.h +++ b/src/lib/openjp2/jp2.h @@ -3,6 +3,8 @@ * Copyright (c) 2002-2007, 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) 2012, CS Systemes d'Information, France * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/lib/openjp2/mct.c b/src/lib/openjp2/mct.c index 8d3c59ce..5e933ce5 100644 --- a/src/lib/openjp2/mct.c +++ b/src/lib/openjp2/mct.c @@ -5,6 +5,8 @@ * Copyright (c) 2002-2003, Yannick Verschueren * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team + * Copyright (c) 2008;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 diff --git a/src/lib/openjp2/mct.h b/src/lib/openjp2/mct.h index c5c3041f..1764e2b1 100644 --- a/src/lib/openjp2/mct.h +++ b/src/lib/openjp2/mct.h @@ -5,6 +5,8 @@ * Copyright (c) 2002-2003, Yannick Verschueren * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team + * Copyright (c) 2008;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 diff --git a/src/lib/openjp2/openjpeg.c b/src/lib/openjp2/openjpeg.c index 20f3ca0e..da034c5e 100644 --- a/src/lib/openjp2/openjpeg.c +++ b/src/lib/openjp2/openjpeg.c @@ -1,5 +1,7 @@ /* * Copyright (c) 2005, Herve Drolon, FreeImage Team + * Copyright (c) 2008;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 diff --git a/src/lib/openjp2/openjpeg.h b/src/lib/openjp2/openjpeg.h index e85e72fa..1fcc0fa5 100644 --- a/src/lib/openjp2/openjpeg.h +++ b/src/lib/openjp2/openjpeg.h @@ -8,7 +8,8 @@ * Copyright (c) 2006-2007, Parvatha Elangovan * Copyright (c) 2008, Jerome Fimes, Communications & Systemes <jerome.fimes@c-s.fr> * Copyright (c) 2010-2011, Kaori Hagihara - * Copyright (c) 2011, Mickael Savinaud, Communications & Systemes <mickael.savinaud@c-s.fr> + * 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 diff --git a/src/lib/openjp2/opj_includes.h b/src/lib/openjp2/opj_includes.h index 2301bc99..4397149a 100644 --- a/src/lib/openjp2/opj_includes.h +++ b/src/lib/openjp2/opj_includes.h @@ -1,5 +1,7 @@ /* * Copyright (c) 2005, Herve Drolon, FreeImage Team + * Copyright (c) 2008;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 diff --git a/src/lib/openjp2/t2.c b/src/lib/openjp2/t2.c index 8c0df60f..1895a5fb 100644 --- a/src/lib/openjp2/t2.c +++ b/src/lib/openjp2/t2.c @@ -5,6 +5,8 @@ * Copyright (c) 2002-2003, Yannick Verschueren * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team + * Copyright (c) 2008;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 diff --git a/src/lib/openjp2/t2.h b/src/lib/openjp2/t2.h index 38c0aab4..936073a5 100644 --- a/src/lib/openjp2/t2.h +++ b/src/lib/openjp2/t2.h @@ -5,6 +5,8 @@ * Copyright (c) 2002-2003, Yannick Verschueren * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team + * Copyright (c) 2008;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 diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c index db5ccb1e..9bc9d611 100644 --- a/src/lib/openjp2/tcd.c +++ b/src/lib/openjp2/tcd.c @@ -6,6 +6,8 @@ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team * Copyright (c) 2006-2007, Parvatha Elangovan + * Copyright (c) 2008;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 diff --git a/src/lib/openjp2/tcd.h b/src/lib/openjp2/tcd.h index 8889afce..0a540453 100644 --- a/src/lib/openjp2/tcd.h +++ b/src/lib/openjp2/tcd.h @@ -5,6 +5,8 @@ * Copyright (c) 2002-2003, Yannick Verschueren * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team + * Copyright (c) 2008;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 diff --git a/src/lib/openjp2/tgt.c b/src/lib/openjp2/tgt.c index c7343aad..c82b06ed 100644 --- a/src/lib/openjp2/tgt.c +++ b/src/lib/openjp2/tgt.c @@ -5,6 +5,8 @@ * Copyright (c) 2002-2003, Yannick Verschueren * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team + * Copyright (c) 2008;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 diff --git a/src/lib/openjp2/tgt.h b/src/lib/openjp2/tgt.h index 0c51d4c4..0eeb304e 100644 --- a/src/lib/openjp2/tgt.h +++ b/src/lib/openjp2/tgt.h @@ -6,6 +6,8 @@ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team * Copyright (c) 2008, Jerome Fimes, Communications & Systemes <jerome.fimes@c-s.fr> + * 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 |
