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

Side by Side 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:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include <setjmp.h> 7 #include <setjmp.h>
8 8
9 #include "../../../include/fxcodec/fx_codec.h" 9 #include "../../../include/fxcodec/fx_codec.h"
10 #include "../../../include/fxcrt/fx_safe_types.h" 10 #include "../../../include/fxcrt/fx_safe_types.h"
11 #include "../../../include/fxge/fx_dib.h" 11 #include "../../../include/fxge/fx_dib.h"
12 #include "codec_int.h" 12 #include "codec_int.h"
13 13
14 extern "C" { 14 extern "C" {
15 #undef FAR 15 #undef FAR
16 #include "../../../../third_party/libjpeg/jpeglib.h" 16 #if defined(USE_SYSTEM_LIBJPEG)
17 #include <jpeglib.h>
18 #elif defined(USE_LIBJPEG_TURBO)
19 #include "third_party/libjpeg_turbo/jpeglib.h"
20 #else
21 #include "third_party/libjpeg/jpeglib.h"
22 #endif
17 } 23 }
18 24
19 extern "C" { 25 extern "C" {
20 static void _JpegScanSOI(const uint8_t*& src_buf, FX_DWORD& src_size) { 26 static void _JpegScanSOI(const uint8_t*& src_buf, FX_DWORD& src_size) {
21 if (src_size == 0) { 27 if (src_size == 0) {
22 return; 28 return;
23 } 29 }
24 FX_DWORD offset = 0; 30 FX_DWORD offset = 0;
25 while (offset < src_size - 1) { 31 while (offset < src_size - 1) {
26 if (src_buf[offset] == 0xff && src_buf[offset + 1] == 0xd8) { 32 if (src_buf[offset] == 0xff && src_buf[offset + 1] == 0xd8) {
(...skipping 632 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 uint8_t** avail_buf_ptr) { 665 uint8_t** avail_buf_ptr) {
660 if (avail_buf_ptr != NULL) { 666 if (avail_buf_ptr != NULL) {
661 *avail_buf_ptr = NULL; 667 *avail_buf_ptr = NULL;
662 if (((FXJPEG_Context*)pContext)->m_SrcMgr.bytes_in_buffer > 0) { 668 if (((FXJPEG_Context*)pContext)->m_SrcMgr.bytes_in_buffer > 0) {
663 *avail_buf_ptr = 669 *avail_buf_ptr =
664 (uint8_t*)((FXJPEG_Context*)pContext)->m_SrcMgr.next_input_byte; 670 (uint8_t*)((FXJPEG_Context*)pContext)->m_SrcMgr.next_input_byte;
665 } 671 }
666 } 672 }
667 return (FX_DWORD)((FXJPEG_Context*)pContext)->m_SrcMgr.bytes_in_buffer; 673 return (FX_DWORD)((FXJPEG_Context*)pContext)->m_SrcMgr.bytes_in_buffer;
668 } 674 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698