diff --git a/cjpeg.c b/cjpeg.c index fa306d34..0475c023 100644 --- a/cjpeg.c +++ b/cjpeg.c @@ -277,9 +277,9 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv, if (! printed_version) { fprintf(stderr, "%s version %s (build %s)\n", PACKAGE_NAME, VERSION, BUILD); - fprintf(stderr, "%s\n\n", LJTCOPYRIGHT); - fprintf(stderr, "Based on Independent JPEG Group's libjpeg, version %s\n%s\n\n", - JVERSION, JCOPYRIGHT); + fprintf(stderr, "%s\n\n", JCOPYRIGHT); + fprintf(stderr, "Emulating The Independent JPEG Group's libjpeg, version %s\n\n", + JVERSION); printed_version = TRUE; } cinfo->err->trace_level++; diff --git a/djpeg.c b/djpeg.c index 0dd4f240..2438856e 100644 --- a/djpeg.c +++ b/djpeg.c @@ -245,9 +245,9 @@ parse_switches (j_decompress_ptr cinfo, int argc, char **argv, if (! printed_version) { fprintf(stderr, "%s version %s (build %s)\n", PACKAGE_NAME, VERSION, BUILD); - fprintf(stderr, "%s\n\n", LJTCOPYRIGHT); - fprintf(stderr, "Based on Independent JPEG Group's libjpeg, version %s\n%s\n\n", - JVERSION, JCOPYRIGHT); + fprintf(stderr, "%s\n\n", JCOPYRIGHT); + fprintf(stderr, "Emulating The Independent JPEG Group's libjpeg, version %s\n\n", + JVERSION); printed_version = TRUE; } cinfo->err->trace_level++; diff --git a/jpegtran.c b/jpegtran.c index 9e49e44f..6a22ed28 100644 --- a/jpegtran.c +++ b/jpegtran.c @@ -204,9 +204,9 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv, if (! printed_version) { fprintf(stderr, "%s version %s (build %s)\n", PACKAGE_NAME, VERSION, BUILD); - fprintf(stderr, "%s\n\n", LJTCOPYRIGHT); - fprintf(stderr, "Based on Independent JPEG Group's libjpeg, version %s\n%s\n\n", - JVERSION, JCOPYRIGHT); + fprintf(stderr, "%s\n\n", JCOPYRIGHT); + fprintf(stderr, "Emulating The Independent JPEG Group's libjpeg, version %s\n\n", + JVERSION); printed_version = TRUE; } cinfo->err->trace_level++; diff --git a/jversion.h b/jversion.h index a0454057..71d7b913 100644 --- a/jversion.h +++ b/jversion.h @@ -2,7 +2,7 @@ * jversion.h * * Copyright (C) 1991-2010, Thomas G. Lane, Guido Vollbeding. - * Copyright (C) 2010, D. R. Commander. + * Copyright (C) 2010, 2012, D. R. Commander. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -14,23 +14,18 @@ #define JVERSION "8b 16-May-2010" -#define JCOPYRIGHT "Copyright (C) 2010, Thomas G. Lane, Guido Vollbeding" - #elif JPEG_LIB_VERSION >= 70 #define JVERSION "7 27-Jun-2009" -#define JCOPYRIGHT "Copyright (C) 2009, Thomas G. Lane, Guido Vollbeding" - #else #define JVERSION "6b 27-Mar-1998" -#define JCOPYRIGHT "Copyright (C) 1998, Thomas G. Lane" - #endif -#define LJTCOPYRIGHT "Copyright (C) 1999-2006 MIYASAKA Masaru\n" \ +#define JCOPYRIGHT "Copyright (C) 1991-2010 Thomas G. Lane, Guido Vollbeding\n" \ + "Copyright (C) 1999-2006 MIYASAKA Masaru\n" \ "Copyright (C) 2009 Pierre Ossman for Cendio AB\n" \ - "Copyright (C) 2009-2011 D. R. Commander\n" \ + "Copyright (C) 2009-2012 D. R. Commander\n" \ "Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies)"