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

Side by Side Diff: core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp

Issue 1439223003: Merge to XFA: Remove relative includes. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: fix merge 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 "render_int.h" 7 #include "render_int.h"
8 8
9 #include <vector> 9 #include <vector>
10 10
11 #include "../fpdf_page/pageint.h"
12 #include "core/include/fpdfapi/fpdf_module.h" 11 #include "core/include/fpdfapi/fpdf_module.h"
13 #include "core/include/fpdfapi/fpdf_pageobj.h" 12 #include "core/include/fpdfapi/fpdf_pageobj.h"
14 #include "core/include/fpdfapi/fpdf_render.h" 13 #include "core/include/fpdfapi/fpdf_render.h"
15 #include "core/include/fxcodec/fx_codec.h" 14 #include "core/include/fxcodec/fx_codec.h"
16 #include "core/include/fxcrt/fx_safe_types.h" 15 #include "core/include/fxcrt/fx_safe_types.h"
17 #include "core/include/fxge/fx_ge.h" 16 #include "core/include/fxge/fx_ge.h"
17 #include "core/src/fpdfapi/fpdf_page/pageint.h"
18 #include "third_party/base/nonstd_unique_ptr.h" 18 #include "third_party/base/nonstd_unique_ptr.h"
19 19
20 namespace { 20 namespace {
21 21
22 unsigned int GetBits8(const uint8_t* pData, uint64_t bitpos, size_t nbits) { 22 unsigned int GetBits8(const uint8_t* pData, uint64_t bitpos, size_t nbits) {
23 ASSERT(nbits == 1 || nbits == 2 || nbits == 4 || nbits == 8 || nbits == 16); 23 ASSERT(nbits == 1 || nbits == 2 || nbits == 4 || nbits == 8 || nbits == 16);
24 ASSERT((bitpos & (nbits - 1)) == 0); 24 ASSERT((bitpos & (nbits - 1)) == 0);
25 unsigned int byte = pData[bitpos / 8]; 25 unsigned int byte = pData[bitpos / 8];
26 if (nbits == 8) { 26 if (nbits == 8) {
27 return byte; 27 return byte;
(...skipping 1622 matching lines...) Expand 10 before | Expand all | Expand 10 after
1650 } 1650 }
1651 FX_BOOL CPDF_ImageLoader::Continue(void* LoadHandle, IFX_Pause* pPause) { 1651 FX_BOOL CPDF_ImageLoader::Continue(void* LoadHandle, IFX_Pause* pPause) {
1652 return ((CPDF_ProgressiveImageLoaderHandle*)LoadHandle)->Continue(pPause); 1652 return ((CPDF_ProgressiveImageLoaderHandle*)LoadHandle)->Continue(pPause);
1653 } 1653 }
1654 CPDF_ImageLoader::~CPDF_ImageLoader() { 1654 CPDF_ImageLoader::~CPDF_ImageLoader() {
1655 if (!m_bCached) { 1655 if (!m_bCached) {
1656 delete m_pBitmap; 1656 delete m_pBitmap;
1657 delete m_pMask; 1657 delete m_pMask;
1658 } 1658 }
1659 } 1659 }
OLDNEW
« no previous file with comments | « core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp ('k') | core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698