From 1d5b1cf32027c8eee6808ebaeed17cf26cfab4b3 Mon Sep 17 00:00:00 2001 From: DRC Date: Tue, 31 Jan 2012 10:39:29 +0000 Subject: [PATCH] Merge copyright messages into one string and change the run-time messages to avoid confusion (we are not technically based on the latest libjpeg, although we do borrow some code from it) git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.2.x@766 632fc199-4ca6-4c93-a231-07263d6284db --- cjpeg.c | 6 +++--- djpeg.c | 6 +++--- jpegtran.c | 6 +++--- jversion.h | 13 ++++--------- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/cjpeg.c b/cjpeg.c index fa306d3..0475c02 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 0dd4f24..2438856 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 9e49e44..6a22ed2 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 a045405..71d7b91 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)" -- 2.50.0