summaryrefslogtreecommitdiff
path: root/core/src/fxge/dib/fx_dib_main.cpp
diff options
context:
space:
mode:
authorBo Xu <bo_xu@foxitsoftware.com>2014-05-24 12:20:17 -0700
committerBo Xu <bo_xu@foxitsoftware.com>2014-05-24 12:20:17 -0700
commit5dc4f24637d353d4d777c251f6d8c5746e062e7e (patch)
tree3b456ac537c2ff58afa268bd4a543a482dbdc1f1 /core/src/fxge/dib/fx_dib_main.cpp
parent4201b2a5f38a6335d012aa4dc4cd19f6989d05f1 (diff)
downloadpdfium-5dc4f24637d353d4d777c251f6d8c5746e062e7e.tar.xz
Fix warnings in android build, fix font rendering issue, fix issue 357588: wrong characters representation, and addjust some code indent
BUG= R=jam@chromium.org Review URL: https://codereview.chromium.org/294353002
Diffstat (limited to 'core/src/fxge/dib/fx_dib_main.cpp')
-rw-r--r--core/src/fxge/dib/fx_dib_main.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/src/fxge/dib/fx_dib_main.cpp b/core/src/fxge/dib/fx_dib_main.cpp
index 9b27a13daf..7644e39f02 100644
--- a/core/src/fxge/dib/fx_dib_main.cpp
+++ b/core/src/fxge/dib/fx_dib_main.cpp
@@ -1326,7 +1326,7 @@ FX_BOOL CFX_DIBitmap::ConvertColorScale(FX_DWORD forecolor, FX_DWORD backcolor)
*scanline ++ = bk + (fk - bk) * gray / 255;
}
}
- } else
+ } else {
for (int row = 0; row < m_Height; row ++) {
FX_LPBYTE scanline = m_pBuffer + row * m_Pitch;
int gap = m_bpp / 8 - 2;
@@ -1338,6 +1338,7 @@ FX_BOOL CFX_DIBitmap::ConvertColorScale(FX_DWORD forecolor, FX_DWORD backcolor)
scanline += gap;
}
}
+ }
return TRUE;
}
FX_BOOL CFX_DIBitmap::DitherFS(const FX_DWORD* pPalette, int pal_size, const FX_RECT* pRect)