Merge branch '1.4.x'

2016-01-06 19:24:55 -06:00
parent 5f2cbbd039 5a3b4fed4b
commit 2111c5acda
6 changed files with 20 additions and 8 deletions
--- a/jchuff.c
+++ b/jchuff.c
@@ -4,7 +4,7 @@
 * 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.ijg
 * file.
 *
@@ -21,6 +21,7 @@
 #include "jinclude.h"
 #include "jpeglib.h"
 #include "jchuff.h"             /* Declarations shared with jcphuff.c */
+#include "jconfigint.h"
 #include <limits.h>

 /*