Remove typdefs for pointer types in fx_system.h

core/src/fxcodec/codec/fx_codec_jpeg.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 <setjmp.h>
 
 #include "../../../include/fxcodec/fx_codec.h"
 #include "../../../include/fxcrt/fx_safe_types.h"
@@ skipping 59 matching lines @@
     static void _error_do_nothing1(j_common_ptr cinfo, int) {}
 };
 extern "C" {
     static void _error_do_nothing2(j_common_ptr cinfo, char*) {}
 };
 #define JPEG_MARKER_EXIF                (JPEG_APP0 + 1)
 #define JPEG_MARKER_ICC                 (JPEG_APP0 + 2)
 #define JPEG_MARKER_AUTHORTIME  (JPEG_APP0 + 3)
 #define JPEG_MARKER_MAXSIZE     0xFFFF
 #define JPEG_OVERHEAD_LEN       14
-static  FX_BOOL _JpegEmbedIccProfile(j_compress_ptr cinfo, FX_LPCBYTE icc_buf_ptr, FX_DWORD icc_length)
+static  FX_BOOL _JpegEmbedIccProfile(j_compress_ptr cinfo, const uint8_t* icc_buf_ptr, FX_DWORD icc_length)
 {
     if(icc_buf_ptr == NULL || icc_length == 0) {
         return FALSE;
     }
     FX_DWORD icc_segment_size = (JPEG_MARKER_MAXSIZE - 2 - JPEG_OVERHEAD_LEN);
     FX_DWORD icc_segment_num = (icc_length / icc_segment_size) + 1;
     if (icc_segment_num > 255)  {
         return FALSE;
     }
     FX_DWORD icc_data_length = JPEG_OVERHEAD_LEN + (icc_segment_num > 1 ? icc_segment_size : icc_length);
-    FX_LPBYTE icc_data = FX_Alloc(uint8_t, icc_data_length);
+    uint8_t* icc_data = FX_Alloc(uint8_t, icc_data_length);
     FXSYS_memcpy32(icc_data, "\x49\x43\x43\x5f\x50\x52\x4f\x46\x49\x4c\x45\x00", 12);
     icc_data[13] = (uint8_t)icc_segment_num;
     for (uint8_t i = 0; i < (icc_segment_num - 1); i++) {
         icc_data[12] = i + 1;
         FXSYS_memcpy32(icc_data + JPEG_OVERHEAD_LEN, icc_buf_ptr + i * icc_segment_size, icc_segment_size);
         jpeg_write_marker(cinfo, JPEG_MARKER_ICC, icc_data, icc_data_length);
     }
     icc_data[12] = (uint8_t)icc_segment_num;
     FX_DWORD icc_size = (icc_segment_num - 1) * icc_segment_size;
     FXSYS_memcpy32(icc_data + JPEG_OVERHEAD_LEN, icc_buf_ptr + icc_size, icc_length - icc_size);
     jpeg_write_marker(cinfo, JPEG_MARKER_ICC, icc_data, JPEG_OVERHEAD_LEN + icc_length - icc_size);
     FX_Free(icc_data);
     return TRUE;
 }
 extern "C" {
     static void _dest_do_nothing(j_compress_ptr cinfo) {}
 };
 extern "C" {
     static boolean _dest_empty(j_compress_ptr cinfo)
     {
         return FALSE;
     }
 };
 #define JPEG_BLOCK_SIZE 1048576
