diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-11-05 20:07:27 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-11-05 20:07:27 -0800 |
| commit | 476ac131cfd55842383f65418658a5f1103785b4 (patch) | |
| tree | 3c7d2d2dd6b550cccdd6bf5ba59119ebd0660fa6 /core/src/fxge/win32/fx_win32_device.cpp | |
| parent | cec3f6878e37fcd1c6c15e0e2ab011931d55549e (diff) | |
| download | pdfium-476ac131cfd55842383f65418658a5f1103785b4.tar.xz | |
Merge to XFA: The chromium_code whack-a-mole CLs.
BUG=pdfium:29
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/1411583005 .
Review URL: https://codereview.chromium.org/1431563002 .
Review URL: https://codereview.chromium.org/1419943006 .
Review URL: https://codereview.chromium.org/1415483003 .
Review URL: https://codereview.chromium.org/1414073005 .
Review URL: https://codereview.chromium.org/1415883010 .
(cherry picked from commit 9f4def68601ec75b85b92077c521b9423b4f7f00)
(cherry picked from commit 23e20f2d3ce5b416e1c7f7f1c2d68c90ddf2d4ad)
(cherry picked from commit a6e2a4eca1be4daf14fae4e2427a6ca76269db43)
(cherry picked from commit bfba4cb7f22fc19a5e71559f09f2cde19fbb6a79)
(cherry picked from commit 81edc51ef8242205c5a1192bc33bf16d8c96120b)
(cherry picked from commit 1630dffdc1d554d8f2319e83cdbd7b12f480362d)
Review URL: https://codereview.chromium.org/1421963005 .
Diffstat (limited to 'core/src/fxge/win32/fx_win32_device.cpp')
| -rw-r--r-- | core/src/fxge/win32/fx_win32_device.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/src/fxge/win32/fx_win32_device.cpp b/core/src/fxge/win32/fx_win32_device.cpp index 93c2fd6836..a32f9ade78 100644 --- a/core/src/fxge/win32/fx_win32_device.cpp +++ b/core/src/fxge/win32/fx_win32_device.cpp @@ -358,7 +358,7 @@ void* CFX_Win32FontInfo::MapFont(int weight, OUT_TT_ONLY_PRECIS, 0, 0, subst_pitch_family, face); char facebuf[100]; HFONT hOldFont = (HFONT)::SelectObject(m_hDC, hFont); - int ret = ::GetTextFaceA(m_hDC, 100, facebuf); + ::GetTextFaceA(m_hDC, 100, facebuf); ::SelectObject(m_hDC, hOldFont); if (face.EqualNoCase(facebuf)) { return hFont; @@ -536,7 +536,6 @@ FX_BOOL CGdiDeviceDriver::GDI_SetDIBits(const CFX_DIBitmap* pBitmap1, return FALSE; } int width = pSrcRect->Width(), height = pSrcRect->Height(); - int pitch = pBitmap->GetPitch(); LPBYTE pBuffer = pBitmap->GetBuffer(); CFX_ByteString info = CFX_WindowsDIB::GetBitmapInfo(pBitmap); ((BITMAPINFOHEADER*)info.c_str())->biHeight *= -1; @@ -556,7 +555,6 @@ FX_BOOL CGdiDeviceDriver::GDI_SetDIBits(const CFX_DIBitmap* pBitmap1, return FALSE; } int width = pSrcRect->Width(), height = pSrcRect->Height(); - int pitch = pBitmap->GetPitch(); LPBYTE pBuffer = pBitmap->GetBuffer(); CFX_ByteString info = CFX_WindowsDIB::GetBitmapInfo(pBitmap); ::SetDIBitsToDevice(m_hDC, left, top, width, height, pSrcRect->left, |