diff --git a/AUTHORS b/AUTHORS index dd765ac0..dd1ac08b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -5,6 +5,8 @@ David Janssens designed and implemented the first version of OpenJPEG. Kaori Hagihara designed and implemented the first version of OpenJPIP. Jerome Fimes implemented the alpha version of OpenJPEG v2. Giuseppe Baruffa added the JPWL functionalities. +Mickaël Savinaud implemented the final OpenJPEG v2 version based on a big merge between 1.5 version and alpha version of v2. +Mathieu Malaterre participate to the OpenJPEG v2 version and release the OpenJPEG 1.5 and 1.5.1 version. Yannick Verschueren, Herve Drolon, Francois-Olivier Devaux, diff --git a/LICENSE b/LICENSE index f7b3b662..f578e33a 100644 --- a/LICENSE +++ b/LICENSE @@ -6,6 +6,9 @@ * 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 diff --git a/THANKS b/THANKS index c0d136ae..27a35aa4 100644 --- a/THANKS +++ b/THANKS @@ -4,13 +4,11 @@ Many people have contributed to OpenJPEG by reporting problems, suggesting vario or submitting actual code. Here is a list of these people. Help me keep it complete and exempt of errors. -Mathieu Malaterre Winfried Szukalski Vincent Torri Bob Friesenhahn Callum Lerwick Dzonatas Sol -Mickaël Savinaud Julien Malik Jerôme Fimes Herve Drolon @@ -31,3 +29,5 @@ Arnaud Maye Rex Dieter David Burken Parvatha Elangovan +Hans Johnson +Luc Hermitte \ No newline at end of file diff --git a/src/bin/jp2/opj_compress.c b/src/bin/jp2/opj_compress.c index f03e56d3..93a86c62 100644 --- a/src/bin/jp2/opj_compress.c +++ b/src/bin/jp2/opj_compress.c @@ -7,6 +7,8 @@ * Copyright (c) 2005, Herve Drolon, FreeImage Team * Copyright (c) 2006-2007, Parvatha Elangovan * Copyright (c) 2008, Jerome Fimes, Communications & Systemes + * 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/bin/jp2/opj_decompress.c b/src/bin/jp2/opj_decompress.c index c8f87671..df2978db 100644 --- a/src/bin/jp2/opj_decompress.c +++ b/src/bin/jp2/opj_decompress.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/bin/jp2/opj_dump.c b/src/bin/jp2/opj_dump.c index c7223e40..2bc1893a 100644 --- a/src/bin/jp2/opj_dump.c +++ b/src/bin/jp2/opj_dump.c @@ -1,6 +1,7 @@ /* * Copyright (c) 2010, Mathieu Malaterre, GDCM - * Copyright (c) 2011, Mickael Savinaud, Communications & Systemes + * 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/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 * Copyright (c) 2006-2007, Parvatha Elangovan * Copyright (c) 2010-2011, Kaori Hagihara - * Copyright (c) 2011-2012, Mickael Savinaud, Communications & Systemes + * 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 - * Copyright (c) 2011, Mickael Savinaud, Communications & Systemes + * 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 * Copyright (c) 2010-2011, Kaori Hagihara - * Copyright (c) 2011, Mickael Savinaud, Communications & Systemes + * 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 + * 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/tests/comparePGXimages.c b/tests/comparePGXimages.c index 13cbd3cb..7a6d4ae7 100644 --- a/tests/comparePGXimages.c +++ b/tests/comparePGXimages.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Mickael Savinaud, Communications & Systemes + * Copyright (c) 2011-2012, Centre National d'Etudes Spatiales (CNES), France * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/tests/compareRAWimages.c b/tests/compareRAWimages.c index 53e423b8..32575c68 100644 --- a/tests/compareRAWimages.c +++ b/tests/compareRAWimages.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Mickael Savinaud, Communications & Systemes + * Copyright (c) 2011-2012, Centre National d'Etudes Spatiales (CNES), France * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/tests/compare_dump_files.c b/tests/compare_dump_files.c index fa477495..6bc5145b 100644 --- a/tests/compare_dump_files.c +++ b/tests/compare_dump_files.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Mickael Savinaud, Communications & Systemes + * Copyright (c) 2011-2012, Centre National d'Etudes Spatiales (CNES), France * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/tests/j2k_random_tile_access.c b/tests/j2k_random_tile_access.c index c99555bd..afe4bd41 100644 --- a/tests/j2k_random_tile_access.c +++ b/tests/j2k_random_tile_access.c @@ -1,11 +1,6 @@ /* - * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2007, Professor Benoit Macq - * Copyright (c) 2001-2003, David Janssens - * 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) 2006-2007, Parvatha Elangovan + * 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