Skip to content

Commit cd69e9a

Browse files
committed
Restore original jcmaster.c, use constants instead of modifying the file.
1 parent 4182c1e commit cd69e9a

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

jni/vendor/libjpeg-turbo/Android.mk

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,11 @@ LOCAL_EXPORT_C_INCLUDES := \
201201
$(LOCAL_PATH)/$(SOURCE_PATH) \
202202

203203
LOCAL_CFLAGS += \
204-
-DBUILD="20141110" \
204+
-DBUILD="\"20181112\"" \
205+
-DPACKAGE_NAME="\"libjpeg-turbo\"" \
206+
-DVERSION="\"2.0.1\"" \
207+
-DLIBJPEG_TURBO_VERSION="2.0.1" \
208+
-DJPEG_LIB_VERSION=62 \
205209
-DC_ARITH_CODING_SUPPORTED=1 \
206210
-DD_ARITH_CODING_SUPPORTED=1 \
207211
-DBITS_IN_JSAMPLE=8 \
@@ -222,8 +226,6 @@ LOCAL_CFLAGS += \
222226
-DHAVE_UNSIGNED_CHAR=1 \
223227
-DHAVE_UNSIGNED_SHORT=1 \
224228
-DINLINE="inline __attribute__((always_inline))" \
225-
-DJPEG_LIB_VERSION=62 \
226-
-DLIBJPEG_TURBO_VERSION="1.3.90" \
227229
-DMEM_SRCDST_SUPPORTED=1 \
228230
-DNEED_SYS_TYPES_H=1 \
229231
-DSTDC_HEADERS=1 \

jni/vendor/libjpeg-turbo/libjpeg-turbo-2.0.1/jcmaster.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,5 +636,5 @@ jinit_c_master_control(j_compress_ptr cinfo, boolean transcode_only)
636636
else
637637
master->total_passes = cinfo->num_scans;
638638

639-
master->jpeg_version = "Turbo-2.0.1";
639+
master->jpeg_version = PACKAGE_NAME " version " VERSION " (build " BUILD ")";
640640
}

0 commit comments

Comments
 (0)