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

Merge some of the README changes from jpeg-8d and change the copyright and version strings to reflect that we use some of that code.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@886 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2013-01-01 10:56:38 +00:00
parent f37e4daf94 5829cb2398
commit c137f0f1cf
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
README
View File

@@ -17,7 +17,8 @@ Bill Allombert, Jim Boucher, Lee Crocker, Bob Friesenhahn, Ben Jackson,
Julian Minguillon, Luis Ortiz, George Phillips, Davide Rossi, Ge' Weijers, Julian Minguillon, Luis Ortiz, George Phillips, Davide Rossi, Ge' Weijers,
and other members of the Independent JPEG Group. and other members of the Independent JPEG Group.
IJG is not affiliated with the official ISO JPEG standards committee. IJG is not affiliated with the ISO/IEC JTC1/SC29/WG1 standards committee
(also known as JPEG, together with ITU-T SG16).
DOCUMENTATION ROADMAP DOCUMENTATION ROADMAP
@@ -129,7 +130,7 @@ with respect to this software, its quality, accuracy, merchantability, or
fitness for a particular purpose. This software is provided "AS IS", and you, fitness for a particular purpose. This software is provided "AS IS", and you,
its user, assume the entire risk as to its quality and accuracy. its user, assume the entire risk as to its quality and accuracy.
This software is copyright (C) 1991-2010, Thomas G. Lane, Guido Vollbeding. This software is copyright (C) 1991-2012, Thomas G. Lane, Guido Vollbeding.
All Rights Reserved except as specified below. All Rights Reserved except as specified below.
Permission is hereby granted to use, copy, modify, and distribute this Permission is hereby granted to use, copy, modify, and distribute this
@@ -274,11 +275,12 @@ with body
FILE FORMAT WARS FILE FORMAT WARS
================ ================
The ISO JPEG standards committee actually promotes different formats like The ISO/IEC JTC1/SC29/WG1 standards committee (also known as JPEG, together
"JPEG 2000" or "JPEG XR", which are incompatible with original DCT-based with ITU-T SG16) currently promotes different formats containing the name
JPEG. IJG therefore does not support these formats (see REFERENCES). Indeed, "JPEG" which are incompatible with original DCT-based JPEG. IJG therefore does
one of the original reasons for developing this free software was to help not support these formats (see REFERENCES). Indeed, one of the original
force convergence on common, interoperable format standards for JPEG files. reasons for developing this free software was to help force convergence on
common, interoperable format standards for JPEG files.
Don't use an incompatible file format! Don't use an incompatible file format!
(In any case, our decoder will remain capable of reading existing JPEG (In any case, our decoder will remain capable of reading existing JPEG
image files indefinitely.) image files indefinitely.)

6
jversion.h
View File

@@ -2,7 +2,7 @@
* jversion.h * jversion.h
* *
* This file was part of the Independent JPEG Group's software: * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-2010, Thomas G. Lane, Guido Vollbeding. * Copyright (C) 1991-2012, Thomas G. Lane, Guido Vollbeding.
* Modifications: * Modifications:
* Copyright (C) 2010, 2012, D. R. Commander. * Copyright (C) 2010, 2012, D. R. Commander.
* For conditions of distribution and use, see the accompanying README file. * For conditions of distribution and use, see the accompanying README file.
@@ -13,7 +13,7 @@
#if JPEG_LIB_VERSION >= 80 #if JPEG_LIB_VERSION >= 80
#define JVERSION "8b 16-May-2010" #define JVERSION "8d 15-Jan-2012"
#elif JPEG_LIB_VERSION >= 70 #elif JPEG_LIB_VERSION >= 70
@@ -25,7 +25,7 @@
#endif #endif
#define JCOPYRIGHT "Copyright (C) 1991-2010 Thomas G. Lane, Guido Vollbeding\n" \ #define JCOPYRIGHT "Copyright (C) 1991-2012 Thomas G. Lane, Guido Vollbeding\n" \
"Copyright (C) 1999-2006 MIYASAKA Masaru\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-2012 D. R. Commander\n" \ "Copyright (C) 2009-2012 D. R. Commander\n" \