Remove typdefs for pointer types in fx_system.h

core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.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/base/nonstd_unique_ptr.h"
 #include "../../../include/fpdfapi/fpdf_module.h"
 #include "../../../include/fpdfapi/fpdf_pageobj.h"
 #include "../../../include/fpdfapi/fpdf_render.h"
 #include "../../../include/fxcodec/fx_codec.h"
 #include "../../../include/fxcrt/fx_safe_types.h"
 #include "../../../include/fxge/fx_ge.h"
 #include "../fpdf_page/pageint.h"
 #include "render_int.h"
 
 namespace {
 
-unsigned int _GetBits8(FX_LPCBYTE pData, int bitpos, int nbits)
+unsigned int _GetBits8(const uint8_t* pData, int bitpos, int nbits)
 {
     unsigned int byte = pData[bitpos / 8];
     if (nbits == 8) {
         return byte;
     } else if (nbits == 4) {
         return (bitpos % 8) ? (byte & 0x0f) : (byte >> 4);
     } else if (nbits == 2) {
         return (byte >> (6 - bitpos % 8)) & 0x03;
     } else if (nbits == 1) {
         return (byte >> (7 - bitpos % 8)) & 0x01;
@@ skipping 547 matching lines @@
                     int max_num = pArray->GetInteger(i * 2 + 1);
                     pCompData[i].m_ColorKeyMin = FX_MAX(min_num, 0);
                     pCompData[i].m_ColorKeyMax = FX_MIN(max_num, max_data);
                 }
             }
             bColorKey = TRUE;
         }
     }
     return pCompData;
 }
-ICodec_ScanlineDecoder* FPDFAPI_CreateFaxDecoder(FX_LPCBYTE src_buf, FX_DWORD src_size, int width, int height,
+ICodec_ScanlineDecoder* FPDFAPI_CreateFaxDecoder(const uint8_t* src_buf, FX_DWORD src_size, int width, int height,
         const CPDF_Dictionary* pParams);
-ICodec_ScanlineDecoder* FPDFAPI_CreateFlateDecoder(FX_LPCBYTE src_buf, FX_DWORD src_size, int width, int height,
+ICodec_ScanlineDecoder* FPDFAPI_CreateFlateDecoder(const uint8_t* src_buf, FX_DWORD src_size, int width, int height,
         int nComps, int bpc, const CPDF_Dictionary* pParams);
 int CPDF_DIBSource::CreateDecoder()
 {
     const CFX_ByteString& decoder = m_pStreamAcc->GetImageDecoder();
     if (decoder.IsEmpty()) {
         return 1;
     }
     if (m_bDoBpcCheck && m_bpc == 0) {
         return 0;
     }
-    FX_LPCBYTE src_data = m_pStreamAcc->GetData();
+    const uint8_t* src_data = m_pStreamAcc->GetData();
     FX_DWORD src_size = m_pStreamAcc->GetSize();
     const CPDF_Dictionary* pParams = m_pStreamAcc->GetImageParam();
     if (decoder == FX_BSTRC("CCITTFaxDecode")) {
         m_pDecoder = FPDFAPI_CreateFaxDecoder(src_data, src_size, m_Width, m_Height, pParams);
     } else if (decoder == FX_BSTRC("DCTDecode")) {
         m_pDecoder = CPDF_ModuleMgr::Get()->GetJpegModule()->CreateDecoder(src_data, src_size, m_Width, m_Height,
                      m_nComponents, pParams ? pParams->GetInteger(FX_BSTR("ColorTransform"), 1) : 1);
         if (!m_pDecoder) {
             FX_BOOL bTransform = FALSE;
             int comps, bpc;
@@ skipping 132 matching lines @@
                             bTranslateColor,
                             context->output_offsets())) {
         m_pCachedBitmap.reset();
         return;
     }
     if (m_pColorSpace &&
         m_pColorSpace->GetFamily() == PDFCS_INDEXED &&
         m_bpc < 8) {
         int scale = 8 - m_bpc;
         for (FX_DWORD row = 0; row < height; ++row) {
-            FX_LPBYTE scanline = (FX_LPBYTE)m_pCachedBitmap->GetScanline(row);
+            uint8_t* scanline = (uint8_t*)m_pCachedBitmap->GetScanline(row);
             for (FX_DWORD col = 0; col < width; ++col) {
                 *scanline = (*scanline) >> scale;
                 ++scanline;
             }
         }
     }
     m_bpc = 8;
 }
 CPDF_DIBSource* CPDF_DIBSource::LoadMask(FX_DWORD& MatteColor)
 {
@@ skipping 189 matching lines @@
                 // but too many documents don't conform to it.
                 m_bpc = 8;
             }
         }
     }
     if (m_bpc != 1 && m_bpc != 2 && m_bpc != 4 && m_bpc != 8 && m_bpc != 16) {
         m_bpc = 0;
     }
 }
 #define NORMALCOLOR_MAX(color, max) (color) > (max) ? (max) : (color) < 0 ? 0 : (color);
