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

Side by Side Diff: core/fpdfapi/fpdf_page/pageint.h

Issue 2032613003: Get rid of NULLs in core/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: Fix a bad merge Created 4 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
« no previous file with comments | « core/fpdfapi/fpdf_page/include/cpdf_image.h ('k') | core/fpdfapi/fpdf_parser/cfdf_document.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 #ifndef CORE_FPDFAPI_FPDF_PAGE_PAGEINT_H_ 7 #ifndef CORE_FPDFAPI_FPDF_PAGE_PAGEINT_H_
8 #define CORE_FPDFAPI_FPDF_PAGE_PAGEINT_H_ 8 #define CORE_FPDFAPI_FPDF_PAGE_PAGEINT_H_
9 9
10 #include <map> 10 #include <map>
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 ~CPDF_StreamParser(); 45 ~CPDF_StreamParser();
46 46
47 CPDF_Stream* ReadInlineStream(CPDF_Document* pDoc, 47 CPDF_Stream* ReadInlineStream(CPDF_Document* pDoc,
48 CPDF_Dictionary* pDict, 48 CPDF_Dictionary* pDict,
49 CPDF_Object* pCSObj); 49 CPDF_Object* pCSObj);
50 SyntaxType ParseNextElement(); 50 SyntaxType ParseNextElement();
51 uint8_t* GetWordBuf() { return m_WordBuffer; } 51 uint8_t* GetWordBuf() { return m_WordBuffer; }
52 uint32_t GetWordSize() const { return m_WordSize; } 52 uint32_t GetWordSize() const { return m_WordSize; }
53 CPDF_Object* GetObject() { 53 CPDF_Object* GetObject() {
54 CPDF_Object* pObj = m_pLastObj; 54 CPDF_Object* pObj = m_pLastObj;
55 m_pLastObj = NULL; 55 m_pLastObj = nullptr;
56 return pObj; 56 return pObj;
57 } 57 }
58 uint32_t GetPos() const { return m_Pos; } 58 uint32_t GetPos() const { return m_Pos; }
59 void SetPos(uint32_t pos) { m_Pos = pos; } 59 void SetPos(uint32_t pos) { m_Pos = pos; }
60 CPDF_Object* ReadNextObject(bool bAllowNestedArray, uint32_t dwInArrayLevel); 60 CPDF_Object* ReadNextObject(bool bAllowNestedArray, uint32_t dwInArrayLevel);
61 61
62 protected: 62 protected:
63 friend class fpdf_page_parser_old_ReadHexString_Test; 63 friend class fpdf_page_parser_old_ReadHexString_Test;
64 64
65 void GetNextWord(FX_BOOL& bIsNumber); 65 void GetNextWord(FX_BOOL& bIsNumber);
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 }; 553 };
554 554
555 CFX_ByteStringC PDF_FindKeyAbbreviationForTesting(const CFX_ByteStringC& abbr); 555 CFX_ByteStringC PDF_FindKeyAbbreviationForTesting(const CFX_ByteStringC& abbr);
556 CFX_ByteStringC PDF_FindValueAbbreviationForTesting( 556 CFX_ByteStringC PDF_FindValueAbbreviationForTesting(
557 const CFX_ByteStringC& abbr); 557 const CFX_ByteStringC& abbr);
558 558
559 void PDF_ReplaceAbbr(CPDF_Object* pObj); 559 void PDF_ReplaceAbbr(CPDF_Object* pObj);
560 bool IsPathOperator(const uint8_t* buf, size_t len); 560 bool IsPathOperator(const uint8_t* buf, size_t len);
561 561
562 #endif // CORE_FPDFAPI_FPDF_PAGE_PAGEINT_H_ 562 #endif // CORE_FPDFAPI_FPDF_PAGE_PAGEINT_H_
OLDNEW
« no previous file with comments | « core/fpdfapi/fpdf_page/include/cpdf_image.h ('k') | core/fpdfapi/fpdf_parser/cfdf_document.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698