aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2021-04-02 19:50:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-02 19:50:20 +0000
commitdd6969c82e19edca3663c04f1b471f5ddc09ae9d (patch)
treee85933462c2549d51deeb7c7405a62d02b8e77ff
parentb5f66a384a650d729d43ce66ac46d6d89b8a1f3c (diff)
parent5ca56a72f5fc4d09d7377de4e7b26e787eafde4e (diff)
downloadlibjpeg-turbo-dd6969c82e19edca3663c04f1b471f5ddc09ae9d.tar.gz
Upgrade libjpeg-turbo to 7b4981b6500ccba10733c352b9ed2dad14ce3c73 am: ef1727bef4 am: 77e8e10ef6 am: 5ca56a72f5
Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1662592 Change-Id: Ie6d37940fe842bcbc271a24912b14eae1a5c69d7
-rw-r--r--METADATA6
-rw-r--r--jpeglib.h4
2 files changed, 7 insertions, 3 deletions
diff --git a/METADATA b/METADATA
index 4ad1e69f..d9c3aeee 100644
--- a/METADATA
+++ b/METADATA
@@ -5,11 +5,11 @@ third_party {
type: GIT
value: "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo"
}
- version: "07a7d24ba3c91fa695d4f2b65f0788c0c80c7928"
+ version: "7b4981b6500ccba10733c352b9ed2dad14ce3c73"
license_type: NOTICE
last_upgrade_date {
year: 2021
- month: 2
- day: 9
+ month: 4
+ day: 1
}
}
diff --git a/jpeglib.h b/jpeglib.h
index d7664f06..979ef7c8 100644
--- a/jpeglib.h
+++ b/jpeglib.h
@@ -18,6 +18,10 @@
#ifndef JPEGLIB_H
#define JPEGLIB_H
+/* Begin chromium edits */
+#include "jpeglibmangler.h"
+/* End chromium edits */
+
/*
* First we include the configuration files that record how this
* installation of the JPEG library is set up. jconfig.h can be