1 files changed, 18 insertions, 18 deletions

diff --git a/core/src/fxcodec/codec/fx_codec_progress.h b/core/src/fxcodec/codec/fx_codec_progress.h
index e5a4e53376..8a32f97be4 100644
--- a/core/src/fxcodec/codec/fx_codec_progress.h
+++ b/core/src/fxcodec/codec/fx_codec_progress.h
@@ -38,7 +38,7 @@ public:
     }

 

     int				m_DestMin, m_ItemSize;

-    FX_LPBYTE		m_pWeightTables;

+    uint8_t*		m_pWeightTables;

 };

 class CFXCODEC_HorzTable

 {

@@ -61,7 +61,7 @@ public:
     }

 

     int				m_ItemSize;

-    FX_LPBYTE		m_pWeightTables;

+    uint8_t*		m_pWeightTables;

 };

 class CFXCODEC_VertTable

 {

@@ -82,7 +82,7 @@ public:
         return (PixelWeight*)(m_pWeightTables + pixel * m_ItemSize);

     }

     int				m_ItemSize;

-    FX_LPBYTE		m_pWeightTables;

+    uint8_t*		m_pWeightTables;

 };

 enum FXCodec_Format {

     FXCodec_Invalid = 0,

@@ -137,41 +137,41 @@ protected:
     FX_BOOL						DetectImageType(FXCODEC_IMAGE_TYPE imageType, CFX_DIBAttribute* pAttribute = NULL);

     void						GetDownScale(int& down_scale);

     void						GetTransMethod(FXDIB_Format des_format, FXCodec_Format src_format);

-    void						ReSampleScanline(CFX_DIBitmap* pDeviceBitmap, int32_t des_line, FX_LPBYTE src_scan, FXCodec_Format src_format);

-    void						Resample(CFX_DIBitmap* pDeviceBitmap, int32_t src_line, FX_LPBYTE src_scan, FXCodec_Format src_format);

+    void						ReSampleScanline(CFX_DIBitmap* pDeviceBitmap, int32_t des_line, uint8_t* src_scan, FXCodec_Format src_format);

+    void						Resample(CFX_DIBitmap* pDeviceBitmap, int32_t src_line, uint8_t* src_scan, FXCodec_Format src_format);

     void						ResampleVert(CFX_DIBitmap* pDeviceBitmap, double scale_y, int des_row);

     FX_BOOL						JpegReadMoreData(ICodec_JpegModule* pJpegModule, FXCODEC_STATUS& err_status);

     static FX_BOOL				PngReadHeaderFunc(void* pModule, int width, int height, int bpc, int pass, int* color_type, double* gamma);

-    static FX_BOOL				PngAskScanlineBufFunc(void* pModule, int line, FX_LPBYTE& src_buf);

+    static FX_BOOL				PngAskScanlineBufFunc(void* pModule, int line, uint8_t*& src_buf);

     static void					PngFillScanlineBufCompletedFunc(void* pModule, int pass, int line);

-    void						PngOneOneMapResampleHorz(CFX_DIBitmap* pDeviceBitmap, int32_t des_line, FX_LPBYTE src_scan, FXCodec_Format src_format);

+    void						PngOneOneMapResampleHorz(CFX_DIBitmap* pDeviceBitmap, int32_t des_line, uint8_t* src_scan, FXCodec_Format src_format);

 

     FX_BOOL						GifReadMoreData(ICodec_GifModule* pGifModule, FXCODEC_STATUS& err_status);

     static void					GifRecordCurrentPositionCallback(void* pModule, FX_DWORD& cur_pos);

-    static FX_LPBYTE			GifAskLocalPaletteBufCallback(void* pModule, int32_t frame_num, int32_t pal_size);

+    static uint8_t*			GifAskLocalPaletteBufCallback(void* pModule, int32_t frame_num, int32_t pal_size);

     static FX_BOOL				GifInputRecordPositionBufCallback(void* pModule, FX_DWORD rcd_pos, const FX_RECT& img_rc,

             int32_t pal_num, void* pal_ptr,

             int32_t delay_time, FX_BOOL user_input,

             int32_t trans_index, int32_t disposal_method, FX_BOOL interlace);

-    static void					GifReadScanlineCallback(void* pModule, int32_t row_num, FX_LPBYTE row_buf);

+    static void					GifReadScanlineCallback(void* pModule, int32_t row_num, uint8_t* row_buf);

     void						GifDoubleLineResampleVert(CFX_DIBitmap* pDeviceBitmap, double scale_y, int des_row);

     FX_BOOL						BmpReadMoreData(ICodec_BmpModule* pBmpModule, FXCODEC_STATUS& err_status);

     static FX_BOOL				BmpInputImagePositionBufCallback(void* pModule, FX_DWORD rcd_pos);

-    static void					BmpReadScanlineCallback(void* pModule, int32_t row_num, FX_LPBYTE row_buf);

+    static void					BmpReadScanlineCallback(void* pModule, int32_t row_num, uint8_t* row_buf);

     void						ResampleVertBT(CFX_DIBitmap* pDeviceBitmap, double scale_y, int des_row);

 public:

     IFX_FileRead*				m_pFile;

     CCodec_ModuleMgr*			m_pCodecMgr;

-    FX_LPVOID					m_pJpegContext;

-    FX_LPVOID					m_pPngContext;

-    FX_LPVOID					m_pGifContext;

-    FX_LPVOID					m_pBmpContext;

-    FX_LPVOID					m_pTiffContext;

+    void*					m_pJpegContext;

+    void*					m_pPngContext;

+    void*					m_pGifContext;

+    void*					m_pBmpContext;

+    void*					m_pTiffContext;

     FXCODEC_IMAGE_TYPE			m_imagType;

     FX_DWORD					m_offSet;

-    FX_LPBYTE					m_pSrcBuf;

+    uint8_t*					m_pSrcBuf;

     FX_DWORD					m_SrcSize;

-    FX_LPBYTE					m_pDecodeBuf;

+    uint8_t*					m_pDecodeBuf;

     int							m_ScanlineSize;

     CFX_DIBitmap*				m_pDeviceBitmap;

     FX_BOOL						m_bInterpol;

@@ -196,7 +196,7 @@ public:
     int			m_FrameNumber;

     int			m_FrameCur;

     int				m_GifBgIndex;

-    FX_LPBYTE		m_pGifPalette;

+    uint8_t*		m_pGifPalette;

     int32_t		m_GifPltNumber;

     int				m_GifTransIndex;

     FX_RECT			m_GifFrameRect;