-static void _JpegEncode(const CFX_DIBSource* pSource, FX_LPBYTE& dest_buf, FX_STRSIZE& dest_size, int quality, FX_LPCBYTE icc_buf, FX_DWORD icc_length)
+static void _JpegEncode(const CFX_DIBSource* pSource, uint8_t*& dest_buf, FX_STRSIZE& dest_size, int quality, const uint8_t* icc_buf, FX_DWORD icc_length)
 {
     struct jpeg_error_mgr jerr;
     jerr.error_exit = _error_do_nothing;
     jerr.emit_message = _error_do_nothing1;
     jerr.output_message = _error_do_nothing;
     jerr.format_message = _error_do_nothing2;
     jerr.reset_error_mgr = _error_do_nothing;
 
     struct jpeg_compress_struct cinfo;
     memset(&cinfo, 0, sizeof(cinfo));
@@ skipping 37 matching lines @@
     cinfo.image_width = width;
     cinfo.image_height = height;
     cinfo.input_components = nComponents;
     if (nComponents == 1) {
         cinfo.in_color_space = JCS_GRAYSCALE;
     } else if (nComponents == 3) {
         cinfo.in_color_space = JCS_RGB;
     } else {
         cinfo.in_color_space = JCS_CMYK;
     }
-    FX_LPBYTE line_buf = NULL;
+    uint8_t* line_buf = NULL;
     if (nComponents > 1) {
         line_buf = FX_Alloc2D(uint8_t, width, nComponents);
     }
     jpeg_set_defaults(&cinfo);
     if(quality != 75) {
         jpeg_set_quality(&cinfo, quality, TRUE);
     }
     jpeg_start_compress(&cinfo, TRUE);
     _JpegEmbedIccProfile(&cinfo, icc_buf, icc_length);
     JSAMPROW row_pointer[1];
     JDIMENSION row;
     while (cinfo.next_scanline < cinfo.image_height) {
-        FX_LPCBYTE src_scan = pSource->GetScanline(cinfo.next_scanline);
+        const uint8_t* src_scan = pSource->GetScanline(cinfo.next_scanline);
         if (nComponents > 1) {
-            FX_LPBYTE dest_scan = line_buf;
+            uint8_t* dest_scan = line_buf;
             if (nComponents == 3) {
                 for (int i = 0; i < width; i ++) {
                     dest_scan[0] = src_scan[2];
                     dest_scan[1] = src_scan[1];
                     dest_scan[2] = src_scan[0];
                     dest_scan += 3;
                     src_scan += Bpp;
                 }
             } else {
                 for (int i = 0; i < pitch; i ++) {
                     *dest_scan++ = ~*src_scan++;
                 }
             }
             row_pointer[0] = line_buf;
         } else {
-            row_pointer[0] = (FX_LPBYTE)src_scan;
+            row_pointer[0] = (uint8_t*)src_scan;
         }
         row = cinfo.next_scanline;
         jpeg_write_scanlines(&cinfo, row_pointer, 1);
         if (cinfo.next_scanline == row) {
             dest_buf = FX_Realloc(uint8_t, dest_buf, dest_buf_length + JPEG_BLOCK_SIZE);
             dest.next_output_byte = dest_buf + dest_buf_length - dest.free_in_buffer;
             dest_buf_length += JPEG_BLOCK_SIZE;
             dest.free_in_buffer += JPEG_BLOCK_SIZE;
         }
     }
     jpeg_finish_compress(&cinfo);
     jpeg_destroy_compress(&cinfo);
     if (line_buf) {
         FX_Free(line_buf);
     }
     dest_size = dest_buf_length - (FX_STRSIZE)dest.free_in_buffer;
 }
