Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(92)

Unified Diff: src/ports/SkHarfBuzzFont.cpp

Issue 117053002: remove SK_SCALAR_IS_[FLOAT,FIXED] and assume floats (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years 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
Index: src/ports/SkHarfBuzzFont.cpp
diff --git a/src/ports/SkHarfBuzzFont.cpp b/src/ports/SkHarfBuzzFont.cpp
index 8f483f5d2f587d5a83c7f54c7a0bc5ba370d3ee8..95b9e445a013ab9a8ff953a490a583ebcbfe182c 100644
--- a/src/ports/SkHarfBuzzFont.cpp
+++ b/src/ports/SkHarfBuzzFont.cpp
@@ -14,12 +14,7 @@
// HB_Fixed is a 26.6 fixed point format.
static inline HB_Fixed SkScalarToHarfbuzzFixed(SkScalar value) {
-#ifdef SK_SCALAR_IS_FLOAT
return static_cast<HB_Fixed>(value * 64);
-#else
- // convert .16 to .6
- return value >> (16 - 6);
-#endif
}
static HB_Bool stringToGlyphs(HB_Font hbFont, const HB_UChar16* characters,
« src/core/SkCanvas.cpp ('K') | « src/pdf/SkPDFTypes.cpp ('k') | src/utils/SkCamera.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698