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

Side by Side Diff: core/fpdfapi/fpdf_page/cpdf_image.cpp

Issue 1864153002: Move include/fxcodec to fxcodec/include (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Rebase to master Created 4 years, 8 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
« no previous file with comments | « core/fpdfapi/fpdf_page/cpdf_colorspace.cpp ('k') | core/fpdfapi/fpdf_page/fpdf_page_colors.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 2016 PDFium Authors. All rights reserved. 1 // Copyright 2016 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 "core/fpdfapi/fpdf_page/include/cpdf_image.h" 7 #include "core/fpdfapi/fpdf_page/include/cpdf_image.h"
8 8
9 #include "core/fpdfapi/fpdf_page/include/cpdf_page.h" 9 #include "core/fpdfapi/fpdf_page/include/cpdf_page.h"
10 #include "core/fpdfapi/fpdf_page/pageint.h" 10 #include "core/fpdfapi/fpdf_page/pageint.h"
11 #include "core/fpdfapi/fpdf_parser/cpdf_boolean.h" 11 #include "core/fpdfapi/fpdf_parser/cpdf_boolean.h"
12 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h" 12 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
13 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" 13 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
14 #include "core/fpdfapi/fpdf_parser/include/cpdf_string.h" 14 #include "core/fpdfapi/fpdf_parser/include/cpdf_string.h"
15 #include "core/fpdfapi/fpdf_render/cpdf_pagerendercache.h" 15 #include "core/fpdfapi/fpdf_render/cpdf_pagerendercache.h"
16 #include "core/fpdfapi/fpdf_render/render_int.h" 16 #include "core/fpdfapi/fpdf_render/render_int.h"
17 #include "core/fpdfapi/include/cpdf_modulemgr.h" 17 #include "core/fpdfapi/include/cpdf_modulemgr.h"
18 #include "core/fxcodec/include/fx_codec.h"
18 #include "core/fxge/include/fx_dib.h" 19 #include "core/fxge/include/fx_dib.h"
19 #include "core/include/fxcodec/fx_codec.h"
20 20
21 CPDF_Image::CPDF_Image(CPDF_Document* pDoc) 21 CPDF_Image::CPDF_Image(CPDF_Document* pDoc)
22 : m_pDIBSource(nullptr), 22 : m_pDIBSource(nullptr),
23 m_pMask(nullptr), 23 m_pMask(nullptr),
24 m_MatteColor(0), 24 m_MatteColor(0),
25 m_pStream(nullptr), 25 m_pStream(nullptr),
26 m_bInline(FALSE), 26 m_bInline(FALSE),
27 m_pInlineDict(nullptr), 27 m_pInlineDict(nullptr),
28 m_pDocument(pDoc), 28 m_pDocument(pDoc),
29 m_pOC(nullptr) {} 29 m_pOC(nullptr) {}
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 } 413 }
414 if (!ret) { 414 if (!ret) {
415 delete m_pDIBSource; 415 delete m_pDIBSource;
416 m_pDIBSource = nullptr; 416 m_pDIBSource = nullptr;
417 return FALSE; 417 return FALSE;
418 } 418 }
419 m_pMask = pSource->DetachMask(); 419 m_pMask = pSource->DetachMask();
420 m_MatteColor = pSource->GetMatteColor(); 420 m_MatteColor = pSource->GetMatteColor();
421 return FALSE; 421 return FALSE;
422 } 422 }
OLDNEW
« no previous file with comments | « core/fpdfapi/fpdf_page/cpdf_colorspace.cpp ('k') | core/fpdfapi/fpdf_page/fpdf_page_colors.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698