ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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)

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@768 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2012-01-31 10:47:02 +00:00
parent ce2fed003b 1d5b1cf320
commit f58669bc0d
4 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cjpeg.c
View File

@@ -277,9 +277,9 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv,
if (! printed_version) { if (! printed_version) {
fprintf(stderr, "%s version %s (build %s)\n", fprintf(stderr, "%s version %s (build %s)\n",
PACKAGE_NAME, VERSION, BUILD); PACKAGE_NAME, VERSION, BUILD);
fprintf(stderr, "%s\n\n", LJTCOPYRIGHT); fprintf(stderr, "%s\n\n", JCOPYRIGHT);
fprintf(stderr, "Based on Independent JPEG Group's libjpeg, version %s\n%s\n\n", fprintf(stderr, "Emulating The Independent JPEG Group's libjpeg, version %s\n\n",
JVERSION, JCOPYRIGHT); JVERSION);
printed_version = TRUE; printed_version = TRUE;
} }
cinfo->err->trace_level++; cinfo->err->trace_level++;

6
djpeg.c
View File

@@ -245,9 +245,9 @@ parse_switches (j_decompress_ptr cinfo, int argc, char **argv,
if (! printed_version) { if (! printed_version) {
fprintf(stderr, "%s version %s (build %s)\n", fprintf(stderr, "%s version %s (build %s)\n",
PACKAGE_NAME, VERSION, BUILD); PACKAGE_NAME, VERSION, BUILD);
fprintf(stderr, "%s\n\n", LJTCOPYRIGHT); fprintf(stderr, "%s\n\n", JCOPYRIGHT);
fprintf(stderr, "Based on Independent JPEG Group's libjpeg, version %s\n%s\n\n", fprintf(stderr, "Emulating The Independent JPEG Group's libjpeg, version %s\n\n",
JVERSION, JCOPYRIGHT); JVERSION);
printed_version = TRUE; printed_version = TRUE;
} }
cinfo->err->trace_level++; cinfo->err->trace_level++;

6
jpegtran.c
View File

@@ -204,9 +204,9 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv,
if (! printed_version) { if (! printed_version) {
fprintf(stderr, "%s version %s (build %s)\n", fprintf(stderr, "%s version %s (build %s)\n",
PACKAGE_NAME, VERSION, BUILD); PACKAGE_NAME, VERSION, BUILD);
fprintf(stderr, "%s\n\n", LJTCOPYRIGHT); fprintf(stderr, "%s\n\n", JCOPYRIGHT);
fprintf(stderr, "Based on Independent JPEG Group's libjpeg, version %s\n%s\n\n", fprintf(stderr, "Emulating The Independent JPEG Group's libjpeg, version %s\n\n",
JVERSION, JCOPYRIGHT); JVERSION);
printed_version = TRUE; printed_version = TRUE;
} }
cinfo->err->trace_level++; cinfo->err->trace_level++;

13
jversion.h
View File

@@ -2,7 +2,7 @@
* jversion.h * jversion.h
* *
* Copyright (C) 1991-2010, Thomas G. Lane, Guido Vollbeding. * 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. * This file is part of the Independent JPEG Group's software.
* For conditions of distribution and use, see the accompanying README file. * For conditions of distribution and use, see the accompanying README file.
* *
@@ -14,23 +14,18 @@
#define JVERSION "8b 16-May-2010" #define JVERSION "8b 16-May-2010"
#define JCOPYRIGHT "Copyright (C) 2010, Thomas G. Lane, Guido Vollbeding"
#elif JPEG_LIB_VERSION >= 70 #elif JPEG_LIB_VERSION >= 70
#define JVERSION "7 27-Jun-2009" #define JVERSION "7 27-Jun-2009"
#define JCOPYRIGHT "Copyright (C) 2009, Thomas G. Lane, Guido Vollbeding"
#else #else
#define JVERSION "6b 27-Mar-1998" #define JVERSION "6b 27-Mar-1998"
#define JCOPYRIGHT "Copyright (C) 1998, Thomas G. Lane"
#endif #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 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)" "Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies)"