Remove typdefs for pointer types in fx_system.h.

This involves fixing some multiple variable per line
declarations, as the textually-substituted "*" applies
only to the first one.

This involves moving some consts around following the
substitution.

This involves replacing some typedefs used as constructors
with better code.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1171733003

1 files changed, 17 insertions, 15 deletions

diff --git a/core/src/fpdfapi/fpdf_parser/filters_int.h b/core/src/fpdfapi/fpdf_parser/filters_int.h
index 6652cc0ccc..38dcb171f5 100644
--- a/core/src/fpdfapi/fpdf_parser/filters_int.h
+++ b/core/src/fpdfapi/fpdf_parser/filters_int.h
@@ -12,10 +12,10 @@ class CPDF_DecryptFilter : public CFX_DataFilter
 public:
     CPDF_DecryptFilter(CPDF_CryptoHandler* pCryptoHandler, FX_DWORD objnum, FX_DWORD gennum);
     virtual ~CPDF_DecryptFilter();
-    virtual	void	v_FilterIn(FX_LPCBYTE src_buf, FX_DWORD src_size, CFX_BinaryBuf& dest_buf);
+    virtual	void	v_FilterIn(const uint8_t* src_buf, FX_DWORD src_size, CFX_BinaryBuf& dest_buf);
     virtual void	v_FilterFinish(CFX_BinaryBuf& dest_buf);
     CPDF_CryptoHandler*	m_pCryptoHandler;
-    FX_LPVOID		m_pContext;
+    void*		m_pContext;
     FX_DWORD		m_ObjNum, m_GenNum;
 };
 class CPDF_FlateFilter : public CFX_DataFilter
@@ -23,7 +23,7 @@ class CPDF_FlateFilter : public CFX_DataFilter
 public:
     CPDF_FlateFilter();
     virtual ~CPDF_FlateFilter();
-    virtual	void	v_FilterIn(FX_LPCBYTE src_buf, FX_DWORD src_size, CFX_BinaryBuf& dest_buf);
+    virtual	void	v_FilterIn(const uint8_t* src_buf, FX_DWORD src_size, CFX_BinaryBuf& dest_buf);
     virtual void	v_FilterFinish(CFX_BinaryBuf& dest_buf) {}
     void*			m_pContext;
     uint8_t			m_DestBuffer[FPDF_FILTER_BUFFER_SIZE];
@@ -33,7 +33,7 @@ class CPDF_LzwFilter : public CFX_DataFilter
 public:
     CPDF_LzwFilter(FX_BOOL bEarlyChange);
     virtual ~CPDF_LzwFilter() {}
-    virtual	void	v_FilterIn(FX_LPCBYTE src_buf, FX_DWORD src_size, CFX_BinaryBuf& dest_buf);
+    virtual	void	v_FilterIn(const uint8_t* src_buf, FX_DWORD src_size, CFX_BinaryBuf& dest_buf);
     virtual void	v_FilterFinish(CFX_BinaryBuf& dest_buf) {}
     FX_BOOL			m_bEarlyChange;
     FX_DWORD		m_CodeArray[5021];
@@ -52,11 +52,12 @@ class CPDF_PredictorFilter : public CFX_DataFilter
 public:
     CPDF_PredictorFilter(int predictor, int colors, int bpc, int cols);
     virtual ~CPDF_PredictorFilter();
-    virtual	void	v_FilterIn(FX_LPCBYTE src_buf, FX_DWORD src_size, CFX_BinaryBuf& dest_buf);
+    virtual	void	v_FilterIn(const uint8_t* src_buf, FX_DWORD src_size, CFX_BinaryBuf& dest_buf);
     virtual void	v_FilterFinish(CFX_BinaryBuf& dest_buf) {}
     FX_BOOL			m_bTiff;
     FX_DWORD		m_Pitch, m_Bpp;
-    FX_LPBYTE		m_pRefLine, m_pCurLine;
+    uint8_t*		m_pRefLine;
+    uint8_t*		m_pCurLine;
     FX_DWORD		m_iLine, m_LineInSize;
 };
 class CPDF_AsciiHexFilter : public CFX_DataFilter
@@ -64,7 +65,7 @@ class CPDF_AsciiHexFilter : public CFX_DataFilter
 public:
     CPDF_AsciiHexFilter();
     virtual ~CPDF_AsciiHexFilter() {}
