Our copyright string is longer than JMSG_LENGTH_MAX, and this was causing a buffer...

We can't simply increase JMSG_LENGTH_MAX, because it is part of the libjpeg API, and it is generally assumed that a buffer of this length will be passed to format_message().  Thus, the easiest solution is simply to use a shorter copyright string for JMSG_COPYRIGHT.

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

diff --cc ChangeLog.txt
index d376ace7851b9f7e96160937a39760214bf5294e,ac51cbb9bdc46709e7ce79b73ceab3c1270edf7a..067c0550804aa8f6208d96f1e6e4eee73791e904
--- 1/ChangeLog.txt
--- 2/ChangeLog.txt
+++ b/ChangeLog.txt
@@@ -1,30 -1,21 +1,33 @@@
 -1.2.2
 +1.3.2
  =====
  
 -[1] The tjDecompressToYUV() function now supports the TJFLAG_FASTDCT flag.
 +[1] Worked around an issue with Visual C++ 2010 and later that caused incorrect
 +pixels to be generated when decompressing a JPEG image to a 256-color bitmap,
 +if compiler optimization was enabled when libjpeg-turbo was built.  This caused
 +the regression tests to fail when doing a release build under Visual C++ 2010
 +and later.
  
 -[2] The 32-bit supplementary package for amd64 Debian systems now provides
 -symlinks in /usr/lib/i386-linux-gnu for the TurboJPEG libraries in /usr/lib32.
 -This allows those libraries to be used on MultiArch-compatible systems (such as
 -Ubuntu 11 and later) without setting the linker path.
++[2] Fixed a segfault that occurred when calling output_message() with msg_code
++set to JMSG_COPYRIGHT.
+ 
 -[3] Fixed a regression caused by 1.2.1[7] whereby the build would fail with
 -multiple "Mismatch in operand sizes" errors when attempting to build the x86
 -SIMD code with NASM 0.98.
  
 -[4] Fixed a Huffman encoder bug that prevented I/O suspension from working
 -properly.
 +1.3.1
 +=====
  
 -[5] Fixed a bug whereby attempting to encode a progressive JPEG with arithmetic
 +[1] On Un*x systems, 'make install' now installs the libjpeg-turbo libraries
 +into /opt/libjpeg-turbo/lib32 by default on any 32-bit system, not just x86,
 +and into /opt/libjpeg-turbo/lib64 by default on any 64-bit system, not just
 +x86-64.  You can override this by overriding either the 'prefix' or 'libdir'
 +configure variables.
 +
 +[2] The Windows installer now places a copy of the TurboJPEG DLLs in the same
 +directory as the rest of the libjpeg-turbo binaries.  This was mainly done
 +to support TurboVNC 1.3, which bundles the DLLs in its Windows installation.
 +When using a 32-bit version of CMake on 64-bit Windows, it is impossible to
 +access the c:\WINDOWS\system32 directory, which made it impossible for the
 +TurboVNC build scripts to bundle the 64-bit TurboJPEG DLL.
 +
 +[3] Fixed a bug whereby attempting to encode a progressive JPEG with arithmetic
  entropy coding (by passing arguments of -progressive -arithmetic to cjpeg or
  jpegtran, for instance) would result in an error, "Requested feature was
  omitted at compile time".

diff --cc jerror.h
index fab59b3800031b02cab10f0ded8cfe8ddf7a52c3,ea6ca4edf1f18e6028941f27cfd71ad01e7a6382..402613e002a9394f9682f5511869dde17e922fae
--- 1/jerror.h
--- 2/jerror.h
+++ b/jerror.h
@@@ -132,12 -134,12 +134,12 @@@ JMESSAGE(JERR_VIRTUAL_BUG, "Virtual arr
  JMESSAGE(JERR_WIDTH_OVERFLOW, "Image too wide for this implementation")
  JMESSAGE(JERR_XMS_READ, "Read from XMS failed")
  JMESSAGE(JERR_XMS_WRITE, "Write to XMS failed")
- JMESSAGE(JMSG_COPYRIGHT, JCOPYRIGHT)
+ JMESSAGE(JMSG_COPYRIGHT, JCOPYRIGHT_SHORT)
  JMESSAGE(JMSG_VERSION, JVERSION)
  JMESSAGE(JTRC_16BIT_TABLES,
 -       "Caution: quantization tables are too coarse for baseline JPEG")
 +         "Caution: quantization tables are too coarse for baseline JPEG")
  JMESSAGE(JTRC_ADOBE,
 -       "Adobe APP14 marker: version %d, flags 0x%04x 0x%04x, transform %d")
 +         "Adobe APP14 marker: version %d, flags 0x%04x 0x%04x, transform %d")
  JMESSAGE(JTRC_APP0, "Unknown APP0 marker (not JFIF), length %u")
  JMESSAGE(JTRC_APP14, "Unknown APP14 marker (not Adobe), length %u")
  JMESSAGE(JTRC_DAC, "Define Arithmetic Table 0x%02x: 0x%02x")

diff --cc jversion.h
index c90c95ac0e1ecb720be16c63f6cf2c59b8fdb75e,8d3a5f789898f1ee8cf832f945114d5374776fb5..1bd4dba6bbdce5eb8366f0851407ee57010884fc
--- 1/jversion.h
--- 2/jversion.h
+++ b/jversion.h
@@@ -25,8 -25,10 +25,10 @@@
  
  #endif
  
 -#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-2014 D. R. Commander\n" \
 -                      "Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies)"
 +#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-2014 D. R. Commander\n" \
 +                        "Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies)"
+ 
+ #define JCOPYRIGHT_SHORT "Copyright (C) 1991-2014 The libjpeg-turbo Project and many others"