Merge to XFA: CFX_MapByteStringToPtr considered harmful (combo patch).

core/src/fxcodec/codec/fx_codec_icc.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 "../../../../third_party/lcms2-2.6/include/lcms2.h"
 #include "../../../include/fxcodec/fx_codec.h"
 #include "codec_int.h"
 
@@ skipping 416 matching lines @@
         default:;
       }
       MD5ComputeID(text.GetBuffer(0), text.GetLength(), ID);
       break;
     default:;
   }
   key.AppendBlock(ID, 16);
   CFX_ByteString ProfileKey(key.GetBuffer(), key.GetSize());
   ASSERT(pTransformKey);
   pTransformKey->AppendBlock(ProfileKey.GetBuffer(0), ProfileKey.GetLength());
-  if (!m_MapProfile.Lookup(ProfileKey, (void*&)pCache)) {
+  auto it = m_MapProfile.find(ProfileKey);
+  if (it == m_MapProfile.end()) {
     pCache = new CFX_IccProfileCache;
     switch (pIccParam->dwProfileType) {
       case Icc_PARAMTYPE_BUFFER:
         pCache->m_pProfile = cmsOpenProfileFromMem(pIccParam->pProfileData,
                                                    pIccParam->dwProfileSize);
         break;
       case Icc_PARAMTYPE_PARAM:
         switch (pIccParam->ColorSpace) {
           case IccCS_Rgb:
             pCache->m_pProfile = cmsCreate_sRGBProfile();
             break;
           case IccCS_Gray:
             pCache->m_pProfile = CreateProfile_Gray(pIccParam->Gamma);
             break;
           default:
             break;
         }
         break;
       default:
         break;
     }
-    m_MapProfile.SetAt(ProfileKey, pCache);
+    m_MapProfile[ProfileKey] = pCache;
   } else {
+    pCache = it->second;
     pCache->m_dwRate++;
   }
   return pCache->m_pProfile;
 }
 void* CCodec_IccModule::CreateTransform(
     ICodec_IccModule::IccParam* pInputParam,
     ICodec_IccModule::IccParam* pOutputParam,
     ICodec_IccModule::IccParam* pProofParam,
     FX_DWORD dwIntent,
     FX_DWORD dwFlag,
@@ skipping 18 matching lines @@
     return NULL;
   }
   void* pProofProfile = NULL;
   if (pProofParam) {
     pProofProfile = CreateProfile(pProofParam, Icc_CLASS_PROOF, &key);
   }
   key << dwInputProfileType << dwOutputProfileType << dwIntent << dwFlag
       << (pProofProfile != NULL) << dwPrfIntent << dwPrfFlag;
   CFX_ByteStringC TransformKey(key.GetBuffer(), key.GetSize());
   CFX_IccTransformCache* pTransformCache;
-  if (!m_MapTranform.Lookup(TransformKey, (void*&)pTransformCache)) {
+  auto it = m_MapTranform.find(TransformKey);
+  if (it == m_MapTranform.end()) {
     pCmm = FX_Alloc(CLcmsCmm, 1);
     pCmm->m_nSrcComponents = T_CHANNELS(dwInputProfileType);
     pCmm->m_nDstComponents = T_CHANNELS(dwOutputProfileType);
     pCmm->m_bLab = T_COLORSPACE(pInputParam->dwFormat) == PT_Lab;
     pTransformCache = new CFX_IccTransformCache(pCmm);
     if (pProofProfile) {
       pTransformCache->m_pIccTransform = cmsCreateProofingTransform(
           pInputProfile, dwInputProfileType, pOutputProfile,
           dwOutputProfileType, pProofProfile, dwIntent, dwPrfIntent, dwPrfFlag);
     } else {
       pTransformCache->m_pIccTransform =
           cmsCreateTransform(pInputProfile, dwInputProfileType, pOutputProfile,
                              dwOutputProfileType, dwIntent, dwFlag);
     }
     pCmm->m_hTransform = pTransformCache->m_pIccTransform;
-    m_MapTranform.SetAt(TransformKey, pTransformCache);
+    m_MapTranform[TransformKey] = pTransformCache;
   } else {
+    pTransformCache = it->second;
     pTransformCache->m_dwRate++;
   }
   return pTransformCache->m_pCmm;
 }
 CCodec_IccModule::~CCodec_IccModule() {
-  FX_POSITION pos = m_MapProfile.GetStartPosition();
-  CFX_ByteString key;
-  CFX_IccProfileCache* pProfileCache;
-  while (pos) {
-    m_MapProfile.GetNextAssoc(pos, key, (void*&)pProfileCache);
-    delete pProfileCache;
+  for (const auto& pair : m_MapProfile) {
+    delete pair.second;
   }
-  pos = m_MapTranform.GetStartPosition();
-  CFX_IccTransformCache* pTransformCache;
-  while (pos) {
-    m_MapTranform.GetNextAssoc(pos, key, (void*&)pTransformCache);
-    delete pTransformCache;
+  m_MapProfile.clear();
+  for (const auto& pair : m_MapTranform) {
+    delete pair.second;
   }
+  m_MapTranform.clear();
 }
 void* CCodec_IccModule::CreateTransform_sRGB(const uint8_t* pProfileData,
                                              FX_DWORD dwProfileSize,
                                              int32_t& nComponents,
                                              int32_t intent,
                                              FX_DWORD dwSrcFormat) {
   return IccLib_CreateTransform_sRGB(pProfileData, dwProfileSize, nComponents,
                                      intent, dwSrcFormat);
 }
 void* CCodec_IccModule::CreateTransform_CMYK(const uint8_t* pSrcProfileData,
@@ skipping 1427 matching lines @@
   uint8_t c1 = FXSYS_round(c * 255);
   uint8_t m1 = FXSYS_round(m * 255);
   uint8_t y1 = FXSYS_round(y * 255);
   uint8_t k1 = FXSYS_round(k * 255);
   uint8_t r, g, b;
   AdobeCMYK_to_sRGB1(c1, m1, y1, k1, r, g, b);
   R = 1.0f * r / 255;
   G = 1.0f * g / 255;
   B = 1.0f * b / 255;
 }