| Index: core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp
|
| diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp
|
| index 699f84830fdc9c9bf3b144dd1b3b3da12fedc5d0..669ba4da4957f4193f2bcc0965e7dd6876bebe9d 100644
|
| --- a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp
|
| +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp
|
| @@ -141,7 +141,7 @@ CPDF_DIBTransferFunc::CPDF_DIBTransferFunc(const CPDF_TransferFunc* pTransferFun
|
| m_RampG = &pTransferFunc->m_Samples[256];
|
| m_RampB = &pTransferFunc->m_Samples[512];
|
| }
|
| -void CPDF_DIBTransferFunc::TranslateScanline(FX_LPBYTE dest_buf, FX_LPCBYTE src_buf) const
|
| +void CPDF_DIBTransferFunc::TranslateScanline(uint8_t* dest_buf, const uint8_t* src_buf) const
|
| {
|
| int i;
|
| FX_BOOL bSkip = FALSE;
|
| @@ -234,7 +234,7 @@ void CPDF_DIBTransferFunc::TranslateScanline(FX_LPBYTE dest_buf, FX_LPCBYTE src_
|
| break;
|
| }
|
| }
|
| -void CPDF_DIBTransferFunc::TranslateDownSamples(FX_LPBYTE dest_buf, FX_LPCBYTE src_buf, int pixels, int Bpp) const
|
| +void CPDF_DIBTransferFunc::TranslateDownSamples(uint8_t* dest_buf, const uint8_t* src_buf, int pixels, int Bpp) const
|
| {
|
| if (Bpp == 8) {
|
| for (int i = 0; i < pixels; i ++) {
|
| @@ -519,8 +519,8 @@ FX_BOOL CPDF_ImageRenderer::DrawPatternImage(const CFX_Matrix* pObj2Device)
|
| int matte_g = FXARGB_G(m_Loader.m_MatteColor);
|
| int matte_b = FXARGB_B(m_Loader.m_MatteColor);
|
| for (int row = 0; row < height; row ++) {
|
| - FX_LPBYTE dest_scan = (FX_LPBYTE)bitmap_device1.GetBitmap()->GetScanline(row);
|
| - FX_LPCBYTE mask_scan = bitmap_device2.GetBitmap()->GetScanline(row);
|
| + uint8_t* dest_scan = (uint8_t*)bitmap_device1.GetBitmap()->GetScanline(row);
|
| + const uint8_t* mask_scan = bitmap_device2.GetBitmap()->GetScanline(row);
|
| for (int col = 0; col < width; col ++) {
|
| int alpha = *mask_scan ++;
|
| if (alpha) {
|
| @@ -606,8 +606,8 @@ FX_BOOL CPDF_ImageRenderer::DrawMaskedImage()
|
| int matte_g = FXARGB_G(m_Loader.m_MatteColor);
|
| int matte_b = FXARGB_B(m_Loader.m_MatteColor);
|
| for (int row = 0; row < height; row ++) {
|
| - FX_LPBYTE dest_scan = (FX_LPBYTE)bitmap_device1.GetBitmap()->GetScanline(row);
|
| - FX_LPCBYTE mask_scan = bitmap_device2.GetBitmap()->GetScanline(row);
|
| + uint8_t* dest_scan = (uint8_t*)bitmap_device1.GetBitmap()->GetScanline(row);
|
| + const uint8_t* mask_scan = bitmap_device2.GetBitmap()->GetScanline(row);
|
| for (int col = 0; col < width; col ++) {
|
| int alpha = *mask_scan ++;
|
| if (alpha) {
|
| @@ -823,7 +823,7 @@ CPDF_QuickStretcher::~CPDF_QuickStretcher()
|
| delete m_pDecoder;
|
| }
|
| }
|
| -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);
|
| FX_BOOL CPDF_QuickStretcher::Start(CPDF_ImageObject* pImageObj, CFX_AffineMatrix* pImage2Device, const FX_RECT* pClipBox)
|
| {
|
| @@ -903,7 +903,7 @@ FX_BOOL CPDF_QuickStretcher::Start(CPDF_ImageObject* pImageObj, CFX_AffineMatrix
|
| }
|
| FX_BOOL CPDF_QuickStretcher::Continue(IFX_Pause* pPause)
|
| {
|
| - FX_LPBYTE result_buf = m_pBitmap->GetBuffer();
|
| + uint8_t* result_buf = m_pBitmap->GetBuffer();
|
| int src_width = m_pDecoder ? m_pDecoder->GetWidth() : m_SrcWidth;
|
| int src_height = m_pDecoder ? m_pDecoder->GetHeight() : m_SrcHeight;
|
| int src_pitch = src_width * m_Bpp;
|
| @@ -916,7 +916,7 @@ FX_BOOL CPDF_QuickStretcher::Continue(IFX_Pause* pPause)
|
| dest_y = m_LineIndex;
|
| src_y = (dest_y + m_ClipTop) * src_height / m_DestHeight;
|
| }
|
| - FX_LPCBYTE src_scan;
|
| + const uint8_t* src_scan;
|
| if (m_pDecoder) {
|
| src_scan = m_pDecoder->GetScanline(src_y);
|
| if (src_scan == NULL) {
|
| @@ -929,11 +929,11 @@ FX_BOOL CPDF_QuickStretcher::Continue(IFX_Pause* pPause)
|
| }
|
| src_scan += src_y * src_pitch;
|
| }
|
| - FX_LPBYTE result_scan = result_buf + dest_y * m_pBitmap->GetPitch();
|
| + uint8_t* result_scan = result_buf + dest_y * m_pBitmap->GetPitch();
|
| for (int x = 0; x < m_ResultWidth; x ++) {
|
| int dest_x = m_ClipLeft + x;
|
| int src_x = (m_bFlipX ? (m_DestWidth - dest_x - 1) : dest_x) * src_width / m_DestWidth;
|
| - FX_LPCBYTE src_pixel = src_scan + src_x * m_Bpp;
|
| + const uint8_t* src_pixel = src_scan + src_x * m_Bpp;
|
| if (m_pCS == NULL) {
|
| *result_scan = src_pixel[2];
|
| result_scan ++;
|
| @@ -1049,11 +1049,11 @@ CFX_DIBitmap* CPDF_RenderStatus::LoadSMask(CPDF_Dictionary* pSMaskDict,
|
| delete pMask;
|
| return NULL;
|
| }
|
| - FX_LPBYTE dest_buf = pMask->GetBuffer();
|
| + uint8_t* dest_buf = pMask->GetBuffer();
|
| int dest_pitch = pMask->GetPitch();
|
| - FX_LPBYTE src_buf = bitmap.GetBuffer();
|
| + uint8_t* src_buf = bitmap.GetBuffer();
|
| int src_pitch = bitmap.GetPitch();
|
| - FX_LPBYTE pTransfer = FX_Alloc(uint8_t, 256);
|
| + uint8_t* pTransfer = FX_Alloc(uint8_t, 256);
|
| if (pFunc) {
|
| CFX_FixedBufGrow<FX_FLOAT, 16> results(pFunc->CountOutputs());
|
| for (int i = 0; i < 256; i ++) {
|
| @@ -1070,8 +1070,8 @@ CFX_DIBitmap* CPDF_RenderStatus::LoadSMask(CPDF_Dictionary* pSMaskDict,
|
| if (bLuminosity) {
|
| int Bpp = bitmap.GetBPP() / 8;
|
| for (int row = 0; row < height; row ++) {
|
| - FX_LPBYTE dest_pos = dest_buf + row * dest_pitch;
|
| - FX_LPBYTE src_pos = src_buf + row * src_pitch;
|
| + uint8_t* dest_pos = dest_buf + row * dest_pitch;
|
| + uint8_t* src_pos = src_buf + row * src_pitch;
|
| for (int col = 0; col < width; col ++) {
|
| *dest_pos ++ = pTransfer[FXRGB2GRAY(src_pos[2], src_pos[1], *src_pos)];
|
| src_pos += Bpp;
|
|
|