Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(676)

Unified Diff: core/src/fxcodec/codec/fx_codec_jpeg.cpp

Issue 1471323004: Inflict PPDF_ENABLE_XFA ifdefs on XFA core/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: 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:
View side-by-side diff with in-line comments
Download patch
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 b59deb5a0d5452c434f2d7ff47e56603dc9b484b..b5eb4b2692e3865101c3edb3cd4abff2818c1f4a 100644
--- a/core/src/fxcodec/codec/fx_codec_jpeg.cpp
+++ b/core/src/fxcodec/codec/fx_codec_jpeg.cpp
@@ -230,6 +230,7 @@ static void _JpegEncode(const CFX_DIBSource* pSource,
FX_Free(line_buf);
dest_size = dest_buf_length - (FX_STRSIZE)dest.free_in_buffer;
}
+#ifdef PDF_ENABLE_XFA
static void _JpegLoadAttribute(struct jpeg_decompress_struct* pInfo,
CFX_DIBAttribute* pAttribute) {
if (pInfo == NULL || pAttribute == NULL) {
@@ -241,6 +242,7 @@ static void _JpegLoadAttribute(struct jpeg_decompress_struct* pInfo,
pAttribute->m_wDPIUnit = pInfo->density_unit;
}
}
+#endif
static FX_BOOL _JpegLoadInfo(const uint8_t* src_buf,
FX_DWORD src_size,
int& width,
@@ -630,8 +632,12 @@ void CCodec_JpegModule::Input(void* pContext,
int CCodec_JpegModule::ReadHeader(void* pContext,
int* width,
int* height,
+#ifndef PDF_ENABLE_XFA
+ int* nComps) {
+#else
int* nComps,
CFX_DIBAttribute* pAttribute) {
+#endif
FXJPEG_Context* p = (FXJPEG_Context*)pContext;
if (setjmp(p->m_JumpMark) == -1) {
return 1;
@@ -646,7 +652,9 @@ int CCodec_JpegModule::ReadHeader(void* pContext,
*width = p->m_Info.image_width;
*height = p->m_Info.image_height;
*nComps = p->m_Info.num_components;
+#ifdef PDF_ENABLE_XFA
_JpegLoadAttribute(&p->m_Info, pAttribute);
+#endif
return 0;
}
int CCodec_JpegModule::StartScanline(void* pContext, int down_scale) {

Powered by Google App Engine
This is Rietveld 408576698