From 57123944df5d7388036f70ef164a103b67dc9258 Mon Sep 17 00:00:00 2001 From: Oliver Chang Date: Fri, 29 Jan 2016 18:32:02 -0800 Subject: Merge to XFA: Some cleanup of fpdf_render_loadimage.cpp - Generalise GetBits8() - Get rid of C-style casts. - Make CFX_DIBSource::SetDownSampleSize() non const. It's only overriden once and called in one place and it doesn't make sense for it to be const. - Get rid of a macro - Make public member vars of CPDF_DIBSource private - And others... TBR=thestig@chromium.org Original Review URL: https://codereview.chromium.org/1644403003 . (cherry picked from commit 487935f662ba4711caf1c2c06873b676fd3fba3e) Review URL: https://codereview.chromium.org/1649243002 . --- core/include/fxge/fx_dib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/include/fxge') diff --git a/core/include/fxge/fx_dib.h b/core/include/fxge/fx_dib.h index f4f4fd2e6f..3043e7547c 100644 --- a/core/include/fxge/fx_dib.h +++ b/core/include/fxge/fx_dib.h @@ -192,7 +192,7 @@ class CFX_DIBSource { int clip_left, int clip_width) const = 0; - virtual void SetDownSampleSize(int width, int height) const {} + virtual void SetDownSampleSize(int width, int height) {} int GetBPP() const { return m_bpp; } -- cgit v1.2.3