aboutsummaryrefslogtreecommitdiff
path: root/jquant1.c
diff options
context:
space:
mode:
authornoel@chromium.org <noel@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2014-04-14 06:56:00 +0000
committernoel@chromium.org <noel@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2014-04-14 06:56:00 +0000
commit3395bcc26e390d2960d15020d4a4d27ae0c122fe (patch)
tree70d532ca62c1eb0b3c8d44f818dc304a9a2a80ae /jquant1.c
parent24cafe92b7a98c36a8062e1ac2fef9832588ac85 (diff)
downloadlibjpeg-turbo-3395bcc26e390d2960d15020d4a4d27ae0c122fe.tar.gz
Upgrade libjpeg_turbo to 1.3.1 (r1219)
Remove google.jdmarker.patch, since the fixes for CVE-2013-6629 and CVE-2013-6630 are upstream most everywhere now [1]. Version number to 1.3.1 (config.h, jconfig.h). README.chromium: "Fixed valgrind error" patch was upstreamed in r839 http://sourceforge.net/p/libjpeg-turbo/code/839. The r1188 cherry-pick was put in config.h, say that. [1] http://seclists.org/fulldisclosure/2013/Nov/83 TBR=darin@chromium.org BUG=258723, 299835 Review URL: https://codereview.appspot.com/87110044 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@263594 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Diffstat (limited to 'jquant1.c')
-rw-r--r--jquant1.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/jquant1.c b/jquant1.c
index 362bb1eb..aa2c59a4 100644
--- a/jquant1.c
+++ b/jquant1.c
@@ -1,9 +1,10 @@
/*
* jquant1.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-1996, Thomas G. Lane.
+ * libjpeg-turbo Modifications:
* Copyright (C) 2009, D. R. Commander
- * This file is part of the Independent JPEG Group's software.
* For conditions of distribution and use, see the accompanying README file.
*
* This file contains 1-pass color quantization (color mapping) routines.