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

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

Issue 554913003: Change the forced clear order of CPDF_DocPageData::Clear, and remove m_pDocument in CPDF_Color (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Nit Created 6 years, 3 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_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 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 _FPDF_RESOURCE_ 7 #ifndef _FPDF_RESOURCE_
8 #define _FPDF_RESOURCE_ 8 #define _FPDF_RESOURCE_
9 #ifndef _FPDF_PARSER_ 9 #ifndef _FPDF_PARSER_
10 #include "fpdf_parser.h" 10 #include "fpdf_parser.h"
(...skipping 662 matching lines...) Expand 10 before | Expand all | Expand 10 after
673 int m_nComponents; 673 int m_nComponents;
674 674
675 CPDF_Array* m_pArray; 675 CPDF_Array* m_pArray;
676 676
677 FX_DWORD m_dwStdConversion; 677 FX_DWORD m_dwStdConversion;
678 }; 678 };
679 class CPDF_Color : public CFX_Object 679 class CPDF_Color : public CFX_Object
680 { 680 {
681 public: 681 public:
682 682
683 CPDF_Color() :m_pCS(NULL), m_pBuffer(NULL), m_pDocument(NULL) 683 CPDF_Color() :m_pCS(NULL), m_pBuffer(NULL)
684 { 684 {
685 } 685 }
686 686
687 CPDF_Color(int family); 687 CPDF_Color(int family);
688 688
689 ~CPDF_Color(); 689 ~CPDF_Color();
690 690
691 FX_BOOL IsNull() const 691 FX_BOOL IsNull() const
692 { 692 {
693 return m_pBuffer == NULL; 693 return m_pBuffer == NULL;
(...skipping 21 matching lines...) Expand all
715 CPDF_ColorSpace* GetPatternCS() const; 715 CPDF_ColorSpace* GetPatternCS() const;
716 716
717 FX_FLOAT* GetPatternColor() const; 717 FX_FLOAT* GetPatternColor() const;
718 718
719 CPDF_ColorSpace* m_pCS; 719 CPDF_ColorSpace* m_pCS;
720 720
721 protected: 721 protected:
722 void ReleaseBuffer(); 722 void ReleaseBuffer();
723 void ReleaseColorSpace(); 723 void ReleaseColorSpace();
724 FX_FLOAT* m_pBuffer; 724 FX_FLOAT* m_pBuffer;
725 CPDF_Document* m_pDocument;
726 }; 725 };
727 #define PATTERN_TILING 1 726 #define PATTERN_TILING 1
728 #define PATTERN_SHADING 2 727 #define PATTERN_SHADING 2
729 class CPDF_Pattern : public CFX_Object 728 class CPDF_Pattern : public CFX_Object
730 { 729 {
731 public: 730 public:
732 731
733 virtual ~CPDF_Pattern(); 732 virtual ~CPDF_Pattern();
734 733
735 CPDF_Object* m_pPatternObj; 734 CPDF_Object* m_pPatternObj;
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
946 FX_BOOL m_bIsMask; 945 FX_BOOL m_bIsMask;
947 946
948 FX_BOOL m_bInterpolate; 947 FX_BOOL m_bInterpolate;
949 948
950 CPDF_Document* m_pDocument; 949 CPDF_Document* m_pDocument;
951 950
952 CPDF_Dictionary* m_pOC; 951 CPDF_Dictionary* m_pOC;
953 CPDF_Dictionary* InitJPEG(FX_LPBYTE pData, FX_DWORD size); 952 CPDF_Dictionary* InitJPEG(FX_LPBYTE pData, FX_DWORD size);
954 }; 953 };
955 #endif 954 #endif
OLDNEW
« no previous file with comments | « no previous file | core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698