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

Side by Side Diff: core/fpdfapi/fpdf_parser/cpdf_stream.cpp

Issue 2387193003: Revert of Assert that only 0-numbered objects are Released() (Closed)
Patch Set: Created 4 years, 2 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_parser/cpdf_parser.cpp ('k') | no next file » | 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_parser/cpdf_stream.h" 7 #include "core/fpdfapi/fpdf_parser/cpdf_stream.h"
8 8
9 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" 9 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
10 #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h" 10 #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h"
11 #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h" 11 #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h"
12 #include "third_party/base/numerics/safe_conversions.h" 12 #include "third_party/base/numerics/safe_conversions.h"
13 #include "third_party/base/stl_util.h" 13 #include "third_party/base/stl_util.h"
14 14
15 CPDF_Stream::CPDF_Stream() {} 15 CPDF_Stream::CPDF_Stream() {}
16 16
17 CPDF_Stream::CPDF_Stream(uint8_t* pData, uint32_t size, CPDF_Dictionary* pDict) 17 CPDF_Stream::CPDF_Stream(uint8_t* pData, uint32_t size, CPDF_Dictionary* pDict)
18 : m_pDict(pDict), 18 : m_pDict(pDict),
19 m_dwSize(size), 19 m_dwSize(size),
20 m_pDataBuf(pData) {} 20 m_pDataBuf(pData) {}
21 21
22 CPDF_Stream::~CPDF_Stream() { 22 CPDF_Stream::~CPDF_Stream() {}
23 m_ObjNum = kInvalidObjNum;
24 if (m_pDict && m_pDict->GetObjNum() == kInvalidObjNum)
25 m_pDict.release(); // lowercase release, release ownership.
26 }
27 23
28 CPDF_Object::Type CPDF_Stream::GetType() const { 24 CPDF_Object::Type CPDF_Stream::GetType() const {
29 return STREAM; 25 return STREAM;
30 } 26 }
31 27
32 CPDF_Dictionary* CPDF_Stream::GetDict() const { 28 CPDF_Dictionary* CPDF_Stream::GetDict() const {
33 return m_pDict.get(); 29 return m_pDict.get();
34 } 30 }
35 31
36 bool CPDF_Stream::IsStream() const { 32 bool CPDF_Stream::IsStream() const {
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 110
115 return TRUE; 111 return TRUE;
116 } 112 }
117 113
118 CFX_WideString CPDF_Stream::GetUnicodeText() const { 114 CFX_WideString CPDF_Stream::GetUnicodeText() const {
119 CPDF_StreamAcc stream; 115 CPDF_StreamAcc stream;
120 stream.LoadAllData(this, FALSE); 116 stream.LoadAllData(this, FALSE);
121 return PDF_DecodeText(stream.GetData(), stream.GetSize()); 117 return PDF_DecodeText(stream.GetData(), stream.GetSize());
122 } 118 }
123 119
OLDNEW
« no previous file with comments | « core/fpdfapi/fpdf_parser/cpdf_parser.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698