-void CPDF_DIBSource::TranslateScanline24bpp(FX_LPBYTE dest_scan, FX_LPCBYTE src_scan) const
+void CPDF_DIBSource::TranslateScanline24bpp(uint8_t* dest_scan, const uint8_t* src_scan) const
 {
     if (m_bpc == 0) {
         return;
     }
     int max_data = (1 << m_bpc) - 1;
     if (m_bDefaultDecode) {
         if (m_Family == PDFCS_DEVICERGB || m_Family == PDFCS_CALRGB) {
-            FX_LPCBYTE src_pos = src_scan;
+            const uint8_t* src_pos = src_scan;
             switch (m_bpc) {
                 case 16:
                     for (int col = 0; col < m_Width; col ++) {
                         *dest_scan++ = src_pos[4];
                         *dest_scan++ = src_pos[2];
                         *dest_scan++ = *src_pos;
                         src_pos += 6;
                     }
                     break;
                 case 8:
@@ skipping 81 matching lines @@
             R = NORMALCOLOR_MAX(R, 1);
             G = NORMALCOLOR_MAX(G, 1);
             B = NORMALCOLOR_MAX(B, 1);
             dest_scan[dest_byte_pos] = (int32_t)(B * 255);
             dest_scan[dest_byte_pos + 1] = (int32_t)(G * 255);
             dest_scan[dest_byte_pos + 2] = (int32_t)(R * 255);
             dest_byte_pos += 3;
         }
     }
 }
-FX_LPBYTE CPDF_DIBSource::GetBuffer() const
+uint8_t* CPDF_DIBSource::GetBuffer() const
 {
     if (m_pCachedBitmap) {
         return m_pCachedBitmap->GetBuffer();
     }
     return NULL;
 }
-FX_LPCBYTE CPDF_DIBSource::GetScanline(int line) const
+const uint8_t* CPDF_DIBSource::GetScanline(int line) const
 {
     if (m_bpc == 0) {
         return NULL;
     }
     FX_SAFE_DWORD src_pitch = CalculatePitch8(m_bpc, m_nComponents, m_Width, 1);
     if (!src_pitch.IsValid())
         return NULL;
     FX_DWORD src_pitch_value = src_pitch.ValueOrDie();
-    FX_LPCBYTE pSrcLine = NULL;
+    const uint8_t* pSrcLine = NULL;
     if (m_pCachedBitmap) {
         if (line >= m_pCachedBitmap->GetHeight()) {
             line = m_pCachedBitmap->GetHeight() - 1;
         }
         pSrcLine = m_pCachedBitmap->GetScanline(line);
     } else if (m_pDecoder) {
         pSrcLine = m_pDecoder->GetScanline(line);
     } else {
         if (m_pStreamAcc->GetSize() >= (line + 1) * src_pitch_value) {
             pSrcLine = m_pStreamAcc->GetData() + line * src_pitch_value;
         }
     }
     if (pSrcLine == NULL) {
-        FX_LPBYTE pLineBuf = m_pMaskedLine ? m_pMaskedLine : m_pLineBuf;
+        uint8_t* pLineBuf = m_pMaskedLine ? m_pMaskedLine : m_pLineBuf;
         FXSYS_memset8(pLineBuf, 0xff, m_Pitch);
         return pLineBuf;
     }
     if (m_bpc * m_nComponents == 1) {
         if (m_bImageMask && m_bDefaultDecode) {
             for (FX_DWORD i = 0; i < src_pitch_value; i++) {
                 m_pLineBuf[i] = ~pSrcLine[i];
             }
         } else if (m_bColorKey) {
             FX_DWORD reset_argb, set_argb;
@@ skipping 31 matching lines @@
                 int color_index = 0;
                 for (FX_DWORD color = 0; color < m_nComponents; color ++) {
                     int data = _GetBits8(pSrcLine, src_bit_pos, m_bpc);
                     color_index |= data << (color * m_bpc);
                     src_bit_pos += m_bpc;
                 }
                 m_pLineBuf[col] = color_index;
             }
         }
         if (m_bColorKey) {
-            FX_LPBYTE pDestPixel = m_pMaskedLine;
-            FX_LPCBYTE pSrcPixel = m_pLineBuf;
+            uint8_t* pDestPixel = m_pMaskedLine;
+            const uint8_t* pSrcPixel = m_pLineBuf;
             for (int col = 0; col < m_Width; col ++) {
                 uint8_t index = *pSrcPixel++;
                 if (m_pPalette) {
                     *pDestPixel++ = FXARGB_B(m_pPalette[index]);
                     *pDestPixel++ = FXARGB_G(m_pPalette[index]);
                     *pDestPixel++ = FXARGB_R(m_pPalette[index]);
                 } else {
                     *pDestPixel++ = index;
                     *pDestPixel++ = index;
                     *pDestPixel++ = index;
                 }
                 *pDestPixel = (index < m_pCompData[0].m_ColorKeyMin || index > m_pCompData[0].m_ColorKeyMax) ? 0xff : 0;
                 pDestPixel ++ ;
             }
             return m_pMaskedLine;
         }
         return m_pLineBuf;
     }
     if (m_bColorKey) {
         if (m_nComponents == 3 && m_bpc == 8) {
-            FX_LPBYTE alpha_channel = m_pMaskedLine + 3;
+            uint8_t* alpha_channel = m_pMaskedLine + 3;
             for (int col = 0; col < m_Width; col ++) {
-                FX_LPCBYTE pPixel = pSrcLine + col * 3;
+                const uint8_t* pPixel = pSrcLine + col * 3;
                 alpha_channel[col * 4] = (pPixel[0] < m_pCompData[0].m_ColorKeyMin || pPixel[0] > m_pCompData[0].m_ColorKeyMax ||
                                           pPixel[1] < m_pCompData[1].m_ColorKeyMin || pPixel[1] > m_pCompData[1].m_ColorKeyMax ||
                                           pPixel[2] < m_pCompData[2].m_ColorKeyMin || pPixel[2] > m_pCompData[2].m_ColorKeyMax) ? 0xff : 0;
             }
         } else {
             FXSYS_memset8(m_pMaskedLine, 0xff, m_Pitch);
         }
     }
     if (m_pColorSpace) {
         TranslateScanline24bpp(m_pLineBuf, pSrcLine);
         pSrcLine = m_pLineBuf;
     }
     if (m_bColorKey) {
-        FX_LPCBYTE pSrcPixel = pSrcLine;
-        FX_LPBYTE pDestPixel = m_pMaskedLine;
+        const uint8_t* pSrcPixel = pSrcLine;
+        uint8_t* pDestPixel = m_pMaskedLine;
         for (int col = 0; col < m_Width; col ++) {
             *pDestPixel++ = *pSrcPixel++;
             *pDestPixel++ = *pSrcPixel++;
             *pDestPixel++ = *pSrcPixel++;
             pDestPixel ++;
         }
         return m_pMaskedLine;
     }
     return pSrcLine;
 }
 FX_BOOL CPDF_DIBSource::SkipToScanline(int line, IFX_Pause* pPause) const
 {
     if (m_pDecoder) {
         return m_pDecoder->SkipToScanline(line, pPause);
     }
     return FALSE;
 }
