src/images/SkJpegUtility.cpp - Issue 1180983002: Switch SkJpegCode to libjpeg-turbo

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/images/SkJpegUtility.cpp

Issue 1180983002: Switch SkJpegCode to libjpeg-turbo (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Adding turbo to DEPS Created 5 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: src/images/SkJpegUtility.cpp

diff --git a/src/images/SkJpegUtility.cpp b/src/images/SkJpegUtility.cpp

index 937c5ec6f6f343f44b7a1fe06b9df7d1846fab91..d94d2e0548be90bc66dcf6cad59e05c5204be1fe 100644

--- a/src/images/SkJpegUtility.cpp

+++ b/src/images/SkJpegUtility.cpp

@@ -102,7 +102,7 @@ skjpeg_source_mgr::skjpeg_source_mgr(SkStream* stream, SkImageDecoder* decoder)

init_source = sk_init_source;

fill_input_buffer = sk_fill_input_buffer;

skip_input_data = sk_skip_input_data;

- resync_to_restart = jpeg_resync_to_restart;

+ resync_to_restart = jResyncRestart;

term_source = sk_term_source;

#ifdef SK_BUILD_FOR_ANDROID

seek_input_data = sk_seek_input_data;

@@ -160,7 +160,7 @@ void skjpeg_error_exit(j_common_ptr cinfo) {

(*error->output_message) (cinfo);

/* Let the memory manager delete any temp files before we die */

- jpeg_destroy(cinfo);

+ jDestroy(cinfo);

longjmp(error->fJmpBuf, -1);

}