core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp - Issue 1783023002: Re-enable MSVC warning 4800 for compiling with chromium_code

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp

Issue 1783023002: Re-enable MSVC warning 4800 for compiling with chromium_code (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« core/src/fpdfapi/fpdf_parser/cpdf_standard_security_handler.cpp ('K') | « core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp ('k') | core/src/fpdfdoc/doc_formfield.cpp » ('j') | core/src/fpdfdoc/doc_formfield.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp

diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp

index 6618a13709e53059c39e4a6417fc17ac361ab23e..f56b6cf7f918cfe011f06cc86a04806fe195ca66 100644

--- a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp

+++ b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp

@@ -632,9 +632,9 @@ int CPDF_DIBSource::CreateDecoder() {

ICodec_JpegModule* pJpegModule = CPDF_ModuleMgr::Get()->GetJpegModule();

if (pJpegModule->LoadInfo(src_data, src_size, m_Width, m_Height, comps,

bpc, bTransform)) {

- if (m_nComponents != comps) {

+ if (m_nComponents != static_cast<FX_DWORD>(comps)) {

FX_Free(m_pCompData);

- m_nComponents = comps;

+ m_nComponents = static_cast<FX_DWORD>(comps);

if (m_Family == PDFCS_LAB && m_nComponents != 3) {

m_pCompData = nullptr;

return 0;

@@ -1440,7 +1440,7 @@ void CPDF_DIBSource::DownSampleScanline32Bit(int orig_Bpp,

FX_BOOL bFlipX,

int clip_left,

int clip_width) const {

- int last_src_x = -1;

+ FX_DWORD last_src_x = src_width;

Tom Sepez 2016/03/11 00:30:28 Ok, took a moment for me to get this, maybe a comm

Wei Li 2016/03/11 04:11:36 Done.

FX_ARGB last_argb = FXARGB_MAKE(0xFF, 0xFF, 0xFF, 0xFF);

FX_FLOAT unit_To8Bpc = 255.0f / ((1 << m_bpc) - 1);

for (int i = 0; i < clip_width; i++) {