Merge to XFA: Kill CFX_Object.

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 "../../../include/fxcodec/fx_codec.h"
 #include "codec_int.h"
 #include "../lcms2/include/fx_lcms2.h"
 const FX_DWORD N_COMPONENT_LAB = 3;
 const FX_DWORD N_COMPONENT_GRAY = 1;
 const FX_DWORD N_COMPONENT_RGB = 3;
 const FX_DWORD N_COMPONENT_CMYK = 4;
 const FX_DWORD N_COMPONENT_DEFAULT = 3;
 
 FX_BOOL MD5ComputeID( FX_LPCVOID buf, FX_DWORD dwSize, FX_BYTE ID[16] )
 {
     return cmsMD5computeIDExt(buf, dwSize, ID);
 }
-struct CLcmsCmm : public CFX_Object {
+struct CLcmsCmm  {
     cmsHTRANSFORM m_hTransform;
     int                 m_nSrcComponents;
     int                 m_nDstComponents;
     FX_BOOL             m_bLab;
 };
 extern "C" {
     int ourHandler(int ErrorCode, const char *ErrorText)
     {
         return TRUE;
     }
@@ skipping 304 matching lines @@
         case cmsSigMCHAData:
             return T_DOSWAP(dwFormat) ? TYPE_KYMC10_8 : TYPE_CMYK10_8;
         case cmsSigMCHBData:
             return T_DOSWAP(dwFormat) ? TYPE_KYMC11_8 : TYPE_CMYK11_8;
         case cmsSigMCHCData:
             return T_DOSWAP(dwFormat) ? TYPE_KYMC12_8 : TYPE_CMYK12_8;
         default:
             return 0;
     }
 }
-class CFX_IccProfileCache : public CFX_Object
+class CFX_IccProfileCache 
 {
 public:
     CFX_IccProfileCache();
     ~CFX_IccProfileCache();
     FX_LPVOID m_pProfile;
     FX_DWORD    m_dwRate;
 protected:
     void        Purge();
 };
 CFX_IccProfileCache::CFX_IccProfileCache()
 {
     m_pProfile = NULL;
     m_dwRate = 1;
 }
 CFX_IccProfileCache::~CFX_IccProfileCache()
 {
     if (m_pProfile) {
         cmsCloseProfile(m_pProfile);
     }
 }
 void CFX_IccProfileCache::Purge()
 {
 }
-class CFX_IccTransformCache : public CFX_Object
+class CFX_IccTransformCache 
 {
 public:
     CFX_IccTransformCache(CLcmsCmm* pCmm = NULL);
     ~CFX_IccTransformCache();
     FX_LPVOID   m_pIccTransform;
     FX_DWORD            m_dwRate;
     CLcmsCmm*           m_pCmm;
 protected:
     void                        Purge();
 };
@@ skipping 996 matching lines @@
     FX_BYTE c1 = FXSYS_round(c * 255);
     FX_BYTE m1 = FXSYS_round(m * 255);
     FX_BYTE y1 = FXSYS_round(y * 255);
     FX_BYTE k1 = FXSYS_round(k * 255);
     FX_BYTE 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;
 }