core/src/fxcodec/codec/fx_codec_jpeg.cpp - Issue 1434543003: Merge to XFA: Fix all relative includes to third_party.

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: core/src/fxcodec/codec/fx_codec_jpeg.cpp

Issue 1434543003: Merge to XFA: Fix all relative includes to third_party. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: Fix XFA Created 5 years, 1 month 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: core/src/fxcodec/codec/fx_codec_jpeg.cpp

diff --git a/core/src/fxcodec/codec/fx_codec_jpeg.cpp b/core/src/fxcodec/codec/fx_codec_jpeg.cpp

index b3cd2c72e38b4c996d15fb8b33fc943670aca06e..78ed013b0b0346a3ed9b7e7b4cd1f4185ca429f5 100644

--- a/core/src/fxcodec/codec/fx_codec_jpeg.cpp

+++ b/core/src/fxcodec/codec/fx_codec_jpeg.cpp

@@ -13,7 +13,13 @@

extern "C" {

#undef FAR

-#include "../../../../third_party/libjpeg/jpeglib.h"

+#if defined(USE_SYSTEM_LIBJPEG)

+#include <jpeglib.h>

+#elif defined(USE_LIBJPEG_TURBO)

+#include "third_party/libjpeg_turbo/jpeglib.h"

+#else

+#include "third_party/libjpeg/jpeglib.h"

+#endif

}

extern "C" {