Merge to XFA: Remove typdefs for pointer types in fx_system.h.
[pdfium.git] / core / src / fxcodec / codec / fx_codec_progress.h
index e5a4e53..8a32f97 100644 (file)
@@ -38,7 +38,7 @@ public:
     }\r
 \r
     int                                m_DestMin, m_ItemSize;\r
-    FX_LPBYTE          m_pWeightTables;\r
+    uint8_t*           m_pWeightTables;\r
 };\r
 class CFXCODEC_HorzTable\r
 {\r
@@ -61,7 +61,7 @@ public:
     }\r
 \r
     int                                m_ItemSize;\r
-    FX_LPBYTE          m_pWeightTables;\r
+    uint8_t*           m_pWeightTables;\r
 };\r
 class CFXCODEC_VertTable\r
 {\r
@@ -82,7 +82,7 @@ public:
         return (PixelWeight*)(m_pWeightTables + pixel * m_ItemSize);\r
     }\r
     int                                m_ItemSize;\r
-    FX_LPBYTE          m_pWeightTables;\r
+    uint8_t*           m_pWeightTables;\r
 };\r
 enum FXCodec_Format {\r
     FXCodec_Invalid = 0,\r
@@ -137,41 +137,41 @@ protected:
     FX_BOOL                                            DetectImageType(FXCODEC_IMAGE_TYPE imageType, CFX_DIBAttribute* pAttribute = NULL);\r
     void                                               GetDownScale(int& down_scale);\r
     void                                               GetTransMethod(FXDIB_Format des_format, FXCodec_Format src_format);\r
-    void                                               ReSampleScanline(CFX_DIBitmap* pDeviceBitmap, int32_t des_line, FX_LPBYTE src_scan, FXCodec_Format src_format);\r
-    void                                               Resample(CFX_DIBitmap* pDeviceBitmap, int32_t src_line, FX_LPBYTE src_scan, FXCodec_Format src_format);\r
+    void                                               ReSampleScanline(CFX_DIBitmap* pDeviceBitmap, int32_t des_line, uint8_t* src_scan, FXCodec_Format src_format);\r
+    void                                               Resample(CFX_DIBitmap* pDeviceBitmap, int32_t src_line, uint8_t* src_scan, FXCodec_Format src_format);\r
     void                                               ResampleVert(CFX_DIBitmap* pDeviceBitmap, double scale_y, int des_row);\r
     FX_BOOL                                            JpegReadMoreData(ICodec_JpegModule* pJpegModule, FXCODEC_STATUS& err_status);\r
     static FX_BOOL                             PngReadHeaderFunc(void* pModule, int width, int height, int bpc, int pass, int* color_type, double* gamma);\r
-    static FX_BOOL                             PngAskScanlineBufFunc(void* pModule, int line, FX_LPBYTE& src_buf);\r
+    static FX_BOOL                             PngAskScanlineBufFunc(void* pModule, int line, uint8_t*& src_buf);\r
     static void                                        PngFillScanlineBufCompletedFunc(void* pModule, int pass, int line);\r
-    void                                               PngOneOneMapResampleHorz(CFX_DIBitmap* pDeviceBitmap, int32_t des_line, FX_LPBYTE src_scan, FXCodec_Format src_format);\r
+    void                                               PngOneOneMapResampleHorz(CFX_DIBitmap* pDeviceBitmap, int32_t des_line, uint8_t* src_scan, FXCodec_Format src_format);\r
 \r
     FX_BOOL                                            GifReadMoreData(ICodec_GifModule* pGifModule, FXCODEC_STATUS& err_status);\r
     static void                                        GifRecordCurrentPositionCallback(void* pModule, FX_DWORD& cur_pos);\r
-    static FX_LPBYTE                   GifAskLocalPaletteBufCallback(void* pModule, int32_t frame_num, int32_t pal_size);\r
+    static uint8_t*                    GifAskLocalPaletteBufCallback(void* pModule, int32_t frame_num, int32_t pal_size);\r
     static FX_BOOL                             GifInputRecordPositionBufCallback(void* pModule, FX_DWORD rcd_pos, const FX_RECT& img_rc,\r
             int32_t pal_num, void* pal_ptr,\r
             int32_t delay_time, FX_BOOL user_input,\r
             int32_t trans_index, int32_t disposal_method, FX_BOOL interlace);\r
-    static void                                        GifReadScanlineCallback(void* pModule, int32_t row_num, FX_LPBYTE row_buf);\r
+    static void                                        GifReadScanlineCallback(void* pModule, int32_t row_num, uint8_t* row_buf);\r
     void                                               GifDoubleLineResampleVert(CFX_DIBitmap* pDeviceBitmap, double scale_y, int des_row);\r
     FX_BOOL                                            BmpReadMoreData(ICodec_BmpModule* pBmpModule, FXCODEC_STATUS& err_status);\r
     static FX_BOOL                             BmpInputImagePositionBufCallback(void* pModule, FX_DWORD rcd_pos);\r
-    static void                                        BmpReadScanlineCallback(void* pModule, int32_t row_num, FX_LPBYTE row_buf);\r
+    static void                                        BmpReadScanlineCallback(void* pModule, int32_t row_num, uint8_t* row_buf);\r
     void                                               ResampleVertBT(CFX_DIBitmap* pDeviceBitmap, double scale_y, int des_row);\r
 public:\r
     IFX_FileRead*                              m_pFile;\r
     CCodec_ModuleMgr*                  m_pCodecMgr;\r
-    FX_LPVOID                                  m_pJpegContext;\r
-    FX_LPVOID                                  m_pPngContext;\r
-    FX_LPVOID                                  m_pGifContext;\r
-    FX_LPVOID                                  m_pBmpContext;\r
-    FX_LPVOID                                  m_pTiffContext;\r
+    void*                                      m_pJpegContext;\r
+    void*                                      m_pPngContext;\r
+    void*                                      m_pGifContext;\r
+    void*                                      m_pBmpContext;\r
+    void*                                      m_pTiffContext;\r
     FXCODEC_IMAGE_TYPE                 m_imagType;\r
     FX_DWORD                                   m_offSet;\r
-    FX_LPBYTE                                  m_pSrcBuf;\r
+    uint8_t*                                   m_pSrcBuf;\r
     FX_DWORD                                   m_SrcSize;\r
-    FX_LPBYTE                                  m_pDecodeBuf;\r
+    uint8_t*                                   m_pDecodeBuf;\r
     int                                                        m_ScanlineSize;\r
     CFX_DIBitmap*                              m_pDeviceBitmap;\r
     FX_BOOL                                            m_bInterpol;\r
@@ -196,7 +196,7 @@ public:
     int                        m_FrameNumber;\r
     int                        m_FrameCur;\r
     int                                m_GifBgIndex;\r
-    FX_LPBYTE          m_pGifPalette;\r
+    uint8_t*           m_pGifPalette;\r
     int32_t            m_GifPltNumber;\r
     int                                m_GifTransIndex;\r
     FX_RECT                    m_GifFrameRect;\r