Manual fixups to PDF_ENABLE_XFA in core/

core/src/fxcodec/codec/fx_codec_jpeg.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <setjmp.h>
 
 #include "codec_int.h"
 #include "core/include/fxcodec/fx_codec.h"
@@ skipping 212 matching lines @@
       dest.next_output_byte = dest_buf + dest_buf_length - dest.free_in_buffer;
       dest_buf_length += JPEG_BLOCK_SIZE;
       dest.free_in_buffer += JPEG_BLOCK_SIZE;
     }
   }
   jpeg_finish_compress(&cinfo);
   jpeg_destroy_compress(&cinfo);
   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) {
     return;
   }
   if (pAttribute) {
     pAttribute->m_nXDPI = pInfo->X_density;
     pAttribute->m_nYDPI = pInfo->Y_density;
     pAttribute->m_wDPIUnit = pInfo->density_unit;
   }
 }
-#endif
+#endif  // PDF_ENABLE_XFA
+
 static FX_BOOL _JpegLoadInfo(const uint8_t* src_buf,
                              FX_DWORD src_size,
                              int& width,
                              int& height,
                              int& num_components,
                              int& bits_per_components,
                              FX_BOOL& color_transform,
                              uint8_t** icc_buf_ptr,
                              FX_DWORD* icc_length) {
   _JpegScanSOI(src_buf, src_size);
@@ skipping 366 matching lines @@
       p->m_SkipSize -= src_size;
       return;
     }
     src_size -= p->m_SkipSize;
     src_buf += p->m_SkipSize;
     p->m_SkipSize = 0;
   }
   p->m_SrcMgr.next_input_byte = src_buf;
   p->m_SrcMgr.bytes_in_buffer = src_size;
 }
+
+#ifdef PDF_ENABLE_XFA
 int CCodec_JpegModule::ReadHeader(void* pContext,
                                   int* width,
                                   int* height,
-#ifndef PDF_ENABLE_XFA
-                                  int* nComps) {
-#else
                                   int* nComps,
                                   CFX_DIBAttribute* pAttribute) {
-#endif
+#else   // PDF_ENABLE_XFA
+int CCodec_JpegModule::ReadHeader(void* pContext,
+                                  int* width,
+                                  int* height,
+                                  int* nComps) {
+#endif  // PDF_ENABLE_XFA
   FXJPEG_Context* p = (FXJPEG_Context*)pContext;
   if (setjmp(p->m_JumpMark) == -1) {
     return 1;
   }
   int ret = jpeg_read_header(&p->m_Info, true);
   if (ret == JPEG_SUSPENDED) {
     return 2;
   }
   if (ret != JPEG_HEADER_OK) {
     return 1;
@@ skipping 27 matching lines @@
                                           uint8_t** avail_buf_ptr) {
   if (avail_buf_ptr != NULL) {
     *avail_buf_ptr = NULL;
     if (((FXJPEG_Context*)pContext)->m_SrcMgr.bytes_in_buffer > 0) {
       *avail_buf_ptr =
           (uint8_t*)((FXJPEG_Context*)pContext)->m_SrcMgr.next_input_byte;
     }
   }
   return (FX_DWORD)((FXJPEG_Context*)pContext)->m_SrcMgr.bytes_in_buffer;
 }