From f85f4e42838e9d4c2cdbcd365970d42de6f826a0 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 20 Aug 2015 14:59:45 -0700 Subject: Merge to XFA: Fix some -Wmaybe-uninitialized errors. - Break up CPDF_DIBSource::DownSampleScanline() into smaller functions. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1287843004 . (cherry picked from commit 9ae9ae2a68439cbc84a719c0dacf6984703e77cb) Review URL: https://codereview.chromium.org/1304873002 . --- core/src/fxge/ge/fx_ge_fontmap.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'core/src/fxge') diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp index af6c43fe9e..3ef5c45d4c 100644 --- a/core/src/fxge/ge/fx_ge_fontmap.cpp +++ b/core/src/fxge/ge/fx_ge_fontmap.cpp @@ -1540,13 +1540,11 @@ FX_DWORD CFX_FolderFontInfo::GetFontData(void* hFont, } } FX_DWORD datasize = 0; - FX_DWORD offset; + FX_DWORD offset = 0; if (table == 0) { datasize = pFont->m_FontOffset ? 0 : pFont->m_FileSize; - offset = 0; } else if (table == 0x74746366) { datasize = pFont->m_FontOffset ? pFont->m_FileSize : 0; - offset = 0; } else { FX_DWORD nTables = pFont->m_FontTables.GetLength() / 16; for (FX_DWORD i = 0; i < nTables; i++) { -- cgit v1.2.3