From 30ebafda2a2b55b9e09e658f2b7fad3f44fff6fb Mon Sep 17 00:00:00 2001
From: DRC <information@libjpeg-turbo.org>
Date: Mon, 21 Sep 2015 13:43:36 -0500
Subject: [PATCH 1/3] 1.4.2

---
 CMakeLists.txt | 2 +-
 configure.ac   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ee91a4f..bd914933 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ if(POLICY CMP0022)
 endif()
 
 project(libjpeg-turbo C)
-set(VERSION 1.4.1)
+set(VERSION 1.4.2)
 
 if(CYGWIN OR NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
   execute_process(COMMAND "date" "+%Y%m%d" OUTPUT_VARIABLE BUILD)
diff --git a/configure.ac b/configure.ac
index e639d591..6a554744 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.56])
-AC_INIT([libjpeg-turbo], [1.4.1])
+AC_INIT([libjpeg-turbo], [1.4.2])
 
 AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2])
 AC_PREFIX_DEFAULT(/opt/libjpeg-turbo)

From d8da49effe6460d55239c4c009c57f42d8e4a494 Mon Sep 17 00:00:00 2001
From: DRC <information@libjpeg-turbo.org>
Date: Mon, 21 Sep 2015 13:45:45 -0500
Subject: [PATCH 2/3] Fix 'make dist'

---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index fe5c3195..3a12fde2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -168,7 +168,7 @@ dist_example_DATA = example.c
 EXTRA_DIST = win release $(DOCS) testimages CMakeLists.txt \
 	sharedlib/CMakeLists.txt cmakescripts libjpeg.map.in doc doxygen.config \
 	doxygen-extra.css jccolext.c jdcolext.c jdcol565.c jdmrgext.c jdmrg565.c \
-	jstdhuff.c
+	jstdhuff.c LICENSE.txt
 
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`

From bf04316e63edb1388cd9f73261ee106775d198d9 Mon Sep 17 00:00:00 2001
From: DRC <information@libjpeg-turbo.org>
Date: Fri, 9 Oct 2015 20:02:31 -0500
Subject: [PATCH 3/3] Comment formatting tweaks

---
 jidctflt.c |  2 +-
 jstdhuff.c | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/jidctflt.c b/jidctflt.c
index 2b2e2282..324a2cbc 100644
--- a/jidctflt.c
+++ b/jidctflt.c
@@ -6,7 +6,7 @@
  * Modified 2010 by Guido Vollbeding.
  * libjpeg-turbo Modifications:
  * Copyright (C) 2014, D. R. Commander.
-  * For conditions of distribution and use, see the accompanying README file.
+ * For conditions of distribution and use, see the accompanying README file.
  *
  * This file contains a floating-point implementation of the
  * inverse DCT (Discrete Cosine Transform).  In the IJG code, this routine
diff --git a/jstdhuff.c b/jstdhuff.c
index b29e5ea4..a6eb2d8a 100644
--- a/jstdhuff.c
+++ b/jstdhuff.c
@@ -1,15 +1,15 @@
 /*
-* jstdhuff.c
-*
-* This file was part of the Independent JPEG Group's software:
-* Copyright (C) 1991-1998, Thomas G. Lane.
-* libjpeg-turbo Modifications:
-* Copyright (C) 2013, D. R. Commander.
-* For conditions of distribution and use, see the accompanying README file.
-*
-* This file contains routines to set the default Huffman tables, if they are
-* not already set.
-*/
+ * jstdhuff.c
+ *
+ * This file was part of the Independent JPEG Group's software:
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * libjpeg-turbo Modifications:
+ * Copyright (C) 2013, D. R. Commander.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains routines to set the default Huffman tables, if they are
+ * not already set.
+ */
 
 /*
  * Huffman table setup routines