core/src/fxge/dib/fx_dib_composite.cpp - Issue 294353002: Fix warnings in android build, fix font rendering issue, fix issue 357588: wrong characters represe…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: core/src/fxge/dib/fx_dib_composite.cpp

Issue 294353002: Fix warnings in android build, fix font rendering issue, fix issue 357588: wrong characters represe… (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: Patch Set after rebase Created 6 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: core/src/fxge/dib/fx_dib_composite.cpp

diff --git a/core/src/fxge/dib/fx_dib_composite.cpp b/core/src/fxge/dib/fx_dib_composite.cpp

index 1bbe07725bb0a4b8939bb39289437f876e4d5ea7..da555de9d501b45bae80e8e7acc438ec9f9014fd 100644

--- a/core/src/fxge/dib/fx_dib_composite.cpp

+++ b/core/src/fxge/dib/fx_dib_composite.cpp

@@ -3805,7 +3805,6 @@ void CFX_ScanlineCompositor::CompositeRgbBitmapLine(FX_LPBYTE dest_scan, FX_LPCB

{

int src_Bpp = (m_SrcFormat & 0xff) >> 3;

int dest_Bpp = (m_DestFormat & 0xff) >> 3;

- int dest_Size = width * dest_Bpp + 4;

if (m_bRgbByteOrder) {

switch (m_Transparency) {

case 0:

@@ -3886,6 +3885,7 @@ void CFX_ScanlineCompositor::CompositeRgbBitmapLine(FX_LPBYTE dest_scan, FX_LPCB

}

} else {

+ int dest_Size = width * dest_Bpp + 4;

if (dest_Size > m_CacheSize) {

m_pCacheScanline = FX_Realloc(FX_BYTE, m_pCacheScanline, dest_Size);

if (!m_pCacheScanline) {

« no previous file with comments | « core/src/fxge/android/fpf_skiafontmgr.cpp ('k') | core/src/fxge/dib/fx_dib_convert.cpp » ('j') | no next file with comments »