From 994d8b4e363bb86128593a9000a17b0e79f849f5 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 10 Aug 2018 20:03:34 +0000 Subject: Remove const args and const_casts where not required. Introduce const/non-const versions of method where required. Part of the war on const_cast<>. Tidy one expression to use [] instead of .data(). Change-Id: I41e45669c79eee242ff2244c7dc3afcf6386a433 Reviewed-on: https://pdfium-review.googlesource.com/39852 Reviewed-by: Lei Zhang Commit-Queue: Tom Sepez --- core/fxge/dib/cstretchengine.cpp | 7 ++++--- core/fxge/dib/cstretchengine.h | 8 +++++++- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'core/fxge') diff --git a/core/fxge/dib/cstretchengine.cpp b/core/fxge/dib/cstretchengine.cpp index 9d3923adab..ad9a356f34 100644 --- a/core/fxge/dib/cstretchengine.cpp +++ b/core/fxge/dib/cstretchengine.cpp @@ -206,10 +206,11 @@ bool CStretchEngine::CWeightTable::Calc(int dest_len, return true; } -PixelWeight* CStretchEngine::CWeightTable::GetPixelWeight(int pixel) const { +const PixelWeight* CStretchEngine::CWeightTable::GetPixelWeight( + int pixel) const { ASSERT(pixel >= m_DestMin); - return reinterpret_cast(const_cast( - m_WeightTables.data() + (pixel - m_DestMin) * m_ItemSize)); + return reinterpret_cast( + &m_WeightTables[(pixel - m_DestMin) * m_ItemSize]); } int* CStretchEngine::CWeightTable::GetValueFromPixelWeight(PixelWeight* pWeight, diff --git a/core/fxge/dib/cstretchengine.h b/core/fxge/dib/cstretchengine.h index fa298f5376..c9f11d6006 100644 --- a/core/fxge/dib/cstretchengine.h +++ b/core/fxge/dib/cstretchengine.h @@ -46,7 +46,13 @@ class CStretchEngine { int src_min, int src_max, int flags); - PixelWeight* GetPixelWeight(int pixel) const; + + const PixelWeight* GetPixelWeight(int pixel) const; + PixelWeight* GetPixelWeight(int pixel) { + return const_cast( + static_cast(this)->GetPixelWeight(pixel)); + } + int* GetValueFromPixelWeight(PixelWeight* pWeight, int index) const; size_t GetPixelWeightSize() const; -- cgit v1.2.3