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

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

Issue 2410483002: Revert "Re-land "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/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/parser/cpdf_stream.h" 7 #include "core/fpdfapi/parser/cpdf_stream.h"
8 8
9 #include "core/fpdfapi/parser/cpdf_dictionary.h" 9 #include "core/fpdfapi/parser/cpdf_dictionary.h"
10 #include "core/fpdfapi/parser/cpdf_stream_acc.h" 10 #include "core/fpdfapi/parser/cpdf_stream_acc.h"
11 #include "core/fpdfapi/parser/fpdf_parser_decode.h" 11 #include "core/fpdfapi/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), m_dwSize(size), m_pDataBuf(pData) {} 18 : m_pDict(pDict), m_dwSize(size), m_pDataBuf(pData) {}
19 19
20 CPDF_Stream::~CPDF_Stream() { 20 CPDF_Stream::~CPDF_Stream() {}
21 m_ObjNum = kInvalidObjNum;
22 if (m_pDict && m_pDict->GetObjNum() == kInvalidObjNum)
23 m_pDict.release(); // lowercase release, release ownership.
24 }
25 21
26 CPDF_Object::Type CPDF_Stream::GetType() const { 22 CPDF_Object::Type CPDF_Stream::GetType() const {
27 return STREAM; 23 return STREAM;
28 } 24 }
29 25
30 CPDF_Dictionary* CPDF_Stream::GetDict() const { 26 CPDF_Dictionary* CPDF_Stream::GetDict() const {
31 return m_pDict.get(); 27 return m_pDict.get();
32 } 28 }
33 29
34 bool CPDF_Stream::IsStream() const { 30 bool CPDF_Stream::IsStream() const {
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 FXSYS_memcpy(buf, m_pDataBuf.get() + offset, size); 107 FXSYS_memcpy(buf, m_pDataBuf.get() + offset, size);
112 108
113 return TRUE; 109 return TRUE;
114 } 110 }
115 111
116 CFX_WideString CPDF_Stream::GetUnicodeText() const { 112 CFX_WideString CPDF_Stream::GetUnicodeText() const {
117 CPDF_StreamAcc stream; 113 CPDF_StreamAcc stream;
118 stream.LoadAllData(this, FALSE); 114 stream.LoadAllData(this, FALSE);
119 return PDF_DecodeText(stream.GetData(), stream.GetSize()); 115 return PDF_DecodeText(stream.GetData(), stream.GetSize());
120 } 116 }
OLDNEW
« no previous file with comments | « core/fpdfapi/parser/cpdf_parser.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698