diff options
Diffstat (limited to 'src/bin')
50 files changed, 372 insertions, 120 deletions
diff --git a/src/bin/common/color.c b/src/bin/common/color.c index 47eefa0b..cea35041 100644 --- a/src/bin/common/color.c +++ b/src/bin/common/color.c @@ -1,9 +1,15 @@ /* - * 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) 2001-2003, David Janssens * Copyright (c) 2002-2003, Yannick Verschueren - * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe + * Copyright (c) 2003-2007, Francois-Olivier Devaux + * Copyright (c) 2003-2014, Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team * All rights reserved. * diff --git a/src/bin/common/color.h b/src/bin/common/color.h index 26117b02..da8c6e7b 100644 --- a/src/bin/common/color.h +++ b/src/bin/common/color.h @@ -1,9 +1,15 @@ /* - * 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) 2001-2003, David Janssens * Copyright (c) 2002-2003, Yannick Verschueren - * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe + * Copyright (c) 2003-2007, Francois-Olivier Devaux + * Copyright (c) 2003-2014, Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team * All rights reserved. * diff --git a/src/bin/common/format_defs.h b/src/bin/common/format_defs.h index 386f21dc..608d7b3a 100644 --- a/src/bin/common/format_defs.h +++ b/src/bin/common/format_defs.h @@ -1,9 +1,15 @@ /* - * 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) 2001-2003, David Janssens * Copyright (c) 2002-2003, Yannick Verschueren - * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe + * Copyright (c) 2003-2007, Francois-Olivier Devaux + * Copyright (c) 2003-2014, Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team * All rights reserved. * diff --git a/src/bin/common/opj_getopt.c b/src/bin/common/opj_getopt.c index 6fcead46..100cded7 100644 --- a/src/bin/common/opj_getopt.c +++ b/src/bin/common/opj_getopt.c @@ -1,4 +1,9 @@ /* + * The copyright in this software is being made available under the 3-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) 1987, 1993, 1994 * The Regents of the University of California. All rights reserved. * diff --git a/src/bin/jp2/convert.c b/src/bin/jp2/convert.c index d3e9773c..b41618c7 100644 --- a/src/bin/jp2/convert.c +++ b/src/bin/jp2/convert.c @@ -1,9 +1,15 @@ /* - * 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) 2001-2003, David Janssens * Copyright (c) 2002-2003, Yannick Verschueren - * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe + * Copyright (c) 2003-2007, Francois-Olivier Devaux + * Copyright (c) 2003-2014, Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team * Copyright (c) 2006-2007, Parvatha Elangovan * All rights reserved. @@ -2953,9 +2959,11 @@ static opj_image_t* rawtoimage_common(const char *filename, opj_cparameters_t *p { fprintf(stderr,"\nError: invalid raw image parameters\n"); fprintf(stderr,"Please use the Format option -F:\n"); - fprintf(stderr,"-F rawWidth,rawHeight,rawComp,rawBitDepth,s/u (Signed/Unsigned)\n"); - fprintf(stderr,"Example: -i lena.raw -o lena.j2k -F 512,512,3,8,u\n"); - fprintf(stderr,"Aborting\n"); + fprintf(stderr,"-F <width>,<height>,<ncomp>,<bitdepth>,{s,u}@<dx1>x<dy1>:...:<dxn>x<dyn>\n"); + fprintf(stderr,"If subsampling is omitted, 1x1 is assumed for all components\n"); + fprintf(stderr,"Example: -i image.raw -o image.j2k -F 512,512,3,8,u@1x1:2x2:2x2\n"); + fprintf(stderr," for raw 512x512 image with 4:2:0 subsampling\n"); + fprintf(stderr,"Aborting.\n"); return NULL; } @@ -2966,7 +2974,17 @@ static opj_image_t* rawtoimage_common(const char *filename, opj_cparameters_t *p return NULL; } numcomps = raw_cp->rawComp; - color_space = OPJ_CLRSPC_SRGB; + + /* FIXME ADE at this point, tcp_mct has not been properly set in calling function */ + if (numcomps == 0) { + color_space = OPJ_CLRSPC_GRAY; + } else if ((numcomps >= 3) && (parameters->tcp_mct == 0)) { + color_space = OPJ_CLRSPC_SYCC; + } else if ((numcomps >= 3) && (parameters->tcp_mct != 2)) { + color_space = OPJ_CLRSPC_SRGB; + } else { + color_space = OPJ_CLRSPC_UNKNOWN; + } w = raw_cp->rawWidth; h = raw_cp->rawHeight; cmptparm = (opj_image_cmptparm_t*) malloc((size_t)numcomps * sizeof(opj_image_cmptparm_t)); @@ -2977,8 +2995,8 @@ static opj_image_t* rawtoimage_common(const char *filename, opj_cparameters_t *p cmptparm[i].prec = (OPJ_UINT32)raw_cp->rawBitDepth; cmptparm[i].bpp = (OPJ_UINT32)raw_cp->rawBitDepth; cmptparm[i].sgnd = (OPJ_UINT32)raw_cp->rawSigned; - cmptparm[i].dx = (OPJ_UINT32)subsampling_dx; - cmptparm[i].dy = (OPJ_UINT32)subsampling_dy; + cmptparm[i].dx = (OPJ_UINT32)(subsampling_dx * raw_cp->rawComps[i].dx); + cmptparm[i].dy = (OPJ_UINT32)(subsampling_dy * raw_cp->rawComps[i].dy); cmptparm[i].w = (OPJ_UINT32)w; cmptparm[i].h = (OPJ_UINT32)h; } @@ -2999,7 +3017,8 @@ static opj_image_t* rawtoimage_common(const char *filename, opj_cparameters_t *p { unsigned char value = 0; for(compno = 0; compno < numcomps; compno++) { - for (i = 0; i < w * h; i++) { + int nloop = (w*h)/(raw_cp->rawComps[compno].dx*raw_cp->rawComps[compno].dx); + for (i = 0; i < nloop; i++) { if (!fread(&value, 1, 1, f)) { fprintf(stderr,"Error reading raw file. End of file probably reached.\n"); return NULL; @@ -3012,7 +3031,8 @@ static opj_image_t* rawtoimage_common(const char *filename, opj_cparameters_t *p { unsigned short value; for(compno = 0; compno < numcomps; compno++) { - for (i = 0; i < w * h; i++) { + int nloop = (w*h)/(raw_cp->rawComps[compno].dx*raw_cp->rawComps[compno].dx); + for (i = 0; i < nloop; i++) { unsigned char temp1; unsigned char temp2; if (!fread(&temp1, 1, 1, f)) { diff --git a/src/bin/jp2/convert.h b/src/bin/jp2/convert.h index 11bc31ee..ec498eeb 100644 --- a/src/bin/jp2/convert.h +++ b/src/bin/jp2/convert.h @@ -1,9 +1,15 @@ /* - * 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) 2001-2003, David Janssens * Copyright (c) 2002-2003, Yannick Verschueren - * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe + * Copyright (c) 2003-2007, Francois-Olivier Devaux + * Copyright (c) 2003-2014, Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team * All rights reserved. * @@ -31,6 +37,16 @@ #ifndef __J2K_CONVERT_H #define __J2K_CONVERT_H +/**@name RAW component encoding parameters */ +/*@{*/ +typedef struct raw_comp_cparameters { + /** subsampling in X direction */ + int dx; + /** subsampling in Y direction */ + int dy; + /*@}*/ +} raw_comp_cparameters_t; + /**@name RAW image encoding parameters */ /*@{*/ typedef struct raw_cparameters { @@ -38,12 +54,14 @@ typedef struct raw_cparameters { int rawWidth; /** height of the raw image */ int rawHeight; - /** components of the raw image */ + /** number of components of the raw image */ int rawComp; - /** bit depth of the raw image */ - int rawBitDepth; - /** signed/unsigned raw image */ - OPJ_BOOL rawSigned; + /** bit depth of the raw image */ + int rawBitDepth; + /** signed/unsigned raw image */ + OPJ_BOOL rawSigned; + /** raw components parameters */ + raw_comp_cparameters_t *rawComps; /*@}*/ } raw_cparameters_t; diff --git a/src/bin/jp2/index.c b/src/bin/jp2/index.c index f7d6ce23..af6e1381 100644 --- a/src/bin/jp2/index.c +++ b/src/bin/jp2/index.c @@ -1,6 +1,11 @@ /* - * 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) 2003-2007, Francois-Olivier Devaux * All rights reserved. * diff --git a/src/bin/jp2/index.h b/src/bin/jp2/index.h index 6c2231dd..d8b448d0 100644 --- a/src/bin/jp2/index.h +++ b/src/bin/jp2/index.h @@ -1,6 +1,11 @@ /* - * 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) 2003-2007, Francois-Olivier Devaux * All rights reserved. * diff --git a/src/bin/jp2/opj_compress.c b/src/bin/jp2/opj_compress.c index ba1d8374..5fa0cc87 100644 --- a/src/bin/jp2/opj_compress.c +++ b/src/bin/jp2/opj_compress.c @@ -1,9 +1,15 @@ /* - * 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) 2001-2003, David Janssens * Copyright (c) 2002-2003, Yannick Verschueren - * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe + * Copyright (c) 2003-2007, Francois-Olivier Devaux + * Copyright (c) 2003-2014, Antonin Descampe * 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> @@ -209,7 +215,7 @@ static void encode_help_display(void) { fprintf(stdout," -F rawWidth,rawHeight,rawComp,rawBitDepth,s/u (Signed/Unsigned)\n"); fprintf(stdout," Example: -i lena.raw -o lena.j2k -F 512,512,3,8,u\n"); fprintf(stdout,"\n"); - fprintf(stdout,"-mct {0,1,2} : explicitely specifies if an Multiple Component Transform has to be used.\n"); + fprintf(stdout,"-mct {0,1,2} : explicitely specifies if a Multiple Component Transform has to be used.\n"); fprintf(stdout," 0: no MCT ; 1: RGB->YCC conversion ; 2: custom MCT.\n"); fprintf(stdout," If custom MCT, \"-m\" option has to be used (see hereunder).\n"); fprintf(stdout," By default, RGB->YCC conversion is used if there are 3 components or more,\n"); @@ -569,31 +575,82 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param case 'F': /* Raw image format parameters */ { + OPJ_BOOL wrong = OPJ_FALSE; + char *substr1; + char *substr2; + char *sep; char signo; - char *s = opj_optarg; - if (sscanf(s, "%d,%d,%d,%d,%c", &raw_cp->rawWidth, &raw_cp->rawHeight, &raw_cp->rawComp, &raw_cp->rawBitDepth, &signo) == 5) { + int width,height,bitdepth,ncomp; + OPJ_UINT32 len; + OPJ_BOOL raw_signed; + substr2 = strchr(opj_optarg,'@'); + if (substr2 == NULL) { + len = (OPJ_UINT32) strlen(opj_optarg); + } else { + len = (OPJ_UINT32) (substr2 - opj_optarg); + substr2++; /* skip '@' character */ + } + substr1 = (char*) malloc((len+1)*sizeof(char)); + memcpy(substr1,opj_optarg,len); + substr1[len] = '\0'; + if (sscanf(substr1, "%d,%d,%d,%d,%c", &width, &height, &ncomp, &bitdepth, &signo) == 5) { if (signo == 's') { - raw_cp->rawSigned = OPJ_TRUE; - fprintf(stdout,"\nRaw file parameters: %d,%d,%d,%d Signed\n", raw_cp->rawWidth, raw_cp->rawHeight, raw_cp->rawComp, raw_cp->rawBitDepth); - } - else if (signo == 'u') { - raw_cp->rawSigned = OPJ_FALSE; - fprintf(stdout,"\nRaw file parameters: %d,%d,%d,%d Unsigned\n", raw_cp->rawWidth, raw_cp->rawHeight, raw_cp->rawComp, raw_cp->rawBitDepth); + raw_signed = OPJ_TRUE; + } else if (signo == 'u') { + raw_signed = OPJ_FALSE; + } else { + wrong = OPJ_TRUE; } - else { - fprintf(stderr,"\nError: invalid raw image parameters: Unknown sign of raw file\n"); - fprintf(stderr,"Please use the Format option -F:\n"); - fprintf(stderr,"-F rawWidth,rawHeight,rawComp,rawBitDepth,s/u (Signed/Unsigned)\n"); - fprintf(stderr,"Example: -i lena.raw -o lena.j2k -F 512,512,3,8,u\n"); - fprintf(stderr,"Aborting\n"); + } else { + wrong = OPJ_TRUE; + } + if (!wrong) { + int i; + int lastdx = 1; + int lastdy = 1; + raw_cp->rawWidth = width; + raw_cp->rawHeight = height; + raw_cp->rawComp = ncomp; + raw_cp->rawBitDepth = bitdepth; + raw_cp->rawSigned = raw_signed; + raw_cp->rawComps = (raw_comp_cparameters_t*) malloc(((OPJ_UINT32)(ncomp))*sizeof(raw_comp_cparameters_t)); + for (i = 0; i < ncomp && !wrong; i++) { + if (substr2 == NULL) { + raw_cp->rawComps[i].dx = lastdx; + raw_cp->rawComps[i].dy = lastdy; + } else { + int dx,dy; + sep = strchr(substr2,':'); + if (sep == NULL) { + if (sscanf(substr2, "%dx%d", &dx, &dy) == 2) { + lastdx = dx; + lastdy = dy; + raw_cp->rawComps[i].dx = dx; + raw_cp->rawComps[i].dy = dy; + substr2 = NULL; + } else { + wrong = OPJ_TRUE; + } + } else { + if (sscanf(substr2, "%dx%d:%s", &dx, &dy, substr2) == 3) { + raw_cp->rawComps[i].dx = dx; + raw_cp->rawComps[i].dy = dy; + } else { + wrong = OPJ_TRUE; + } + } + } } } - else { + if (substr1) free(substr1); + if (wrong) { fprintf(stderr,"\nError: invalid raw image parameters\n"); fprintf(stderr,"Please use the Format option -F:\n"); - fprintf(stderr,"-F rawWidth,rawHeight,rawComp,rawBitDepth,s/u (Signed/Unsigned)\n"); - fprintf(stderr,"Example: -i lena.raw -o lena.j2k -F 512,512,3,8,u\n"); - fprintf(stderr,"Aborting\n"); + fprintf(stderr,"-F <width>,<height>,<ncomp>,<bitdepth>,{s,u}@<dx1>x<dy1>:...:<dxn>x<dyn>\n"); + fprintf(stderr,"If subsampling is omitted, 1x1 is assumed for all components\n"); + fprintf(stderr,"Example: -i image.raw -o image.j2k -F 512,512,3,8,u@1x1:2x2:2x2\n"); + fprintf(stderr," for raw 512x512 image with 4:2:0 subsampling\n"); + fprintf(stderr,"Aborting.\n"); return 1; } } @@ -1476,8 +1533,16 @@ int main(int argc, char **argv) { *indexfilename = 0; memset(&img_fol,0,sizeof(img_fol_t)); + /* raw_cp initialization */ + raw_cp.rawBitDepth = 0; + raw_cp.rawComp = 0; + raw_cp.rawComps = 0; + raw_cp.rawHeight = 0; + raw_cp.rawSigned = 0; + raw_cp.rawWidth = 0; + /* parse input and get user encoding parameters */ - parameters.tcp_mct = -1; /* This will be set later according to the input image or the provided option */ + parameters.tcp_mct = (char) 255; /* This will be set later according to the input image or the provided option */ if(parse_cmdline_encoder(argc, argv, ¶meters,&img_fol, &raw_cp, indexfilename) == 1) { return 1; } @@ -1637,8 +1702,8 @@ int main(int argc, char **argv) { } /* Decide if MCT should be used */ - if (parameters.tcp_mct == -1) { /* mct mode has not been set in commandline */ - parameters.tcp_mct = image->numcomps >= 3 ? 1 : 0; + if (parameters.tcp_mct == (char) 255) { /* mct mode has not been set in commandline */ + parameters.tcp_mct = (image->numcomps >= 3) ? 1 : 0; } else { /* mct mode has been set in commandline */ if ((parameters.tcp_mct == 1) && (image->numcomps < 3)){ fprintf(stderr, "RGB->YCC conversion cannot be used:\n"); @@ -1761,6 +1826,7 @@ int main(int argc, char **argv) { /* free user parameters structure */ if(parameters.cp_comment) free(parameters.cp_comment); if(parameters.cp_matrice) free(parameters.cp_matrice); + if(raw_cp.rawComps) free(raw_cp.rawComps); return 0; } diff --git a/src/bin/jp2/opj_decompress.c b/src/bin/jp2/opj_decompress.c index 9adebd91..efab5170 100644 --- a/src/bin/jp2/opj_decompress.c +++ b/src/bin/jp2/opj_decompress.c @@ -1,12 +1,18 @@ /* - * 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) 2001-2003, David Janssens * Copyright (c) 2002-2003, Yannick Verschueren - * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe + * Copyright (c) 2003-2007, Francois-Olivier Devaux + * Copyright (c) 2003-2014, 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) 2008, 2011-2012, Centre National d'Etudes Spatiales (CNES), FR * Copyright (c) 2012, CS Systemes d'Information, France * All rights reserved. * @@ -222,7 +228,7 @@ int get_file_format(const char *filename) { if (ext == NULL) return -1; ext++; - if(ext) { + if(*ext) { for(i = 0; i < sizeof(format)/sizeof(*format); i++) { if(strcasecmp(ext, extension[i]) == 0) { return format[i]; diff --git a/src/bin/jp2/opj_dump.c b/src/bin/jp2/opj_dump.c index 7d2200a1..a764cf85 100644 --- a/src/bin/jp2/opj_dump.c +++ b/src/bin/jp2/opj_dump.c @@ -1,4 +1,9 @@ /* + * 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) 2010, Mathieu Malaterre, GDCM * Copyright (c) 2011-2012, Centre National d'Etudes Spatiales (CNES), France * Copyright (c) 2012, CS Systemes d'Information, France diff --git a/src/bin/jp3d/convert.c b/src/bin/jp3d/convert.c index dd62335d..e50f74a7 100755 --- a/src/bin/jp3d/convert.c +++ b/src/bin/jp3d/convert.c @@ -1,4 +1,9 @@ /* + * 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) 2001-2003, David Janssens * Copyright (c) 2002-2003, Yannick Verschueren * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe diff --git a/src/bin/jpip/opj_dec_server.c b/src/bin/jpip/opj_dec_server.c index ca3f22dd..f0b7fc13 100644 --- a/src/bin/jpip/opj_dec_server.c +++ b/src/bin/jpip/opj_dec_server.c @@ -1,8 +1,8 @@ /* * $Id: opj_dec_server.c 54 2011-05-10 13:22:47Z kaori $ * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq + * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2014, Professor Benoit Macq * Copyright (c) 2010-2011, Kaori Hagihara * All rights reserved. * diff --git a/src/bin/jpip/opj_jpip_addxml.c b/src/bin/jpip/opj_jpip_addxml.c index 84890b55..626fc5d1 100644 --- a/src/bin/jpip/opj_jpip_addxml.c +++ b/src/bin/jpip/opj_jpip_addxml.c @@ -1,8 +1,8 @@ /* * $Id: addXMLinJP2.c 46 2011-02-17 14:50:55Z kaori $ * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq + * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2014, Professor Benoit Macq * Copyright (c) 2010-2011, Kaori Hagihara * All rights reserved. * diff --git a/src/bin/jpip/opj_jpip_test.c b/src/bin/jpip/opj_jpip_test.c index 1a22c1eb..1b4fc1c6 100644 --- a/src/bin/jpip/opj_jpip_test.c +++ b/src/bin/jpip/opj_jpip_test.c @@ -1,8 +1,8 @@ /* * $Id: test_index.c 46 2011-02-17 14:50:55Z kaori $ * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq + * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2014, Professor Benoit Macq * Copyright (c) 2010-2011, Kaori Hagihara * All rights reserved. * diff --git a/src/bin/jpip/opj_jpip_transcode.c b/src/bin/jpip/opj_jpip_transcode.c index 6776f1a6..19570af5 100644 --- a/src/bin/jpip/opj_jpip_transcode.c +++ b/src/bin/jpip/opj_jpip_transcode.c @@ -1,8 +1,8 @@ /* * $Id$ * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq + * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2014, Professor Benoit Macq * Copyright (c) 2010-2011, Kaori Hagihara * All rights reserved. * diff --git a/src/bin/jpip/opj_server.c b/src/bin/jpip/opj_server.c index 9ef9a5f2..ec91e9c2 100644 --- a/src/bin/jpip/opj_server.c +++ b/src/bin/jpip/opj_server.c @@ -1,8 +1,8 @@ /* * $Id: opj_server.c 53 2011-05-09 16:55:39Z kaori $ * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq + * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2014, Professor Benoit Macq * Copyright (c) 2010-2011, Kaori Hagihara * Copyright (c) 2011, Lucian Corlaciu, GSoC * All rights reserved. diff --git a/src/bin/jpip/opj_viewer/src/ImageManager.java b/src/bin/jpip/opj_viewer/src/ImageManager.java index aad3ffaa..2885e92f 100644 --- a/src/bin/jpip/opj_viewer/src/ImageManager.java +++ b/src/bin/jpip/opj_viewer/src/ImageManager.java @@ -1,8 +1,8 @@ /* * $Id$ * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq + * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2014, Professor Benoit Macq * Copyright (c) 2010-2011, Kaori Hagihara * All rights reserved. * diff --git a/src/bin/jpip/opj_viewer/src/ImageViewer.java b/src/bin/jpip/opj_viewer/src/ImageViewer.java index 163193b9..c43a5914 100644 --- a/src/bin/jpip/opj_viewer/src/ImageViewer.java +++ b/src/bin/jpip/opj_viewer/src/ImageViewer.java @@ -1,8 +1,8 @@ /* * $Id$ * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq + * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2014, Professor Benoit Macq * Copyright (c) 2010-2011, Kaori Hagihara * All rights reserved. * diff --git a/src/bin/jpip/opj_viewer/src/ImageWindow.java b/src/bin/jpip/opj_viewer/src/ImageWindow.java index 9a236e4a..fbf02ea6 100644 --- a/src/bin/jpip/opj_viewer/src/ImageWindow.java +++ b/src/bin/jpip/opj_viewer/src/ImageWindow.java @@ -1,8 +1,8 @@ /* * $Id$ * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq + * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2014, Professor Benoit Macq * Copyright (c) 2010-2011, Kaori Hagihara * All rights reserved. * diff --git a/src/bin/jpip/opj_viewer/src/ImgdecClient.java b/src/bin/jpip/opj_viewer/src/ImgdecClient.java index edb64ded..f7ad8b87 100644 --- a/src/bin/jpip/opj_viewer/src/ImgdecClient.java +++ b/src/bin/jpip/opj_viewer/src/ImgdecClient.java @@ -1,8 +1,8 @@ /* * $Id$ * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq + * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2014, Professor Benoit Macq * Copyright (c) 2010-2011, Kaori Hagihara * All rights reserved. * diff --git a/src/bin/jpip/opj_viewer/src/JPIPHttpClient.java b/src/bin/jpip/opj_viewer/src/JPIPHttpClient.java index ce9a301d..3c71c5da 100644 --- a/src/bin/jpip/opj_viewer/src/JPIPHttpClient.java +++ b/src/bin/jpip/opj_viewer/src/JPIPHttpClient.java @@ -1,8 +1,8 @@ /* * $Id$ * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq + * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2014, Professor Benoit Macq * Copyright (c) 2010-2011, Kaori Hagihara * All rights reserved. * diff --git a/src/bin/jpip/opj_viewer/src/MML.java b/src/bin/jpip/opj_viewer/src/MML.java index 983ff200..45c495e2 100644 --- a/src/bin/jpip/opj_viewer/src/MML.java +++ b/src/bin/jpip/opj_viewer/src/MML.java @@ -1,8 +1,8 @@ /* * $Id$ * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq + * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2014, Professor Benoit Macq * Copyright (c) 2010-2011, Kaori Hagihara * All rights reserved. * diff --git a/src/bin/jpip/opj_viewer/src/PnmImage.java b/src/bin/jpip/opj_viewer/src/PnmImage.java index 092acecb..9b225386 100644 --- a/src/bin/jpip/opj_viewer/src/PnmImage.java +++ b/src/bin/jpip/opj_viewer/src/PnmImage.java @@ -1,8 +1,8 @@ /* * $Id$ * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq + * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2014, Professor Benoit Macq * Copyright (c) 2010-2011, Kaori Hagihara * All rights reserved. * diff --git a/src/bin/jpip/opj_viewer/src/RegimViewer.java b/src/bin/jpip/opj_viewer/src/RegimViewer.java index 57c54c57..9bc898a1 100644 --- a/src/bin/jpip/opj_viewer/src/RegimViewer.java +++ b/src/bin/jpip/opj_viewer/src/RegimViewer.java @@ -1,8 +1,8 @@ /* * $Id$ * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq + * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2014, Professor Benoit Macq * Copyright (c) 2010-2011, Kaori Hagihara * All rights reserved. * diff --git a/src/bin/jpip/opj_viewer/src/ResizeListener.java b/src/bin/jpip/opj_viewer/src/ResizeListener.java index fce8a4ff..150ec46a 100644 --- a/src/bin/jpip/opj_viewer/src/ResizeListener.java +++ b/src/bin/jpip/opj_viewer/src/ResizeListener.java @@ -1,8 +1,8 @@ /* * $Id$ * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq + * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2014, Professor Benoit Macq * Copyright (c) 2010-2011, Kaori Hagihara * All rights reserved. * diff --git a/src/bin/jpip/opj_viewer_xerces/src/ImageViewer.java b/src/bin/jpip/opj_viewer_xerces/src/ImageViewer.java index 52f0522a..827372a8 100644 --- a/src/bin/jpip/opj_viewer_xerces/src/ImageViewer.java +++ b/src/bin/jpip/opj_viewer_xerces/src/ImageViewer.java @@ -1,8 +1,8 @@ /* * $Id$ * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq + * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2014, Professor Benoit Macq * Copyright (c) 2010-2011, Kaori Hagihara * All rights reserved. * diff --git a/src/bin/jpip/opj_viewer_xerces/src/ImageWindow.java b/src/bin/jpip/opj_viewer_xerces/src/ImageWindow.java index ae3f54c5..fa12ddd2 100644 --- a/src/bin/jpip/opj_viewer_xerces/src/ImageWindow.java +++ b/src/bin/jpip/opj_viewer_xerces/src/ImageWindow.java @@ -1,8 +1,8 @@ /* * $Id$ * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq + * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2014, Professor Benoit Macq * Copyright (c) 2010-2011, Kaori Hagihara * All rights reserved. * diff --git a/src/bin/jpip/opj_viewer_xerces/src/JP2XMLparser.java b/src/bin/jpip/opj_viewer_xerces/src/JP2XMLparser.java index bec1d4db..e844eaa8 100644 --- a/src/bin/jpip/opj_viewer_xerces/src/JP2XMLparser.java +++ b/src/bin/jpip/opj_viewer_xerces/src/JP2XMLparser.java @@ -1,8 +1,8 @@ /* * $Id$ * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq + * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2014, Professor Benoit Macq * Copyright (c) 2010-2011, Kaori Hagihara * All rights reserved. * diff --git a/src/bin/jpip/opj_viewer_xerces/src/OptionPanel.java b/src/bin/jpip/opj_viewer_xerces/src/OptionPanel.java index 822e2dd8..23a27014 100644 --- a/src/bin/jpip/opj_viewer_xerces/src/OptionPanel.java +++ b/src/bin/jpip/opj_viewer_xerces/src/OptionPanel.java @@ -1,8 +1,8 @@ /* * $Id$ * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq + * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2014, Professor Benoit Macq * Copyright (c) 2010-2011, Kaori Hagihara * All rights reserved. * diff --git a/src/bin/jpwl/convert.c b/src/bin/jpwl/convert.c index 50123257..5d9219b3 100644 --- a/src/bin/jpwl/convert.c +++ b/src/bin/jpwl/convert.c @@ -1,9 +1,15 @@ /* - * 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) 2001-2003, David Janssens * Copyright (c) 2002-2003, Yannick Verschueren - * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe + * Copyright (c) 2003-2007, Francois-Olivier Devaux + * Copyright (c) 2003-2014, Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team * Copyright (c) 2006-2007, Parvatha Elangovan * All rights reserved. diff --git a/src/bin/jpwl/convert.h b/src/bin/jpwl/convert.h index d2f82fcf..591bde61 100644 --- a/src/bin/jpwl/convert.h +++ b/src/bin/jpwl/convert.h @@ -1,9 +1,15 @@ /* - * 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) 2001-2003, David Janssens * Copyright (c) 2002-2003, Yannick Verschueren - * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe + * Copyright (c) 2003-2007, Francois-Olivier Devaux + * Copyright (c) 2003-2014, Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team * All rights reserved. * diff --git a/src/bin/jpwl/index.c b/src/bin/jpwl/index.c index 22389c71..173e1633 100644 --- a/src/bin/jpwl/index.c +++ b/src/bin/jpwl/index.c @@ -1,6 +1,11 @@ /* - * 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) 2003-2007, Francois-Olivier Devaux * All rights reserved. * diff --git a/src/bin/jpwl/index.h b/src/bin/jpwl/index.h index 6c2231dd..d8b448d0 100644 --- a/src/bin/jpwl/index.h +++ b/src/bin/jpwl/index.h @@ -1,6 +1,11 @@ /* - * 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) 2003-2007, Francois-Olivier Devaux * All rights reserved. * diff --git a/src/bin/jpwl/opj_jpwl_compress.c b/src/bin/jpwl/opj_jpwl_compress.c index b5bfc05b..7537b61d 100644 --- a/src/bin/jpwl/opj_jpwl_compress.c +++ b/src/bin/jpwl/opj_jpwl_compress.c @@ -1,9 +1,15 @@ /* - * 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) 2001-2003, David Janssens * Copyright (c) 2002-2003, Yannick Verschueren - * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe + * Copyright (c) 2003-2007, Francois-Olivier Devaux + * Copyright (c) 2003-2014, Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team * Copyright (c) 2006-2007, Parvatha Elangovan * All rights reserved. diff --git a/src/bin/jpwl/opj_jpwl_decompress.c b/src/bin/jpwl/opj_jpwl_decompress.c index 860c078c..3e4ca23d 100644 --- a/src/bin/jpwl/opj_jpwl_decompress.c +++ b/src/bin/jpwl/opj_jpwl_decompress.c @@ -1,9 +1,15 @@ /* - * 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) 2001-2003, David Janssens * Copyright (c) 2002-2003, Yannick Verschueren - * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe + * Copyright (c) 2003-2007, Francois-Olivier Devaux + * Copyright (c) 2003-2014, Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team * Copyright (c) 2006-2007, Parvatha Elangovan * All rights reserved. diff --git a/src/bin/mj2/opj_mj2_extract.c b/src/bin/mj2/opj_mj2_extract.c index f694d531..25e6b79b 100644 --- a/src/bin/mj2/opj_mj2_extract.c +++ b/src/bin/mj2/opj_mj2_extract.c @@ -1,6 +1,11 @@ /* - * 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) 2003-2007, Francois-Olivier Devaux * All rights reserved. * diff --git a/src/bin/mj2/opj_mj2_wrap.c b/src/bin/mj2/opj_mj2_wrap.c index e164e2ea..7daa147f 100644 --- a/src/bin/mj2/opj_mj2_wrap.c +++ b/src/bin/mj2/opj_mj2_wrap.c @@ -1,6 +1,11 @@ /* - * 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) 2003-2007, Francois-Olivier Devaux * All rights reserved. * diff --git a/src/bin/wx/OPJViewer/source/OPJAbout.cpp b/src/bin/wx/OPJViewer/source/OPJAbout.cpp index f988c727..1f701e26 100644 --- a/src/bin/wx/OPJViewer/source/OPJAbout.cpp +++ b/src/bin/wx/OPJViewer/source/OPJAbout.cpp @@ -1,4 +1,9 @@ /* + * 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) 2007, Digital Signal Processing Laboratory, Universita' degli studi di Perugia (UPG), Italy * All rights reserved. * diff --git a/src/bin/wx/OPJViewer/source/OPJDialogs.cpp b/src/bin/wx/OPJViewer/source/OPJDialogs.cpp index ff96da9c..953cb7ea 100644 --- a/src/bin/wx/OPJViewer/source/OPJDialogs.cpp +++ b/src/bin/wx/OPJViewer/source/OPJDialogs.cpp @@ -1,4 +1,9 @@ /* + * 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) 2007, Digital Signal Processing Laboratory, Universita' degli studi di Perugia (UPG), Italy * All rights reserved. * diff --git a/src/bin/wx/OPJViewer/source/OPJThreads.cpp b/src/bin/wx/OPJViewer/source/OPJThreads.cpp index 14159ac9..e3533a72 100644 --- a/src/bin/wx/OPJViewer/source/OPJThreads.cpp +++ b/src/bin/wx/OPJViewer/source/OPJThreads.cpp @@ -1,4 +1,9 @@ /* + * 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) 2007, Digital Signal Processing Laboratory, Universita' degli studi di Perugia (UPG), Italy * All rights reserved. * diff --git a/src/bin/wx/OPJViewer/source/OPJViewer.cpp b/src/bin/wx/OPJViewer/source/OPJViewer.cpp index 8476d919..bb1ea05d 100644 --- a/src/bin/wx/OPJViewer/source/OPJViewer.cpp +++ b/src/bin/wx/OPJViewer/source/OPJViewer.cpp @@ -1,4 +1,9 @@ /* + * 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) 2007, Digital Signal Processing Laboratory, Universita' degli studi di Perugia (UPG), Italy * All rights reserved. * diff --git a/src/bin/wx/OPJViewer/source/OPJViewer.h b/src/bin/wx/OPJViewer/source/OPJViewer.h index f8a7f8df..0d49468a 100644 --- a/src/bin/wx/OPJViewer/source/OPJViewer.h +++ b/src/bin/wx/OPJViewer/source/OPJViewer.h @@ -1,4 +1,9 @@ /* + * 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) 2007, Digital Signal Processing Laboratory, Universita degli studi di Perugia (UPG), Italy * All rights reserved. * diff --git a/src/bin/wx/OPJViewer/source/imagjpeg2000.cpp b/src/bin/wx/OPJViewer/source/imagjpeg2000.cpp index c1f0a02e..d9f89968 100644 --- a/src/bin/wx/OPJViewer/source/imagjpeg2000.cpp +++ b/src/bin/wx/OPJViewer/source/imagjpeg2000.cpp @@ -1,4 +1,9 @@ /* + * 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) 2007, Digital Signal Processing Laboratory, Universitą degli studi di Perugia (UPG), Italy * All rights reserved. * diff --git a/src/bin/wx/OPJViewer/source/imagjpeg2000.h b/src/bin/wx/OPJViewer/source/imagjpeg2000.h index 6bb31c1b..945bba5a 100644 --- a/src/bin/wx/OPJViewer/source/imagjpeg2000.h +++ b/src/bin/wx/OPJViewer/source/imagjpeg2000.h @@ -1,4 +1,9 @@ /* + * 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) 2007, Digital Signal Processing Laboratory, Universita degli studi di Perugia (UPG), Italy * All rights reserved. * diff --git a/src/bin/wx/OPJViewer/source/imagmxf.cpp b/src/bin/wx/OPJViewer/source/imagmxf.cpp index ccfa9f9f..4bf3ce37 100644 --- a/src/bin/wx/OPJViewer/source/imagmxf.cpp +++ b/src/bin/wx/OPJViewer/source/imagmxf.cpp @@ -1,4 +1,9 @@ /* + * 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) 2007, Digital Signal Processing Laboratory, Universitą degli studi di Perugia (UPG), Italy * All rights reserved. * diff --git a/src/bin/wx/OPJViewer/source/imagmxf.h b/src/bin/wx/OPJViewer/source/imagmxf.h index 62158b4f..e4cb35df 100644 --- a/src/bin/wx/OPJViewer/source/imagmxf.h +++ b/src/bin/wx/OPJViewer/source/imagmxf.h @@ -1,4 +1,9 @@ /* + * 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) 2007, Digital Signal Processing Laboratory, Universita degli studi di Perugia (UPG), Italy * All rights reserved. * diff --git a/src/bin/wx/OPJViewer/source/license.txt b/src/bin/wx/OPJViewer/source/license.txt index 6409db44..919566d1 100644 --- a/src/bin/wx/OPJViewer/source/license.txt +++ b/src/bin/wx/OPJViewer/source/license.txt @@ -1,5 +1,5 @@ -Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium -Copyright (c) 2002-2007, Professor Benoit Macq +Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium +Copyright (c) 2002-2014, 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 diff --git a/src/bin/wx/OPJViewer/source/wxj2kparser.cpp b/src/bin/wx/OPJViewer/source/wxj2kparser.cpp index 284c568a..7c85d873 100644 --- a/src/bin/wx/OPJViewer/source/wxj2kparser.cpp +++ b/src/bin/wx/OPJViewer/source/wxj2kparser.cpp @@ -1,4 +1,9 @@ /* + * 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) 2007, Digital Signal Processing Laboratory, Universitą degli studi di Perugia (UPG), Italy * All rights reserved. * diff --git a/src/bin/wx/OPJViewer/source/wxjp2parser.cpp b/src/bin/wx/OPJViewer/source/wxjp2parser.cpp index 182def8b..853c648d 100644 --- a/src/bin/wx/OPJViewer/source/wxjp2parser.cpp +++ b/src/bin/wx/OPJViewer/source/wxjp2parser.cpp @@ -1,4 +1,9 @@ /* + * 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) 2007, Digital Signal Processing Laboratory, Universitą degli studi di Perugia (UPG), Italy * All rights reserved. * |