summaryrefslogtreecommitdiff
path: root/core/fpdfapi/page/cpdf_colorspace.cpp
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-10-26 15:06:11 -0700
committerCommit bot <commit-bot@chromium.org>2016-10-26 15:06:11 -0700
commite5cb0b191aed020da99757c117dae014ea65c6ba (patch)
tree49f6f8124adbf24f94def640932adbf7e1460175 /core/fpdfapi/page/cpdf_colorspace.cpp
parentcd5f026e7b277ec73d53e149c7c48ee981547d1a (diff)
downloadpdfium-e5cb0b191aed020da99757c117dae014ea65c6ba.tar.xz
Take advantage of implicit std::unique_ptr<>(nulltpr_t) ctor.
Review-Url: https://codereview.chromium.org/2453163002
Diffstat (limited to 'core/fpdfapi/page/cpdf_colorspace.cpp')
-rw-r--r--core/fpdfapi/page/cpdf_colorspace.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/core/fpdfapi/page/cpdf_colorspace.cpp b/core/fpdfapi/page/cpdf_colorspace.cpp
index fe840d10df..e43bacc079 100644
--- a/core/fpdfapi/page/cpdf_colorspace.cpp
+++ b/core/fpdfapi/page/cpdf_colorspace.cpp
@@ -332,7 +332,7 @@ CPDF_ColorSpace* CPDF_ColorSpace::GetStockCS(int family) {
std::unique_ptr<CPDF_ColorSpace> CPDF_ColorSpace::Load(CPDF_Document* pDoc,
CPDF_Object* pObj) {
if (!pObj)
- return std::unique_ptr<CPDF_ColorSpace>();
+ return nullptr;
if (pObj->IsName()) {
return std::unique_ptr<CPDF_ColorSpace>(
@@ -341,7 +341,7 @@ std::unique_ptr<CPDF_ColorSpace> CPDF_ColorSpace::Load(CPDF_Document* pDoc,
if (CPDF_Stream* pStream = pObj->AsStream()) {
CPDF_Dictionary* pDict = pStream->GetDict();
if (!pDict)
- return std::unique_ptr<CPDF_ColorSpace>();
+ return nullptr;
for (const auto& it : *pDict) {
std::unique_ptr<CPDF_ColorSpace> pRet;
@@ -351,16 +351,16 @@ std::unique_ptr<CPDF_ColorSpace> CPDF_ColorSpace::Load(CPDF_Document* pDoc,
if (pRet)
return pRet;
}
- return std::unique_ptr<CPDF_ColorSpace>();
+ return nullptr;
}
CPDF_Array* pArray = pObj->AsArray();
if (!pArray || pArray->IsEmpty())
- return std::unique_ptr<CPDF_ColorSpace>();
+ return nullptr;
CPDF_Object* pFamilyObj = pArray->GetDirectObjectAt(0);
if (!pFamilyObj)
- return std::unique_ptr<CPDF_ColorSpace>();
+ return nullptr;
CFX_ByteString familyname = pFamilyObj->GetString();
if (pArray->GetCount() == 1)
@@ -386,11 +386,11 @@ std::unique_ptr<CPDF_ColorSpace> CPDF_ColorSpace::Load(CPDF_Document* pDoc,
} else if (id == FXBSTR_ID('P', 'a', 't', 't')) {
pCS.reset(new CPDF_PatternCS(pDoc));
} else {
- return std::unique_ptr<CPDF_ColorSpace>();
+ return nullptr;
}
pCS->m_pArray = pArray;
if (!pCS->v_Load(pDoc, pArray))
- return std::unique_ptr<CPDF_ColorSpace>();
+ return nullptr;
return pCS;
}