diff options
| author | Wei Li <weili@chromium.org> | 2016-03-22 19:19:01 -0700 |
|---|---|---|
| committer | Wei Li <weili@chromium.org> | 2016-03-22 19:19:01 -0700 |
| commit | e91afbabec3b7c891b464efd221748edaba3c2bc (patch) | |
| tree | a1f0cbd94320b43b1f0e949ee91b15367156a0a2 /core | |
| parent | 0ac525005e15a6a67b04e8ab1553f4a1e18b0da7 (diff) | |
| download | pdfium-e91afbabec3b7c891b464efd221748edaba3c2bc.tar.xz | |
Re-enable MSVC warning 4702
BUG=pdfium:29
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1821423002 .
Diffstat (limited to 'core')
| -rw-r--r-- | core/fpdfapi/fpdf_font/fpdf_font_cid.cpp | 3 | ||||
| -rw-r--r-- | core/fxcodec/jbig2/JBig2_GsidProc.cpp | 5 | ||||
| -rw-r--r-- | core/fxcrt/fx_basic_memmgr.cpp | 2 | ||||
| -rw-r--r-- | core/fxge/dib/fx_dib_convert.cpp | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp index 97a3d4dbc1..351df608d2 100644 --- a/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp +++ b/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp @@ -1052,12 +1052,13 @@ FX_WCHAR CPDF_CIDFont::GetUnicodeFromCharCode(FX_DWORD charcode) const { return 0; } return unicode; -#endif +#else if (m_pCMap->m_pEmbedMap) { return EmbeddedUnicodeFromCharcode(m_pCMap->m_pEmbedMap, m_pCMap->m_Charset, charcode); } return 0; +#endif } return m_pCID2UnicodeMap->UnicodeFromCID(CIDFromCharCode(charcode)); } diff --git a/core/fxcodec/jbig2/JBig2_GsidProc.cpp b/core/fxcodec/jbig2/JBig2_GsidProc.cpp index 92532d7238..f1a566a5db 100644 --- a/core/fxcodec/jbig2/JBig2_GsidProc.cpp +++ b/core/fxcodec/jbig2/JBig2_GsidProc.cpp @@ -96,10 +96,9 @@ FX_DWORD* CJBig2_GSIDProc::decode_MMR(CJBig2_BitStream* pStream, pGRD->Continue_decode(pPause); } if (!GSPLANES.get()[J]) { - for (int32_t K = GSBPP - 1; K > J; --K) { + for (int32_t K = GSBPP - 1; K > J; --K) delete GSPLANES.get()[K]; - return nullptr; - } + return nullptr; } pStream->alignByte(); pStream->offset(3); diff --git a/core/fxcrt/fx_basic_memmgr.cpp b/core/fxcrt/fx_basic_memmgr.cpp index a0af6aef6d..1cbd293006 100644 --- a/core/fxcrt/fx_basic_memmgr.cpp +++ b/core/fxcrt/fx_basic_memmgr.cpp @@ -21,5 +21,7 @@ void FXMEM_DefaultFree(void* pointer, int flags) { NEVER_INLINE void FX_OutOfMemoryTerminate() { // Termimate cleanly if we can, else crash at a specific address (0xbd). abort(); +#ifndef _WIN32 reinterpret_cast<void (*)()>(0xbd)(); +#endif } diff --git a/core/fxge/dib/fx_dib_convert.cpp b/core/fxge/dib/fx_dib_convert.cpp index 210e6f1e18..9335800f9b 100644 --- a/core/fxge/dib/fx_dib_convert.cpp +++ b/core/fxge/dib/fx_dib_convert.cpp @@ -949,7 +949,6 @@ FX_BOOL ConvertBuffer(FXDIB_Format dest_format, default: return FALSE; } - return FALSE; } CFX_DIBitmap* CFX_DIBSource::CloneConvert(FXDIB_Format dest_format, const FX_RECT* pClip, |