aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Naidis <alex.naidis@linux.com>2016-10-18 15:18:47 +0200
committerAlex Naidis <alex.naidis@linux.com>2017-01-17 17:54:23 +0000
commit9004320383401ad12a0fe2186c46279631f42df6 (patch)
tree3ea6b2348904792872752ed4d19354342faecbbe
parent0ce519cbf5448782cbe859c4dcf4606b0218ef51 (diff)
downloadlibjpeg-turbo-o-preview.tar.gz
Enable Arithmetic Encoding/Decodingandroid-o-preview-1o-preview
This commit adds the needed files for the Arithmetic Encoder/Decoder to compilation and enables Arithmetic Encoding/Decoding support in the proper configuration file. Test: Displaying appropriate JPEG files. Change-Id: I1745464a9af46ac8abfe6722f666589cb82ef59d Signed-off-by: Alex Naidis <alex.naidis@linux.com>
-rw-r--r--Android.bp3
-rw-r--r--jconfig.h4
2 files changed, 5 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index 52d7785d..72d919ca 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,6 +12,8 @@ cc_defaults {
srcs: [
"jcapimin.c",
"jcapistd.c",
+ "jaricom.c",
+ "jcarith.c",
"jccoefct.c",
"jccolor.c",
"jcdctmgr.c",
@@ -28,6 +30,7 @@ cc_defaults {
"jctrans.c",
"jdapimin.c",
"jdapistd.c",
+ "jdarith.c",
"jdatadst.c",
"jdatasrc.c",
"jdcoefct.c",
diff --git a/jconfig.h b/jconfig.h
index 0f4c2978..9009d352 100644
--- a/jconfig.h
+++ b/jconfig.h
@@ -11,10 +11,10 @@
#define LIBJPEG_TURBO_VERSION_NUMBER 1005001
/* Support arithmetic encoding */
-/* #undef C_ARITH_CODING_SUPPORTED */
+#define C_ARITH_CODING_SUPPORTED 1
/* Support arithmetic decoding */
-/* #undef D_ARITH_CODING_SUPPORTED */
+#define D_ARITH_CODING_SUPPORTED 1
/*
* Define BITS_IN_JSAMPLE as either