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

Side by Side Diff: core/include/fpdfapi/fpdf_parser.h

Issue 1650793002: Remove the m_V5Type member variable from CPDF_Parser. (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: rebase Created 4 years, 10 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 | « no previous file | core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.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_INCLUDE_FPDFAPI_FPDF_PARSER_H_ 7 #ifndef CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_
8 #define CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_ 8 #define CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_
9 9
10 #include <map> 10 #include <map>
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 CPDF_Dictionary* m_pTrailer; 423 CPDF_Dictionary* m_pTrailer;
424 CPDF_Dictionary* m_pEncryptDict; 424 CPDF_Dictionary* m_pEncryptDict;
425 FX_FILESIZE m_LastXRefOffset; 425 FX_FILESIZE m_LastXRefOffset;
426 FX_BOOL m_bXRefStream; 426 FX_BOOL m_bXRefStream;
427 std::unique_ptr<IPDF_SecurityHandler> m_pSecurityHandler; 427 std::unique_ptr<IPDF_SecurityHandler> m_pSecurityHandler;
428 CFX_ByteString m_bsRecipient; 428 CFX_ByteString m_bsRecipient;
429 CFX_ByteString m_FilePath; 429 CFX_ByteString m_FilePath;
430 CFX_ByteString m_Password; 430 CFX_ByteString m_Password;
431 431
432 struct ObjectInfo { 432 struct ObjectInfo {
433 ObjectInfo() : pos(0) {} 433 ObjectInfo() : pos(0), type(0) {}
434 434
435 FX_FILESIZE pos; 435 FX_FILESIZE pos;
436 // TODO(thestig): Use fields below in place of |m_V5Type| and |m_ObjVersion| 436 uint8_t type;
437 // TODO(thestig): Use field below in place of |m_ObjVersion|
437 #if 0 438 #if 0
438 uint8_t type;
439 uint16_t gennum; 439 uint16_t gennum;
440 #endif 440 #endif
441 }; 441 };
442 std::map<FX_DWORD, ObjectInfo> m_ObjectInfo; 442 std::map<FX_DWORD, ObjectInfo> m_ObjectInfo;
443 443
444 CFX_ByteArray m_V5Type;
445 CFX_WordArray m_ObjVersion; 444 CFX_WordArray m_ObjVersion;
446 CFX_FileSizeArray m_SortedOffset; 445 CFX_FileSizeArray m_SortedOffset;
447 CFX_ArrayTemplate<CPDF_Dictionary*> m_Trailers; 446 CFX_ArrayTemplate<CPDF_Dictionary*> m_Trailers;
448 FX_BOOL m_bVersionUpdated; 447 FX_BOOL m_bVersionUpdated;
449 CPDF_Object* m_pLinearized; 448 CPDF_Object* m_pLinearized;
450 FX_DWORD m_dwFirstPageNo; 449 FX_DWORD m_dwFirstPageNo;
451 FX_DWORD m_dwXrefStartObjNum; 450 FX_DWORD m_dwXrefStartObjNum;
452 451
453 // A map of object numbers to indirect streams. Map owns the streams. 452 // A map of object numbers to indirect streams. Map owns the streams.
454 std::map<FX_DWORD, std::unique_ptr<CPDF_StreamAcc>> m_ObjectStreamMap; 453 std::map<FX_DWORD, std::unique_ptr<CPDF_StreamAcc>> m_ObjectStreamMap;
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
888 FX_DWORD src_size, 887 FX_DWORD src_size,
889 const CPDF_Dictionary* pDict, 888 const CPDF_Dictionary* pDict,
890 uint8_t*& dest_buf, 889 uint8_t*& dest_buf,
891 FX_DWORD& dest_size, 890 FX_DWORD& dest_size,
892 CFX_ByteString& ImageEncoding, 891 CFX_ByteString& ImageEncoding,
893 CPDF_Dictionary*& pImageParms, 892 CPDF_Dictionary*& pImageParms,
894 FX_DWORD estimated_size, 893 FX_DWORD estimated_size,
895 FX_BOOL bImageAcc); 894 FX_BOOL bImageAcc);
896 895
897 #endif // CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_ 896 #endif // CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_
OLDNEW
« no previous file with comments | « no previous file | core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698