Make CPDF_ColorSpace::Load() return a unique_ptr

core/fpdfapi/fpdf_page/include/cpdf_colorspace.h

 // Copyright 2016 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_COLORSPACE_H_
 #define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_COLORSPACE_H_
 
+#include <memory>
+
 #include "core/fxcrt/include/cfx_weak_ptr.h"
 #include "core/fxcrt/include/fx_string.h"
 #include "core/fxcrt/include/fx_system.h"
 
 #define PDFCS_DEVICEGRAY 1
 #define PDFCS_DEVICERGB 2
 #define PDFCS_DEVICECMYK 3
 #define PDFCS_CALGRAY 4
 #define PDFCS_CALRGB 5
 #define PDFCS_LAB 6
 #define PDFCS_ICCBASED 7
 #define PDFCS_SEPARATION 8
 #define PDFCS_DEVICEN 9
 #define PDFCS_INDEXED 10
 #define PDFCS_PATTERN 11
 
 class CPDF_Array;
 class CPDF_Document;
 class CPDF_Object;
 
 class CPDF_ColorSpace {
  public:
   static CPDF_ColorSpace* GetStockCS(int Family);
-  static CPDF_ColorSpace* Load(CPDF_Document* pDoc, CPDF_Object* pCSObj);
   static CPDF_ColorSpace* ColorspaceFromName(const CFX_ByteString& name);
+  static std::unique_ptr<CPDF_ColorSpace> Load(CPDF_Document* pDoc,
+                                               CPDF_Object* pCSObj);
 
-  void ReleaseCS();
+  void Release();
 
   int GetBufSize() const;
   FX_FLOAT* CreateBuf();
   void GetDefaultColor(FX_FLOAT* buf) const;
   uint32_t CountComponents() const;
   int GetFamily() const { return m_Family; }
   virtual void GetDefaultValue(int iComponent,
                                FX_FLOAT& value,
                                FX_FLOAT& min,
                                FX_FLOAT& max) const;
@@ skipping 50 matching lines @@
                             FX_FLOAT k) const;
 
   int m_Family;
   uint32_t m_nComponents;
   CPDF_Array* m_pArray;
   uint32_t m_dwStdConversion;
 };
 
 using CPDF_CountedColorSpace = CFX_WeakPtr<CPDF_ColorSpace>::Handle;
 
+namespace std {
+
+// Make std::unique_ptr<CPDF_ColorSpace> call Release() rather than
+// simply deleting the object.
+template <>
+struct default_delete<CPDF_ColorSpace> {

[Lei Zhang, 2016/09/23 01:46:21]

Neat. Maybe we can do that for CPDF_Object too.

+  void operator()(CPDF_ColorSpace* pColorSpace) const {
+    if (pColorSpace)
+      pColorSpace->Release();
+  }
+};
+
+}  // namespace std
+
 #endif  // CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_COLORSPACE_H_