-    virtual	void	v_FilterIn(FX_LPCBYTE src_buf, FX_DWORD src_size, CFX_BinaryBuf& dest_buf);
+    virtual	void	v_FilterIn(const uint8_t* src_buf, FX_DWORD src_size, CFX_BinaryBuf& dest_buf);
     virtual void	v_FilterFinish(CFX_BinaryBuf& dest_buf) {}
     int				m_State;
     int				m_FirstDigit;
@@ -74,7 +75,7 @@ class CPDF_Ascii85Filter : public CFX_DataFilter
 public:
     CPDF_Ascii85Filter();
     virtual ~CPDF_Ascii85Filter() {}
-    virtual	void	v_FilterIn(FX_LPCBYTE src_buf, FX_DWORD src_size, CFX_BinaryBuf& dest_buf);
+    virtual	void	v_FilterIn(const uint8_t* src_buf, FX_DWORD src_size, CFX_BinaryBuf& dest_buf);
     virtual void	v_FilterFinish(CFX_BinaryBuf& dest_buf) {}
     int				m_State;
     int				m_CharCount;
@@ -85,7 +86,7 @@ class CPDF_RunLenFilter : public CFX_DataFilter
 public:
     CPDF_RunLenFilter();
     virtual ~CPDF_RunLenFilter() {}
-    virtual	void	v_FilterIn(FX_LPCBYTE src_buf, FX_DWORD src_size, CFX_BinaryBuf& dest_buf);
+    virtual	void	v_FilterIn(const uint8_t* src_buf, FX_DWORD src_size, CFX_BinaryBuf& dest_buf);
     virtual void	v_FilterFinish(CFX_BinaryBuf& dest_buf) {}
     int				m_State;
     FX_DWORD		m_Count;
@@ -95,11 +96,11 @@ class CPDF_JpegFilter : public CFX_DataFilter
 public:
     CPDF_JpegFilter();
     virtual ~CPDF_JpegFilter();
-    virtual	void	v_FilterIn(FX_LPCBYTE src_buf, FX_DWORD src_size, CFX_BinaryBuf& dest_buf);
+    virtual	void	v_FilterIn(const uint8_t* src_buf, FX_DWORD src_size, CFX_BinaryBuf& dest_buf);
     virtual void	v_FilterFinish(CFX_BinaryBuf& dest_buf) {}
     void*			m_pContext;
     CFX_BinaryBuf	m_InputBuf;
-    FX_LPBYTE		m_pScanline;
+    uint8_t*		m_pScanline;
     int				m_Pitch, m_Height, m_Width, m_nComps, m_iLine;
     FX_BOOL			m_bGotHeader;
 };
@@ -109,16 +110,17 @@ public:
     CPDF_FaxFilter();
     virtual ~CPDF_FaxFilter();
     FX_BOOL			Initialize(int Encoding, int bEndOfLine, int bByteAlign, int bBlack, int nRows, int nColumns);
-    virtual	void	v_FilterIn(FX_LPCBYTE src_buf, FX_DWORD src_size, CFX_BinaryBuf& dest_buf);
+    virtual	void	v_FilterIn(const uint8_t* src_buf, FX_DWORD src_size, CFX_BinaryBuf& dest_buf);
     virtual void	v_FilterFinish(CFX_BinaryBuf& dest_buf);
     int				m_Encoding, m_bEndOfLine, m_bByteAlign, m_bBlack;
     int				m_nRows, m_nColumns, m_Pitch, m_iRow;
-    FX_LPBYTE		m_pScanlineBuf, m_pRefBuf;
+    uint8_t*		m_pScanlineBuf;
+	uint8_t*		m_pRefBuf;
     CFX_BinaryBuf	m_InputBuf;
     int				m_InputBitPos;
-    void			ProcessData(FX_LPCBYTE src_buf, FX_DWORD src_size, int& bitpos, FX_BOOL bFinish,
+    void			ProcessData(const uint8_t* src_buf, FX_DWORD src_size, int& bitpos, FX_BOOL bFinish,
                                 CFX_BinaryBuf& dest_buf);
-    FX_BOOL			ReadLine(FX_LPCBYTE src_buf, int bitsize, int& bitpos);
+    FX_BOOL			ReadLine(const uint8_t* src_buf, int bitsize, int& bitpos);
 };
 
 #endif  // CORE_SRC_FPDFAPI_FPDF_PARSER_FILTERS_INT_H_