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

Side by Side Diff: core/src/fxcodec/codec/fx_codec_jpeg.cpp

Issue 1152693005: Merge to XFA: Move fx_safe_types.h to include/ directory. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Fix BUILD.gn 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:
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 "../../../include/fxcodec/fx_codec.h" 7 #include "../../../include/fxcodec/fx_codec.h"
8 #include "../../../include/fxcrt/fx_safe_types.h"
8 #include "../../../include/fxge/fx_dib.h" 9 #include "../../../include/fxge/fx_dib.h"
9 #include "../../../src/fxcrt/fx_safe_types.h"
10 #include "codec_int.h" 10 #include "codec_int.h"
11
11 extern "C" { 12 extern "C" {
12 static void _JpegScanSOI(const FX_BYTE*& src_buf, FX_DWORD& src_size) 13 static void _JpegScanSOI(const FX_BYTE*& src_buf, FX_DWORD& src_size)
13 { 14 {
14 if (src_size == 0) { 15 if (src_size == 0) {
15 return; 16 return;
16 } 17 }
17 FX_DWORD offset = 0; 18 FX_DWORD offset = 0;
18 while (offset < src_size - 1) { 19 while (offset < src_size - 1) {
19 if (src_buf[offset] == 0xff && src_buf[offset + 1] == 0xd8) { 20 if (src_buf[offset] == 0xff && src_buf[offset + 1] == 0xd8) {
20 src_buf += offset; 21 src_buf += offset;
(...skipping 718 matching lines...) Expand 10 before | Expand all | Expand 10 after
739 return m_pExtProvider->GetAvailInput(pContext, avail_buf_ptr); 740 return m_pExtProvider->GetAvailInput(pContext, avail_buf_ptr);
740 } 741 }
741 if(avail_buf_ptr != NULL) { 742 if(avail_buf_ptr != NULL) {
742 *avail_buf_ptr = NULL; 743 *avail_buf_ptr = NULL;
743 if(((FXJPEG_Context*)pContext)->m_SrcMgr.bytes_in_buffer > 0) { 744 if(((FXJPEG_Context*)pContext)->m_SrcMgr.bytes_in_buffer > 0) {
744 *avail_buf_ptr = (FX_LPBYTE)((FXJPEG_Context*)pContext)->m_SrcMgr.ne xt_input_byte; 745 *avail_buf_ptr = (FX_LPBYTE)((FXJPEG_Context*)pContext)->m_SrcMgr.ne xt_input_byte;
745 } 746 }
746 } 747 }
747 return (FX_DWORD)((FXJPEG_Context*)pContext)->m_SrcMgr.bytes_in_buffer; 748 return (FX_DWORD)((FXJPEG_Context*)pContext)->m_SrcMgr.bytes_in_buffer;
748 } 749 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698