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

Side by Side Diff: core/src/fxcodec/codec/fx_codec.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 "../../../include/fxcodec/fx_codec.h" 7 #include "../../../include/fxcodec/fx_codec.h"
8 8
9 #include <cmath> 9 #include <cmath>
10 10
11 #include "../../../../third_party/base/logging.h"
12 #include "../../../include/fxcrt/fx_safe_types.h" 11 #include "../../../include/fxcrt/fx_safe_types.h"
13 #include "codec_int.h" 12 #include "codec_int.h"
13 #include "third_party/base/logging.h"
14 14
15 CCodec_ModuleMgr::CCodec_ModuleMgr() 15 CCodec_ModuleMgr::CCodec_ModuleMgr()
16 : m_pBasicModule(new CCodec_BasicModule), 16 : m_pBasicModule(new CCodec_BasicModule),
17 m_pFaxModule(new CCodec_FaxModule), 17 m_pFaxModule(new CCodec_FaxModule),
18 m_pJpegModule(new CCodec_JpegModule), 18 m_pJpegModule(new CCodec_JpegModule),
19 m_pJpxModule(new CCodec_JpxModule), 19 m_pJpxModule(new CCodec_JpxModule),
20 m_pJbig2Module(new CCodec_Jbig2Module), 20 m_pJbig2Module(new CCodec_Jbig2Module),
21 m_pIccModule(new CCodec_IccModule), 21 m_pIccModule(new CCodec_IccModule),
22 m_pFlateModule(new CCodec_FlateModule), 22 m_pFlateModule(new CCodec_FlateModule),
23 m_pPngModule(new CCodec_PngModule), 23 m_pPngModule(new CCodec_PngModule),
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 int nComps, 460 int nComps,
461 int bpc) { 461 int bpc) {
462 CCodec_RLScanlineDecoder* pRLScanlineDecoder = new CCodec_RLScanlineDecoder; 462 CCodec_RLScanlineDecoder* pRLScanlineDecoder = new CCodec_RLScanlineDecoder;
463 if (!pRLScanlineDecoder->Create(src_buf, src_size, width, height, nComps, 463 if (!pRLScanlineDecoder->Create(src_buf, src_size, width, height, nComps,
464 bpc)) { 464 bpc)) {
465 delete pRLScanlineDecoder; 465 delete pRLScanlineDecoder;
466 return NULL; 466 return NULL;
467 } 467 }
468 return pRLScanlineDecoder; 468 return pRLScanlineDecoder;
469 } 469 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698