Change class member variables in raw pointer type into unique_ptr

core/fpdfapi/fpdf_font/fpdf_font_cid.cpp

 // Copyright 2014 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
 
 #include "core/fpdfapi/fpdf_font/font_int.h"
 
 #include "core/fpdfapi/fpdf_cmaps/cmap_int.h"
 #include "core/fpdfapi/fpdf_font/ttgsubtable.h"
@@ skipping 494 matching lines @@
 CPDF_CMap::CPDF_CMap() {
   m_Charset = CIDSET_UNKNOWN;
   m_Coding = CIDCODING_UNKNOWN;
   m_CodingScheme = TwoBytes;
   m_bVertical = 0;
   m_bLoaded = FALSE;
   m_pMapping = nullptr;
   m_pLeadingBytes = nullptr;
   m_pAddMapping = nullptr;
   m_pEmbedMap = nullptr;
-  m_pUseMap = nullptr;
   m_nCodeRanges = 0;
 }
 CPDF_CMap::~CPDF_CMap() {
   FX_Free(m_pMapping);
   FX_Free(m_pAddMapping);
   FX_Free(m_pLeadingBytes);
-  delete m_pUseMap;
 }
 void CPDF_CMap::Release() {
   if (m_PredefinedCMap.IsEmpty()) {
     delete this;
   }
 }
 
 FX_BOOL CPDF_CMap::IsLoaded() const {
   return m_bLoaded;
 }
@@ skipping 76 matching lines @@
   if (m_pEmbedMap) {
     return FPDFAPI_CIDFromCharCode(m_pEmbedMap, charcode);
   }
   if (!m_pMapping) {
     return (uint16_t)charcode;
   }
   if (charcode >> 16) {
     if (m_pAddMapping) {
       void* found = FXSYS_bsearch(&charcode, m_pAddMapping + 4,
                                   *(uint32_t*)m_pAddMapping, 8, CompareCID);
-      if (!found) {
-        if (m_pUseMap) {
-          return m_pUseMap->CIDFromCharCode(charcode);
-        }
+      if (!found)
         return 0;
-      }
       return (uint16_t)(((uint32_t*)found)[1] % 65536 + charcode -
                         *(uint32_t*)found);
     }
-    if (m_pUseMap)
-      return m_pUseMap->CIDFromCharCode(charcode);
     return 0;
   }
-  uint32_t CID = m_pMapping[charcode];
-  if (!CID && m_pUseMap)
-    return m_pUseMap->CIDFromCharCode(charcode);
-  return (uint16_t)CID;
+  return m_pMapping[charcode];
 }
 
 uint32_t CPDF_CMap::GetNextChar(const FX_CHAR* pString,
                                 int nStrLen,
                                 int& offset) const {
   switch (m_CodingScheme) {
     case OneByte:
       return ((uint8_t*)pString)[offset++];
     case TwoBytes:
       offset += 2;
@@ skipping 156 matching lines @@
   m_EmbeddedCount = pFontGlobals->m_EmbeddedToUnicodes[charset].m_Count;
 }
 
 CIDSet CharsetFromOrdering(const CFX_ByteStringC& ordering) {
   for (size_t charset = 1; charset < FX_ArraySize(g_CharsetNames); ++charset) {
     if (ordering == g_CharsetNames[charset])
       return CIDSetFromSizeT(charset);
   }
   return CIDSET_UNKNOWN;
 }