From: DRC <dcommander@users.sourceforge.net>
Date: Tue, 1 Jan 2013 10:56:38 +0000 (+0000)
Subject: Merge some of the README changes from jpeg-8d and change the copyright and version... 
X-Git-Tag: 1.2.90~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c137f0f1cff3603d0ebfae3e4dbf546a050bd4ce;p=libjpeg-turbo

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.


git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@886 632fc199-4ca6-4c93-a231-07263d6284db
---

c137f0f1cff3603d0ebfae3e4dbf546a050bd4ce
diff --cc README
index 0e9b429,0a23c19..297413c
--- a/README
+++ b/README
@@@ -274,11 -274,55 +275,12 @@@ with bod
  FILE FORMAT WARS
  ================
  
- The ISO JPEG standards committee actually promotes different formats like
- "JPEG 2000" or "JPEG XR", which are incompatible with original DCT-based
- JPEG.  IJG therefore does not support these formats (see REFERENCES).  Indeed,
- one of the original reasons for developing this free software was to help
- force convergence on common, interoperable format standards for JPEG files.
+ The ISO/IEC JTC1/SC29/WG1 standards committee (also known as JPEG, together
+ with ITU-T SG16) currently promotes different formats containing the name
 -"JPEG" which is misleading because these formats are incompatible with
 -original DCT-based JPEG and are based on faulty technologies.
 -IJG therefore does not and will not support such momentary mistakes
 -(see REFERENCES).
 -There exist also distributions under the name "OpenJPEG" promoting such
 -kind of formats which is misleading because they don't support original
 -JPEG images.
 -We have no sympathy for the promotion of inferior formats.  Indeed, one of
 -the original reasons for developing this free software was to help force
 -convergence on common, interoperable format standards for JPEG files.
++"JPEG" which are incompatible with original DCT-based JPEG.  IJG therefore does
++not support these formats (see REFERENCES).  Indeed, one of the original
++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!
  (In any case, our decoder will remain capable of reading existing JPEG
  image files indefinitely.)
diff --cc jversion.h
index 88c2566,5d49151..5272c80
--- a/jversion.h
+++ b/jversion.h
@@@ -1,32 -1,14 +1,32 @@@
  /*
   * jversion.h
   *
 + * 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.
 - * This file is part of the Independent JPEG Group's software.
 + * Modifications:
 + * Copyright (C) 2010, 2012, D. R. Commander.
   * For conditions of distribution and use, see the accompanying README file.
   *
   * This file contains software version identification.
   */
  
  
 +#if JPEG_LIB_VERSION >= 80
 +
- #define JVERSION	"8b  16-May-2010"
+ #define JVERSION	"8d  15-Jan-2012"
  
 -#define JCOPYRIGHT	"Copyright (C) 2012, Thomas G. Lane, Guido Vollbeding"
 +#elif JPEG_LIB_VERSION >= 70
 +
 +#define JVERSION	"7  27-Jun-2009"
 +
 +#else
 +
 +#define JVERSION	"6b  27-Mar-1998"
 +
 +#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) 2009 Pierre Ossman for Cendio AB\n" \
 +			"Copyright (C) 2009-2012 D. R. Commander\n" \
 +			"Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies)"