Remove typdefs for pointer types in fx_system.h

core/src/fpdfapi/fpdf_render/fpdf_render_cache.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/fpdfapi/fpdf_render.h"
 #include "../../../include/fpdfapi/fpdf_pageobj.h"
 #include "../../../include/fxge/fx_ge.h"
 #include "../fpdf_page/pageint.h"
@@ skipping 11 matching lines @@
 void CPDF_Page::ClearRenderCache()
 {
     if (m_pPageRender) {
         m_pPageRender->ClearAll();
     }
 }
 void CPDF_PageRenderCache::ClearAll()
 {
     FX_POSITION pos = m_ImageCaches.GetStartPosition();
     while (pos) {
-        FX_LPVOID key, value;
+        void* key;
+        void* value;
         m_ImageCaches.GetNextAssoc(pos, key, value);
         delete (CPDF_ImageCache*)value;
     }
     m_ImageCaches.RemoveAll();
     m_nCacheSize = 0;
     m_nTimeCount = 0;
 }
 void CPDF_PageRenderCache::CacheOptimization(int32_t dwLimitCacheSize)
 {
     if (m_nCacheSize <= (FX_DWORD)dwLimitCacheSize) {
         return;
     }
     int nCount = m_ImageCaches.GetCount();
     CACHEINFO* pCACHEINFO = (CACHEINFO*)FX_Alloc2D(uint8_t, sizeof(CACHEINFO), nCount);
     FX_POSITION pos = m_ImageCaches.GetStartPosition();
     int i = 0;
     while (pos) {
-        FX_LPVOID key, value;
+        void* key;
+        void* value;
         m_ImageCaches.GetNextAssoc(pos, key, value);
         pCACHEINFO[i].time = ((CPDF_ImageCache*)value)->GetTimeCount();
         pCACHEINFO[i++].pStream = ((CPDF_ImageCache*)value)->GetStream();
     }
     FXSYS_qsort(pCACHEINFO, nCount, sizeof (CACHEINFO), compare);
     FX_DWORD nTimeCount = m_nTimeCount;
     if (nTimeCount + 1 < nTimeCount) {
         for (i = 0; i < nCount; i ++) {
             ((CPDF_ImageCache*)(m_ImageCaches[pCACHEINFO[i].pStream]))->m_dwTimeCount = i;
         }
         m_nTimeCount = nCount;
     }
     i = 0;
     while(nCount > 15) {
         ClearImageCache(pCACHEINFO[i++].pStream);
         nCount--;
     }
     while (m_nCacheSize > (FX_DWORD)dwLimitCacheSize) {
         ClearImageCache(pCACHEINFO[i++].pStream);
     }
     FX_Free(pCACHEINFO);
 }
 void CPDF_PageRenderCache::ClearImageCache(CPDF_Stream* pStream)
 {
-    FX_LPVOID value = m_ImageCaches.GetValueAt(pStream);
+    void* value = m_ImageCaches.GetValueAt(pStream);
     if (value == NULL)  {
         m_ImageCaches.RemoveKey(pStream);
         return;
     }
     m_nCacheSize -= ((CPDF_ImageCache*)value)->EstimateSize();
     delete (CPDF_ImageCache*)value;
     m_ImageCaches.RemoveKey(pStream);
 }
 FX_DWORD CPDF_PageRenderCache::EstimateSize()
 {
     FX_DWORD dwSize = 0;
     FX_POSITION pos = m_ImageCaches.GetStartPosition();
     while (pos) {
-        FX_LPVOID key, value;
+        void* key;
+        void* value;
         m_ImageCaches.GetNextAssoc(pos, key, value);
         dwSize += ((CPDF_ImageCache*)value)->EstimateSize();
     }
     m_nCacheSize = dwSize;
     return dwSize;
 }
 FX_DWORD CPDF_PageRenderCache::GetCachedSize(CPDF_Stream* pStream) const
 {
     if (pStream == NULL) {
         return m_nCacheSize;
     }
     CPDF_ImageCache* pImageCache;
-    if (!m_ImageCaches.Lookup(pStream, (FX_LPVOID&)pImageCache)) {
+    if (!m_ImageCaches.Lookup(pStream, (void*&)pImageCache)) {
         return 0;
     }
     return pImageCache->EstimateSize();
 }
 void CPDF_PageRenderCache::GetCachedBitmap(CPDF_Stream* pStream, CFX_DIBSource*& pBitmap, CFX_DIBSource*& pMask, FX_DWORD& MatteColor,
         FX_BOOL bStdCS, FX_DWORD GroupFamily, FX_BOOL bLoadMask, CPDF_RenderStatus* pRenderStatus,
         int32_t downsampleWidth, int32_t downsampleHeight)
 {
     CPDF_ImageCache* pImageCache;
-    FX_BOOL bFind = m_ImageCaches.Lookup(pStream, (FX_LPVOID&)pImageCache);
+    FX_BOOL bFind = m_ImageCaches.Lookup(pStream, (void*&)pImageCache);
     if (!bFind) {
         pImageCache = new CPDF_ImageCache(m_pPage->m_pDocument, pStream);
     }
     m_nTimeCount ++;
     FX_BOOL bCached = pImageCache->GetCachedBitmap(pBitmap, pMask, MatteColor, m_pPage->m_pPageResources, bStdCS, GroupFamily, bLoadMask, pRenderStatus, downsampleWidth, downsampleHeight);
     if (!bFind) {
         m_ImageCaches.SetAt(pStream, pImageCache);
     }
     if (!bCached) {
         m_nCacheSize += pImageCache->EstimateSize();
     }
 }
 FX_BOOL CPDF_PageRenderCache::StartGetCachedBitmap(CPDF_Stream* pStream, FX_BOOL bStdCS, FX_DWORD GroupFamily, FX_BOOL bLoadMask, CPDF_RenderStatus* pRenderStatus, int32_t downsampleWidth, int32_t downsampleHeight)
 {
-    m_bCurFindCache = m_ImageCaches.Lookup(pStream, (FX_LPVOID&)m_pCurImageCache);
+    m_bCurFindCache = m_ImageCaches.Lookup(pStream, (void*&)m_pCurImageCache);
     if (!m_bCurFindCache) {
         m_pCurImageCache = new CPDF_ImageCache(m_pPage->m_pDocument, pStream);
     }
     int ret = m_pCurImageCache->StartGetCachedBitmap(pRenderStatus->m_pFormResource, m_pPage->m_pPageResources, bStdCS, GroupFamily, bLoadMask, pRenderStatus, downsampleWidth, downsampleHeight);
     if (ret == 2) {
         return TRUE;
     }
     m_nTimeCount ++;
     if (!m_bCurFindCache) {
         m_ImageCaches.SetAt(pStream, m_pCurImageCache);
@@ skipping 14 matching lines @@
         m_ImageCaches.SetAt(m_pCurImageCache->GetStream(), m_pCurImageCache);
     }
     if (!ret) {
         m_nCacheSize += m_pCurImageCache->EstimateSize();
     }
     return FALSE;
 }
 void CPDF_PageRenderCache::ResetBitmap(CPDF_Stream* pStream, const CFX_DIBitmap* pBitmap)
 {
     CPDF_ImageCache* pImageCache;
-    if (!m_ImageCaches.Lookup(pStream, (FX_LPVOID&)pImageCache)) {
+    if (!m_ImageCaches.Lookup(pStream, (void*&)pImageCache)) {
         if (pBitmap == NULL) {
             return;
         }
         pImageCache = new CPDF_ImageCache(m_pPage->m_pDocument, pStream);
         m_ImageCaches.SetAt(pStream, pImageCache);
     }
     int oldsize = pImageCache->EstimateSize();
     pImageCache->Reset(pBitmap);
     m_nCacheSize = pImageCache->EstimateSize() - oldsize;
 }
@@ skipping 29 matching lines @@
     m_pCachedBitmap = NULL;
     if (pBitmap) {
         m_pCachedBitmap = pBitmap->Clone();
     }
     CalcSize();
 }
 void CPDF_PageRenderCache::ClearImageData()
 {
     FX_POSITION pos = m_ImageCaches.GetStartPosition();
     while (pos) {
-        FX_LPVOID key, value;
+        void* key;
+        void* value;
         m_ImageCaches.GetNextAssoc(pos, key, value);
         ((CPDF_ImageCache*)value)->ClearImageData();
     }
 }
 void CPDF_ImageCache::ClearImageData()
 {
     if (m_pCachedBitmap && m_pCachedBitmap->GetBuffer() == NULL) {
         ((CPDF_DIBSource*)m_pCachedBitmap)->ClearImageData();
     }
 }
@@ skipping 123 matching lines @@
 }
 void CPDF_Document::ClearRenderFont()
 {
     if (m_pDocRender) {
         CFX_FontCache* pCache = m_pDocRender->GetFontCache();
         if (pCache) {
             pCache->FreeCache(FALSE);
         }
     }
 }