src/ports/SkFontHost_win_dw.cpp - Issue 85463005: remove SkFloatToScalar macro

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: src/ports/SkFontHost_win_dw.cpp

Issue 85463005: remove SkFloatToScalar macro (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: add failing test back Created 7 years, 1 month ago

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

Jump to:

Index: src/ports/SkFontHost_win_dw.cpp

diff --git a/src/ports/SkFontHost_win_dw.cpp b/src/ports/SkFontHost_win_dw.cpp

index a3d1d17104480cad6945b149f63345f771a884f5..89e85b73a021595cb752ea9802e76fcf35325630 100644

--- a/src/ports/SkFontHost_win_dw.cpp

+++ b/src/ports/SkFontHost_win_dw.cpp

@@ -1378,10 +1378,10 @@ void DWriteFontTypeface::onFilterRec(SkScalerContext::Rec* rec) const {

SkTScopedComPtr<IDWriteRenderingParams> defaultRenderingParams;

if (SUCCEEDED(factory->CreateRenderingParams(&defaultRenderingParams))) {

float gamma = defaultRenderingParams->GetGamma();

- rec->setDeviceGamma(SkFloatToScalar(gamma));

- rec->setPaintGamma(SkFloatToScalar(gamma));

+ rec->setDeviceGamma(gamma);

+ rec->setPaintGamma(gamma);

- rec->setContrast(SkFloatToScalar(defaultRenderingParams->GetEnhancedContrast()));

+ rec->setContrast(defaultRenderingParams->GetEnhancedContrast());

}

#endif