-static FX_BOOL _JpegLoadInfo(FX_LPCBYTE src_buf, FX_DWORD src_size, int& width, int& height,
+static FX_BOOL _JpegLoadInfo(const uint8_t* src_buf, FX_DWORD src_size, int& width, int& height,
                              int& num_components, int& bits_per_components, FX_BOOL& color_transform,
-                             FX_LPBYTE* icc_buf_ptr, FX_DWORD* icc_length)
+                             uint8_t** icc_buf_ptr, FX_DWORD* icc_length)
 {
     _JpegScanSOI(src_buf, src_size);
     struct jpeg_decompress_struct cinfo;
     struct jpeg_error_mgr jerr;
     jerr.error_exit = _error_fatal;
     jerr.emit_message = _error_do_nothing1;
     jerr.output_message = _error_do_nothing;
     jerr.format_message = _error_do_nothing2;
     jerr.reset_error_mgr = _error_do_nothing;
     jerr.trace_level = 0;
@@ skipping 37 matching lines @@
         *icc_length = 0;
     }
     jpeg_destroy_decompress(&cinfo);
     return TRUE;
 }
 class CCodec_JpegDecoder : public CCodec_ScanlineDecoder
 {
 public:
     CCodec_JpegDecoder();
     ~CCodec_JpegDecoder();
-    FX_BOOL                             Create(FX_LPCBYTE src_buf, FX_DWORD src_size, int width, int height, int nComps,
+    FX_BOOL                             Create(const uint8_t* src_buf, FX_DWORD src_size, int width, int height, int nComps,
                                FX_BOOL ColorTransform, IFX_JpegProvider* pJP);
     virtual void                Destroy()
     {
         delete this;
     }
     virtual void                v_DownScale(int dest_width, int dest_height);
     virtual FX_BOOL             v_Rewind();
-    virtual FX_LPBYTE   v_GetNextLine();
+    virtual uint8_t*    v_GetNextLine();
     virtual FX_DWORD    GetSrcOffset();
     jmp_buf             m_JmpBuf;
     struct jpeg_decompress_struct cinfo;
     struct jpeg_error_mgr jerr;
     struct jpeg_source_mgr src;
-    FX_LPCBYTE  m_SrcBuf;
+    const uint8_t*      m_SrcBuf;
     FX_DWORD    m_SrcSize;
-    FX_LPBYTE   m_pScanlineBuf;
+    uint8_t*    m_pScanlineBuf;
     FX_BOOL             InitDecode();
     FX_BOOL             m_bInited, m_bStarted, m_bJpegTransform;
 protected:
     IFX_JpegProvider*   m_pExtProvider;
     void*                               m_pExtContext;
     FX_DWORD                    m_nDefaultScaleDenom;
 };
 CCodec_JpegDecoder::CCodec_JpegDecoder()
 {
     m_pScanlineBuf = NULL;
@@ skipping 49 matching lines @@
     if (cinfo.num_components == 3 && !m_bJpegTransform) {
         cinfo.out_color_space = cinfo.jpeg_color_space;
     }
     m_OrigWidth = cinfo.image_width;
     m_OrigHeight = cinfo.image_height;
     m_OutputWidth = m_OrigWidth;
     m_OutputHeight = m_OrigHeight;
     m_nDefaultScaleDenom = cinfo.scale_denom;
     return TRUE;
 }
-FX_BOOL CCodec_JpegDecoder::Create(FX_LPCBYTE src_buf, FX_DWORD src_size, int width, int height,
+FX_BOOL CCodec_JpegDecoder::Create(const uint8_t* src_buf, FX_DWORD src_size, int width, int height,
                                    int nComps, FX_BOOL ColorTransform, IFX_JpegProvider* pJP)
 {
     if (pJP) {
         m_pExtProvider = pJP;
         m_pExtContext = m_pExtProvider->CreateDecoder(src_buf, src_size, width, height, nComps, ColorTransform);
         return m_pExtContext != NULL;
     }
     _JpegScanSOI(src_buf, src_size);
     m_SrcBuf = src_buf;
     m_SrcSize = src_size;
     jerr.error_exit = _error_fatal;
     jerr.emit_message = _error_do_nothing1;
     jerr.output_message = _error_do_nothing;
     jerr.format_message = _error_do_nothing2;
     jerr.reset_error_mgr = _error_do_nothing;
     src.init_source = _src_do_nothing;
     src.term_source = _src_do_nothing;
     src.skip_input_data = _src_skip_data;
     src.fill_input_buffer = _src_fill_buffer;
     src.resync_to_restart = _src_resync;
     m_bJpegTransform = ColorTransform;
     if(src_size > 1 && FXSYS_memcmp32(src_buf + src_size - 2, "\xFF\xD9", 2) != 0) {
-        ((FX_LPBYTE)src_buf)[src_size - 2] = 0xFF;
-        ((FX_LPBYTE)src_buf)[src_size - 1] = 0xD9;
+        ((uint8_t*)src_buf)[src_size - 2] = 0xFF;
+        ((uint8_t*)src_buf)[src_size - 1] = 0xD9;
     }
     m_OutputWidth = m_OrigWidth = width;
     m_OutputHeight = m_OrigHeight = height;
     if (!InitDecode()) {
         return FALSE;
     }
     if (cinfo.num_components < nComps) {
         return FALSE;
     }
     if ((int)cinfo.image_width < width) {
@@ skipping 59 matching lines @@
         jpeg_destroy_decompress(&cinfo);
         return FALSE;
     }
     if ((int)cinfo.output_width > m_OrigWidth) {
         FXSYS_assert(FALSE);
         return FALSE;
     }
     m_bStarted = TRUE;
     return TRUE;
 }
-FX_LPBYTE CCodec_JpegDecoder::v_GetNextLine()
+uint8_t* CCodec_JpegDecoder::v_GetNextLine()
 {
     if (m_pExtProvider) {
         return m_pExtProvider->GetNextLine(m_pExtContext);
     }
     int nlines = jpeg_read_scanlines(&cinfo, &m_pScanlineBuf, 1);
     if (nlines < 1) {
         return NULL;
     }
     return m_pScanlineBuf;
 }
 FX_DWORD CCodec_JpegDecoder::GetSrcOffset()
 {
     if (m_pExtProvider) {
         return m_pExtProvider->GetSrcOffset(m_pExtContext);
     }
     return (FX_DWORD)(m_SrcSize - src.bytes_in_buffer);
 }
-ICodec_ScanlineDecoder* CCodec_JpegModule::CreateDecoder(FX_LPCBYTE src_buf, FX_DWORD src_size,
+ICodec_ScanlineDecoder* CCodec_JpegModule::CreateDecoder(const uint8_t* src_buf, FX_DWORD src_size,
         int width, int height, int nComps, FX_BOOL ColorTransform)
 {
     if (src_buf == NULL || src_size == 0) {
         return NULL;
     }
     CCodec_JpegDecoder* pDecoder = new CCodec_JpegDecoder;
     if (!pDecoder->Create(src_buf, src_size, width, height, nComps, ColorTransform, m_pExtProvider)) {
         delete pDecoder;
         return NULL;
     }
     return pDecoder;
 }
-FX_BOOL CCodec_JpegModule::LoadInfo(FX_LPCBYTE src_buf, FX_DWORD src_size, int& width, int& height,
+FX_BOOL CCodec_JpegModule::LoadInfo(const uint8_t* src_buf, FX_DWORD src_size, int& width, int& height,
                                     int& num_components, int& bits_per_components, FX_BOOL& color_transform,
-                                    FX_LPBYTE* icc_buf_ptr, FX_DWORD* icc_length)
+                                    uint8_t** icc_buf_ptr, FX_DWORD* icc_length)
 {
     if (m_pExtProvider) {
         return m_pExtProvider->LoadInfo(src_buf, src_size, width, height,
                                         num_components, bits_per_components, color_transform,
                                         icc_buf_ptr, icc_length);
     }
     return _JpegLoadInfo(src_buf, src_size, width, height, num_components, bits_per_components, color_transform, icc_buf_ptr, icc_length);
 }
-FX_BOOL CCodec_JpegModule::Encode(const CFX_DIBSource* pSource, FX_LPBYTE& dest_buf, FX_STRSIZE& dest_size, int quality, FX_LPCBYTE icc_buf, FX_DWORD icc_length)
+FX_BOOL CCodec_JpegModule::Encode(const CFX_DIBSource* pSource, uint8_t*& dest_buf, FX_STRSIZE& dest_size, int quality, const uint8_t* icc_buf, FX_DWORD icc_length)
 {
     if (m_pExtProvider) {
         return m_pExtProvider->Encode(pSource, dest_buf, dest_size, quality, icc_buf, icc_length);
     }
     if(pSource->GetBPP() < 8 || pSource->GetPalette() != NULL) {
         ASSERT(pSource->GetBPP() >= 8 && pSource->GetPalette() == NULL);
         return FALSE;
     }
     _JpegEncode(pSource, dest_buf, dest_size, quality, icc_buf, icc_length);
     return TRUE;
@@ skipping 129 matching lines @@
     if (m_pExtProvider) {
         return m_pExtProvider->ReadScanline(pContext, dest_buf);
     }
     FXJPEG_Context* p = (FXJPEG_Context*)pContext;
     if (setjmp(p->m_JumpMark) == -1) {
         return FALSE;
     }
     int nlines = jpeg_read_scanlines(&p->m_Info, &dest_buf, 1);
     return nlines == 1;
 }
-FX_DWORD CCodec_JpegModule::GetAvailInput(void* pContext, FX_LPBYTE* avail_buf_ptr)
+FX_DWORD CCodec_JpegModule::GetAvailInput(void* pContext, uint8_t** avail_buf_ptr)
 {
     if (m_pExtProvider) {
         return m_pExtProvider->GetAvailInput(pContext, avail_buf_ptr);
     }
     if(avail_buf_ptr != NULL) {
         *avail_buf_ptr = NULL;
         if(((FXJPEG_Context*)pContext)->m_SrcMgr.bytes_in_buffer > 0) {
-            *avail_buf_ptr = (FX_LPBYTE)((FXJPEG_Context*)pContext)->m_SrcMgr.next_input_byte;
+            *avail_buf_ptr = (uint8_t*)((FXJPEG_Context*)pContext)->m_SrcMgr.next_input_byte;
         }
     }
     return (FX_DWORD)((FXJPEG_Context*)pContext)->m_SrcMgr.bytes_in_buffer;
 }