diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-08-20 14:59:45 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-08-20 14:59:45 -0700 |
| commit | f85f4e42838e9d4c2cdbcd365970d42de6f826a0 (patch) | |
| tree | f79d4dce64f64d6862702aa3e7b0d608f79ad4ce /core/src/fxge | |
| parent | 5417f067844892644486d7b0581c247904059a88 (diff) | |
| download | pdfium-f85f4e42838e9d4c2cdbcd365970d42de6f826a0.tar.xz | |
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 .
Diffstat (limited to 'core/src/fxge')
| -rw-r--r-- | core/src/fxge/ge/fx_ge_fontmap.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
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++) { |