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

Side by Side Diff: core/src/fxge/dib/fx_dib_main.cpp

Issue 1438573002: Merge to XFA: Fix relative includes within 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 unified diff | Download patch
« no previous file with comments | « core/src/fxge/dib/fx_dib_engine.cpp ('k') | core/src/fxge/dib/fx_dib_transform.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/fxge/fx_dib.h" 7 #include "core/include/fxge/fx_dib.h"
8 #include "../../../include/fxge/fx_ge.h" 8
9 #include "../../../include/fxcodec/fx_codec.h" 9 #include <limits.h>
10
11 #include "core/include/fxge/fx_ge.h"
12 #include "core/include/fxcodec/fx_codec.h"
10 #include "dib_int.h" 13 #include "dib_int.h"
11 #include <limits.h> 14
12 FX_BOOL ConvertBuffer(FXDIB_Format dest_format, 15 FX_BOOL ConvertBuffer(FXDIB_Format dest_format,
13 uint8_t* dest_buf, 16 uint8_t* dest_buf,
14 int dest_pitch, 17 int dest_pitch,
15 int width, 18 int width,
16 int height, 19 int height,
17 const CFX_DIBSource* pSrcBitmap, 20 const CFX_DIBSource* pSrcBitmap,
18 int src_left, 21 int src_left,
19 int src_top, 22 int src_top,
20 FX_DWORD*& pal, 23 FX_DWORD*& pal,
21 void* pIccTransform); 24 void* pIccTransform);
(...skipping 1691 matching lines...) Expand 10 before | Expand all | Expand 10 after
1713 if (!m_pBitmap->Create(width, height, src_format)) { 1716 if (!m_pBitmap->Create(width, height, src_format)) {
1714 delete m_pBitmap; 1717 delete m_pBitmap;
1715 m_pBitmap = NULL; 1718 m_pBitmap = NULL;
1716 return FALSE; 1719 return FALSE;
1717 } 1720 }
1718 if (pSrcPalette) { 1721 if (pSrcPalette) {
1719 m_pBitmap->CopyPalette(pSrcPalette); 1722 m_pBitmap->CopyPalette(pSrcPalette);
1720 } 1723 }
1721 return TRUE; 1724 return TRUE;
1722 } 1725 }
OLDNEW
« no previous file with comments | « core/src/fxge/dib/fx_dib_engine.cpp ('k') | core/src/fxge/dib/fx_dib_transform.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698