Merge branch '1.4.x'

diff --cc ChangeLog.txt
index 9faadebad8fdf23c67b589817321d5ae539edb4f,b126bd1919fc44d2f63116c46aea2f61fd82f3ac..10379e3eca5379a1ac9c275069f1e17c3ecf5918
--- 1/ChangeLog.txt
--- 2/ChangeLog.txt
+++ b/ChangeLog.txt
@@@ -1,45 -1,15 +1,54 @@@
 -1.4.3
 -=====
 -
 -[1] Fixed a regression caused by 1.4.1[6] that prevented 32-bit and 64-bit
 +1.5 pre-beta
 +============
 +
 +[1] Added full SIMD acceleration for PowerPC platforms using AltiVec VMX
 +(128-bit SIMD) instructions.  Although the performance of libjpeg-turbo on
 +PowerPC was already good, due to the increased number of registers available
 +to the compiler vs. x86, it was still possible to speed up compression by about
 +3-4x and decompression by about 2-2.5x (relative to libjpeg v6b) through the
 +use of AltiVec instructions.
 +
 +[2] Added a new libjpeg API function (jpeg_skip_scanlines()) that can be used
 +to partially decode a JPEG image.  See libjpeg.txt for more details.
 +
 +[3] The TJCompressor and TJDecompressor classes in the TurboJPEG Java API now
 +implement the Closeable interface, so those classes can be used with a
 +try-with-resources statement.
 +
 +[4] The TurboJPEG Java classes now throw unchecked idiomatic exceptions
 +(IllegalArgumentException, IllegalStateException) for unrecoverable errors
 +caused by incorrect API usage, and those classes throw a new checked exception
 +type (TJException) for errors that are passed through from the C library.
 +
 +[5] Source buffers for the TurboJPEG C API functions, as well as the
 +jpeg_mem_src() function in the libjpeg API, are now declared as const pointers.
 +This facilitates passing read-only buffers to those functions and ensures the
 +caller that the source buffer will not be modified.  This should not create any
 +backward API or ABI incompatibilities with prior libjpeg-turbo releases.
 +
 +[6] The MIPS DSPr2 SIMD code can now be compiled to support either FR=0 or FR=1
 +FPUs.
 +
 +[7] Fixed additional negative left shifts and other issues reported by the GCC
 +and Clang undefined behavior sanitizers.  Most of these issues affected only
 +32-bit code, and none of them was known to pose a security threat, but removing
 +the warnings makes it easier to detect actual security issues, should they
 +arise in the future.
 +
 +[8] Removed the unnecessary .arch directive from the ARM64 NEON SIMD code.
 +This directive was preventing the code from assembling using the clang
 +integrated assembler.
 +
++[9] Fixed a regression caused by 1.4.1[6] that prevented 32-bit and 64-bit
+ libjpeg-turbo RPMs from being installed simultaneously on recent Red Hat/Fedora
+ distributions.  This was due to the addition of a macro in jconfig.h that
+ allows the Huffman codec to determine the word size at compile time.  Since
+ that macro differs between 32-bit and 64-bit builds, this caused a conflict
+ between the i386 and x86_64 RPMs (any differing files, other than executables,
+ are not allowed when 32-bit and 64-bit RPMs are installed simultaneously.)
+ Since the macro is used only internally, it has been moved into jconfigint.h.
+ 
 +
  1.4.2
  =====
  

diff --cc jchuff.c
index e02fd6acbd259c1aa887a8eb71fedce2f8376e3b,7e91fde11ad82dbc3ad6e24892526137ba2cfbe4..9d7a468065eba258416bb4627c7e4fea2e77ab64
--- 1/jchuff.c
--- 2/jchuff.c
+++ b/jchuff.c
@@@ -4,9 -4,8 +4,9 @@@
   * This file was part of the Independent JPEG Group's software:
   * Copyright (C) 1991-1997, Thomas G. Lane.
   * libjpeg-turbo Modifications:
-  * Copyright (C) 2009-2011, 2014-2015 D. R. Commander.
+  * Copyright (C) 2009-2011, 2014-2016 D. R. Commander.
 - * For conditions of distribution and use, see the accompanying README file.
 + * For conditions of distribution and use, see the accompanying README.ijg
 + * file.
   *
   * This file contains Huffman entropy encoding routines.
   *

diff --cc jdhuff.h
index 422a7a16574d83df08969f5baec22e7f060f242e,db71067f4375f31a3358bbe864ab910107529b99..1bf0390e6439376edfae0bcbf7424741ddaffc8b
--- 1/jdhuff.h
--- 2/jdhuff.h
+++ b/jdhuff.h
@@@ -4,9 -4,8 +4,9 @@@
   * This file was part of the Independent JPEG Group's software:
   * Copyright (C) 1991-1997, Thomas G. Lane.
   * libjpeg-turbo Modifications:
-  * Copyright (C) 2010-2011, 2015, D. R. Commander.
+  * Copyright (C) 2010-2011, 2015-2016, D. R. Commander.
 - * For conditions of distribution and use, see the accompanying README file.
 + * For conditions of distribution and use, see the accompanying README.ijg
 + * file.
   *
   * This file contains declarations for Huffman entropy decoding routines
   * that are shared between the sequential decoder (jdhuff.c) and the

diff --cc jversion.h
index 89090ba8af1b15b33e3a5f24780bcc84f6a1cb71,92a1b67c012d752805791f39d8e91970dacb7d08..fed5b5e9f5fd3a0f2243339dbc51abada844cc43
--- 1/jversion.h
--- 2/jversion.h
+++ b/jversion.h
@@@ -4,9 -4,8 +4,9 @@@
   * This file was part of the Independent JPEG Group's software:
   * Copyright (C) 1991-2012, Thomas G. Lane, Guido Vollbeding.
   * libjpeg-turbo Modifications:
-  * Copyright (C) 2010, 2012-2015, D. R. Commander.
+  * Copyright (C) 2010, 2012-2016, D. R. Commander.
 - * For conditions of distribution and use, see the accompanying README file.
 + * For conditions of distribution and use, see the accompanying README.ijg
 + * file.
   *
   * This file contains software version identification.
   */