diff options
| author | Ryan Harrison <rharrison@chromium.org> | 2017-09-27 10:53:11 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-27 16:11:38 +0000 |
| commit | 875e98c581952478f3a3ccef9b2f2e3ed06c5346 (patch) | |
| tree | 8e0d7e032056bf4c73d6da43c0f3ce4eadb74dfd /core/fxge | |
| parent | cc3a3ee3ebcc1baabdfa7ffca5876dbbfa3980c1 (diff) | |
| download | pdfium-875e98c581952478f3a3ccef9b2f2e3ed06c5346.tar.xz | |
Remove FX_STRSIZE and replace with size_t
BUG=pdfium:828
Change-Id: I5c40237433ebabaeabdb43aec9cdf783e41dfe16
Reviewed-on: https://pdfium-review.googlesource.com/13230
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'core/fxge')
| -rw-r--r-- | core/fxge/android/cfpf_skiafontmgr.cpp | 3 | ||||
| -rw-r--r-- | core/fxge/apple/fx_quartz_device.cpp | 2 | ||||
| -rw-r--r-- | core/fxge/win32/cfx_psrenderer.cpp | 2 | ||||
| -rw-r--r-- | core/fxge/win32/fx_win32_device.cpp | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/core/fxge/android/cfpf_skiafontmgr.cpp b/core/fxge/android/cfpf_skiafontmgr.cpp index 4be35668e0..af1d58f696 100644 --- a/core/fxge/android/cfpf_skiafontmgr.cpp +++ b/core/fxge/android/cfpf_skiafontmgr.cpp @@ -37,7 +37,8 @@ static unsigned long FPF_SkiaStream_Read(FXFT_Stream stream, if (!pFileRead) return 0; - if (!pFileRead->ReadBlock(buffer, (FX_FILESIZE)offset, (size_t)count)) + if (!pFileRead->ReadBlock(buffer, (FX_FILESIZE)offset, + static_cast<size_t>(count))) return 0; return count; diff --git a/core/fxge/apple/fx_quartz_device.cpp b/core/fxge/apple/fx_quartz_device.cpp index b24638c465..4ab6620485 100644 --- a/core/fxge/apple/fx_quartz_device.cpp +++ b/core/fxge/apple/fx_quartz_device.cpp @@ -49,7 +49,7 @@ void CQuartz2D::destroyGraphics(void* graphics) { void* CQuartz2D::CreateFont(const uint8_t* pFontData, uint32_t dwFontSize) { CGDataProviderRef pDataProvider = CGDataProviderCreateWithData( - nullptr, pFontData, (size_t)dwFontSize, nullptr); + nullptr, pFontData, static_cast<size_t>(dwFontSize), nullptr); if (!pDataProvider) return nullptr; diff --git a/core/fxge/win32/cfx_psrenderer.cpp b/core/fxge/win32/cfx_psrenderer.cpp index 9a617da32f..d97391822a 100644 --- a/core/fxge/win32/cfx_psrenderer.cpp +++ b/core/fxge/win32/cfx_psrenderer.cpp @@ -458,7 +458,7 @@ bool CFX_PSRenderer::DrawDIBits(const RetainPtr<CFX_DIBSource>& pSource, int bpp = pConverted->GetBPP() / 8; uint8_t* output_buf = nullptr; - FX_STRSIZE output_size = 0; + size_t output_size = 0; const char* filter = nullptr; if ((m_PSLevel == 2 || flags & FXRENDER_IMAGE_LOSSY) && CCodec_JpegModule::JpegEncode(pConverted, &output_buf, &output_size)) { diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp index 9957239089..35f9a5fce5 100644 --- a/core/fxge/win32/fx_win32_device.cpp +++ b/core/fxge/win32/fx_win32_device.cpp @@ -610,7 +610,7 @@ void* CFX_Win32FontInfo::MapFont(int weight, const unsigned short* pName = reinterpret_cast<const unsigned short*>( g_VariantNames[i].m_pVariantName); - FX_STRSIZE len = WideString::WStringLength(pName); + size_t len = WideString::WStringLength(pName); WideString wsName = WideString::FromUTF16LE(pName, len); if (wsFace == wsName) return hFont; |