From 13cba49982ea3a4032dc78f2b61d7c1968d4b8eb Mon Sep 17 00:00:00 2001 From: halcanary Date: Wed, 3 Aug 2016 10:43:55 -0700 Subject: SkShaper: optionally disable harfbuzz also, re-enable warnings. motivation: used by me for PDF testing. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2201153002 Review-Url: https://codereview.chromium.org/2201153002 --- tools/using_skia_and_harfbuzz.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'tools/using_skia_and_harfbuzz.cpp') diff --git a/tools/using_skia_and_harfbuzz.cpp b/tools/using_skia_and_harfbuzz.cpp index 782103465e..f17a26d12b 100644 --- a/tools/using_skia_and_harfbuzz.cpp +++ b/tools/using_skia_and_harfbuzz.cpp @@ -134,7 +134,7 @@ public: glyph_paint.setColor(SK_ColorBLACK); glyph_paint.setFlags(SkPaint::kAntiAlias_Flag | SkPaint::kSubpixelText_Flag); - glyph_paint.setTextSize(config->font_size.value); + glyph_paint.setTextSize(SkDoubleToScalar(config->font_size.value)); } void WriteLine(const SkShaper& shaper, const char *text, size_t textBytes) { @@ -142,8 +142,9 @@ public: if (pageCanvas) { document->endPage(); } - pageCanvas = document->beginPage(config->page_width.value, - config->page_height.value); + pageCanvas = document->beginPage( + SkDoubleToScalar(config->page_width.value), + SkDoubleToScalar(config->page_height.value)); pageCanvas->drawPaint(white_paint); current_x = config->left_margin.value; current_y = config->line_spacing_ratio.value * config->font_size.value; @@ -151,8 +152,9 @@ public: SkTextBlobBuilder textBlobBuilder; shaper.shape(&textBlobBuilder, glyph_paint, text, textBytes, SkPoint{0, 0}); sk_sp blob(textBlobBuilder.build()); - pageCanvas->drawTextBlob(blob.get(), current_x, current_y, glyph_paint); - + pageCanvas->drawTextBlob( + blob.get(), SkDoubleToScalar(current_x), + SkDoubleToScalar(current_y), glyph_paint); // Advance to the next line. current_y += config->line_spacing_ratio.value * config->font_size.value; } -- cgit v1.2.3