Merge branch 'master' into dev

diff --cc ChangeLog.md
Simple merge

diff --cc LICENSE.md
index 37fe0b0dd3c537c7bf219a082269a262f5e63898,0572390635d944af818ebe132019722650e3ac0b..8dfc04523f3461964651720687fd598d552f038e
--- 1/LICENSE.md
--- 2/LICENSE.md
+++ b/LICENSE.md
@@@ -9,13 -9,11 +9,12 @@@ libjpeg-turbo is covered by three compa
    This license applies to the libjpeg API library and associated programs
    (any code inherited from libjpeg, and any modifications to that code.)
  
- - The Modified (3-clause) BSD License, which is listed in
-   [turbojpeg.c](turbojpeg.c)
+ - The Modified (3-clause) BSD License, which is listed below
  
 -  This license covers the TurboJPEG API library and associated programs.
 +  This license covers the TurboJPEG API library and associated programs, as
 +  well as the build system.
  
- - The zlib License, which is listed in [simd/jsimdext.inc](simd/jsimdext.inc)
+ - The zlib License, which is listed below
  
    This license is a subset of the other two, and it covers the libjpeg-turbo
    SIMD extensions.

diff --cc jconfigint.h.in
index d37ac33df84b2d33105430d38415370249d3f182,963e760203b1cad12833afbe028d6979459558c6..835f7c46e0ba5a50d9578eca1323c2bf25bfe422
--- 1/jconfigint.h.in
--- 2/jconfigint.h.in
+++ b/jconfigint.h.in
@@@ -1,18 -1,17 +1,21 @@@
  /* libjpeg-turbo build number */
 -#undef BUILD
 +#define BUILD "@BUILD@"
  
+ /* Compiler's inline keyword */
+ #undef inline
+ 
  /* How to obtain function inlining. */
 -#undef INLINE
 +#define INLINE @INLINE@
  
  /* Define to the full name of this package. */
 -#undef PACKAGE_NAME
 +#define PACKAGE_NAME "@CMAKE_PROJECT_NAME@"
  
  /* Version number of package */
 -#undef VERSION
 +#define VERSION "@VERSION@"
 +
 +#ifndef _WIN32
  
  /* The size of `size_t', as computed by sizeof. */
 -#undef SIZEOF_SIZE_T
 +#define SIZEOF_SIZE_T @SIZE_T@
 +
 +#endif

diff --cc simd/powerpc/jsimd.c
Simple merge