-void CPDF_DIBSource::DownSampleScanline(int line, FX_LPBYTE dest_scan, int dest_bpp,
+void CPDF_DIBSource::DownSampleScanline(int line, uint8_t* dest_scan, int dest_bpp,
                                         int dest_width, FX_BOOL bFlipX, int clip_left, int clip_width) const
 {
     if (line < 0 || dest_scan == NULL || dest_bpp <= 0 ||
         dest_width <= 0 || clip_left < 0 || clip_width <= 0) {
         return;
     }
 
     FX_DWORD src_width = m_Width;
     FX_SAFE_DWORD pitch = CalculatePitch8(m_bpc, m_nComponents, m_Width, 1);
     if (!pitch.IsValid()) {
         return;
     }
 
-    FX_LPCBYTE pSrcLine = NULL;
+    const uint8_t* pSrcLine = NULL;
     if (m_pCachedBitmap) {
         pSrcLine = m_pCachedBitmap->GetScanline(line);
     } else if (m_pDecoder) {
         pSrcLine = m_pDecoder->GetScanline(line);
     } else {
         FX_DWORD src_pitch = pitch.ValueOrDie();
         pitch *= (line+1);
         if (!pitch.IsValid()) {
             return;
         }
@@ skipping 100 matching lines @@
             }
             pSrcLine = m_pLineBuf;
         }
         if (m_bColorKey) {
             for (int i = 0; i < clip_width; i ++) {
                 FX_DWORD src_x = (clip_left + i) * src_width / dest_width;
                 if (bFlipX) {
                     src_x = src_width - src_x - 1;
                 }
                 src_x %= src_width;
-                FX_LPBYTE pDestPixel = dest_scan + i * 4;
+                uint8_t* pDestPixel = dest_scan + i * 4;
                 uint8_t index = pSrcLine[src_x];
                 if (m_pPalette) {
                     *pDestPixel++ = FXARGB_B(m_pPalette[index]);
                     *pDestPixel++ = FXARGB_G(m_pPalette[index]);
                     *pDestPixel++ = FXARGB_R(m_pPalette[index]);
                 } else {
                     *pDestPixel++ = index;
                     *pDestPixel++ = index;
                     *pDestPixel++ = index;
                 }
@@ skipping 21 matching lines @@
         return;
     } else {
         int last_src_x = -1;
         FX_ARGB last_argb;
         FX_FLOAT orig_Not8Bpp = (FX_FLOAT)m_bpc * (FX_FLOAT)m_nComponents / 8.0f;
         FX_FLOAT unit_To8Bpc = 255.0f / ((1 << m_bpc) - 1);
         for (int i = 0; i < clip_width; i ++) {
             int dest_x = clip_left + i;
             FX_DWORD src_x = (bFlipX ? (dest_width - dest_x - 1) : dest_x) * (int64_t)src_width / dest_width;
             src_x %= src_width;
-            FX_LPCBYTE pSrcPixel = NULL;
+            const uint8_t* pSrcPixel = NULL;
             if (m_bpc % 8 == 0) {
                 pSrcPixel = pSrcLine + src_x * orig_Bpp;
             } else {
                 pSrcPixel = pSrcLine + (int)(src_x * orig_Not8Bpp);
             }
-            FX_LPBYTE pDestPixel = dest_scan + i * dest_Bpp;
+            uint8_t* pDestPixel = dest_scan + i * dest_Bpp;
             FX_ARGB argb;
             if (src_x == last_src_x) {
                 argb = last_argb;
             } else {
                 if (m_pColorSpace) {
                     uint8_t color[4];
                     if (!m_bDefaultDecode) {
                         for (int i = 0; i < m_nComponents; i ++) {
                             int color_value = (int)((m_pCompData[i].m_DecodeMin + m_pCompData[i].m_DecodeStep * (FX_FLOAT)pSrcPixel[i]) * 255.0f + 0.5f);
                             temp[i] = color_value > 255 ? 255 : (color_value < 0 ? 0 : color_value);
@@ skipping 123 matching lines @@
     }
     if (pCache) {
         pCache->GetCachedBitmap(pImage->m_pImage->GetStream(), m_pBitmap, m_pMask, m_MatteColor, bStdCS, GroupFamily, bLoadMask, pRenderStatus, m_nDownsampleWidth, m_nDownsampleHeight);
         m_bCached = TRUE;
     } else {
         m_pBitmap = pImage->m_pImage->LoadDIBSource(&m_pMask, &m_MatteColor, bStdCS, GroupFamily, bLoadMask);
         m_bCached = FALSE;
     }
     return FALSE;
 }
-FX_BOOL CPDF_ImageLoader::StartLoadImage(const CPDF_ImageObject* pImage, CPDF_PageRenderCache* pCache, FX_LPVOID& LoadHandle, FX_BOOL bStdCS, FX_DWORD GroupFamily, FX_BOOL bLoadMask, CPDF_RenderStatus* pRenderStatus, int32_t nDownsampleWidth, int32_t nDownsampleHeight)
+FX_BOOL CPDF_ImageLoader::StartLoadImage(const CPDF_ImageObject* pImage, CPDF_PageRenderCache* pCache, void*& LoadHandle, FX_BOOL bStdCS, FX_DWORD GroupFamily, FX_BOOL bLoadMask, CPDF_RenderStatus* pRenderStatus, int32_t nDownsampleWidth, int32_t nDownsampleHeight)
 {
     m_nDownsampleWidth = nDownsampleWidth;
     m_nDownsampleHeight = nDownsampleHeight;
     CPDF_ProgressiveImageLoaderHandle* pLoaderHandle = new CPDF_ProgressiveImageLoaderHandle;
     FX_BOOL ret = pLoaderHandle->Start(this, pImage, pCache, bStdCS, GroupFamily, bLoadMask, pRenderStatus, m_nDownsampleWidth, m_nDownsampleHeight);
     LoadHandle = pLoaderHandle;
     return ret;
 }
-FX_BOOL CPDF_ImageLoader::Continue(FX_LPVOID LoadHandle, IFX_Pause* pPause)
+FX_BOOL CPDF_ImageLoader::Continue(void* LoadHandle, IFX_Pause* pPause)
 {
     return ((CPDF_ProgressiveImageLoaderHandle*)LoadHandle)->Continue(pPause);
 }
 CPDF_ImageLoader::~CPDF_ImageLoader()
 {
     if (!m_bCached) {
         delete m_pBitmap;
         delete m_pMask;
     }
 }