From: DRC <information@libjpeg-turbo.org>
Date: Fri, 20 Jan 2017 01:05:21 +0000 (-0600)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.5.90~79
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d34d255957051d0f5a7ce836b87cd4d4a47ad94e;p=libjpeg-turbo

Merge branch 'master' into dev
---

d34d255957051d0f5a7ce836b87cd4d4a47ad94e
diff --cc .travis.yml
index 8f22389,53ded2b..69c0e4e
--- a/.travis.yml
+++ b/.travis.yml
@@@ -23,13 -21,18 +23,21 @@@ matrix
            packages:
              - nasm
      - os: linux
 +      dist: trusty
        compiler: gcc
 -      env: CONFIGURE_FLAGS="--with-12bit"
 +      env: CMAKE_FLAGS="-DWITH_12BIT=1"
+     - os: linux
++      dist: trusty
+       compiler: gcc
 -      env: CONFIGURE_FLAGS="--with-jpeg7"
++      env: CMAKE_FLAGS="-DWITH_JPEG7=1"
+       addons:
+         apt:
+           packages:
+             - nasm
      - os: linux
 +      dist: trusty
        compiler: gcc
 -      env: CONFIGURE_FLAGS="--with-jpeg8"
 +      env: CMAKE_FLAGS="-DWITH_JPEG8=1"
        addons:
          apt:
            packages:
diff --cc jversion.h
index d0993ba,7e44eaa..7bb8ff4
--- a/jversion.h
+++ b/jversion.h
@@@ -35,10 -35,9 +35,10 @@@
   *   their code
   */
  
- #define JCOPYRIGHT      "Copyright (C) 2009-2016 D. R. Commander\n" \
+ #define JCOPYRIGHT      "Copyright (C) 2009-2017 D. R. Commander\n" \
                          "Copyright (C) 2011-2016 Siarhei Siamashka\n" \
                          "Copyright (C) 2015-2016 Matthieu Darbois\n" \
 +                        "Copyright (C) 2015 Intel Corporation\n" \
                          "Copyright (C) 2015 Google, Inc.\n" \
                          "Copyright (C) 2013-2014 MIPS Technologies, Inc.\n" \
                          "Copyright (C) 2013 Linaro Limited\n" \