From 607d08b7db477ae11dbafff0bbebaa91f5c9fd7a Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 20 Aug 2012 13:55:09 +0000 Subject: Set LF property on a bunch of files. Review URL: http://codereview.appspot.com/6461094/ git-svn-id: http://skia.googlecode.com/svn/trunk@5168 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/core/SkPath.h | 4 +- tests/DrawTextTest.cpp | 230 ++++++++++++++++++++++++------------------------- 2 files changed, 117 insertions(+), 117 deletions(-) diff --git a/include/core/SkPath.h b/include/core/SkPath.h index fe983369a7..4f0ee7de6f 100644 --- a/include/core/SkPath.h +++ b/include/core/SkPath.h @@ -827,8 +827,8 @@ private: enum SerializationOffsets { kIsFinite_SerializationShift = 25, kIsOval_SerializationShift = 24, - kConvexity_SerializationShift = 16, - kFillType_SerializationShift = 8, + kConvexity_SerializationShift = 16, + kFillType_SerializationShift = 8, kSegmentMask_SerializationShift = 0 }; diff --git a/tests/DrawTextTest.cpp b/tests/DrawTextTest.cpp index aefe2f9fca..c5fa326bda 100644 --- a/tests/DrawTextTest.cpp +++ b/tests/DrawTextTest.cpp @@ -1,115 +1,115 @@ -/* - * Copyright 2011 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ -#include "SkTypes.h" - -#include "Test.h" -#include "SkBitmap.h" -#include "SkCanvas.h" -#include "SkColor.h" -#include "SkPaint.h" -#include "SkPoint.h" -#include "SkRect.h" - -/////////////////////////////////////////////////////////////////////////////// - -static const SkColor bgColor = SK_ColorWHITE; - -static void create(SkBitmap* bm, SkIRect bound, SkBitmap::Config config) { - bm->setConfig(config, bound.width(), bound.height()); - bm->allocPixels(); -} - -static void drawBG(SkCanvas* canvas) { - canvas->drawColor(bgColor); -} - -/** Assumes that the ref draw was completely inside ref canvas -- - implies that everything outside is "bgColor". - Checks that all overlap is the same and that all non-overlap on the - ref is "bgColor". - */ -static bool compare(const SkBitmap& ref, const SkIRect& iref, - const SkBitmap& test, const SkIRect& itest) -{ - const int xOff = itest.fLeft - iref.fLeft; - const int yOff = itest.fTop - iref.fTop; - - SkAutoLockPixels alpRef(ref); - SkAutoLockPixels alpTest(test); - - for (int y = 0; y < test.height(); ++y) { - for (int x = 0; x < test.width(); ++x) { - SkColor testColor = test.getColor(x, y); - int refX = x + xOff; - int refY = y + yOff; - SkColor refColor; - if (refX >= 0 && refX < ref.width() && - refY >= 0 && refY < ref.height()) - { - refColor = ref.getColor(refX, refY); - } else { - refColor = bgColor; - } - if (refColor != testColor) { - return false; - } - } - } - return true; -} - -static void test_drawText(skiatest::Reporter* reporter) { - - SkPaint paint; - paint.setColor(SK_ColorGRAY); - paint.setTextSize(SkIntToScalar(20)); - - SkIRect drawTextRect = SkIRect::MakeWH(64, 64); - SkBitmap drawTextBitmap; - create(&drawTextBitmap, drawTextRect, SkBitmap::kARGB_8888_Config); - SkCanvas drawTextCanvas(drawTextBitmap); - - SkIRect drawPosTextRect = SkIRect::MakeWH(64, 64); - SkBitmap drawPosTextBitmap; - create(&drawPosTextBitmap, drawPosTextRect, SkBitmap::kARGB_8888_Config); - SkCanvas drawPosTextCanvas(drawPosTextBitmap); - - for (float offsetY = 0.0f; offsetY < 1.0f; offsetY += (1.0f / 16.0f)) { - for (float offsetX = 0.0f; offsetX < 1.0f; offsetX += (1.0f / 16.0f)) { - SkPoint point = SkPoint::Make(SkFloatToScalar(25.0f + offsetX), - SkFloatToScalar(25.0f + offsetY)); - - for (int align = 0; align < SkPaint::kAlignCount; ++align) { - paint.setTextAlign(static_cast(align)); - - for (unsigned int flags = 0; flags < (1 << 3); ++flags) { - static const unsigned int antiAliasFlag = 1; - static const unsigned int subpixelFlag = 1 << 1; - static const unsigned int lcdFlag = 1 << 2; - - paint.setAntiAlias(SkToBool(flags & antiAliasFlag)); - paint.setSubpixelText(SkToBool(flags & subpixelFlag)); - paint.setLCDRenderText(SkToBool(flags & lcdFlag)); - - // Test: drawText and drawPosText draw the same. - drawBG(&drawTextCanvas); - drawTextCanvas.drawText("A", 1, point.fX, point.fY, paint); - - drawBG(&drawPosTextCanvas); - drawPosTextCanvas.drawPosText("A", 1, &point, paint); - - REPORTER_ASSERT(reporter, - compare(drawTextBitmap, drawTextRect, - drawPosTextBitmap, drawPosTextRect)); - } - } - } - } -} - -#include "TestClassDef.h" -DEFINE_TESTCLASS("DrawText_DrawPosText", DrawTextTestClass, test_drawText) +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ +#include "SkTypes.h" + +#include "Test.h" +#include "SkBitmap.h" +#include "SkCanvas.h" +#include "SkColor.h" +#include "SkPaint.h" +#include "SkPoint.h" +#include "SkRect.h" + +/////////////////////////////////////////////////////////////////////////////// + +static const SkColor bgColor = SK_ColorWHITE; + +static void create(SkBitmap* bm, SkIRect bound, SkBitmap::Config config) { + bm->setConfig(config, bound.width(), bound.height()); + bm->allocPixels(); +} + +static void drawBG(SkCanvas* canvas) { + canvas->drawColor(bgColor); +} + +/** Assumes that the ref draw was completely inside ref canvas -- + implies that everything outside is "bgColor". + Checks that all overlap is the same and that all non-overlap on the + ref is "bgColor". + */ +static bool compare(const SkBitmap& ref, const SkIRect& iref, + const SkBitmap& test, const SkIRect& itest) +{ + const int xOff = itest.fLeft - iref.fLeft; + const int yOff = itest.fTop - iref.fTop; + + SkAutoLockPixels alpRef(ref); + SkAutoLockPixels alpTest(test); + + for (int y = 0; y < test.height(); ++y) { + for (int x = 0; x < test.width(); ++x) { + SkColor testColor = test.getColor(x, y); + int refX = x + xOff; + int refY = y + yOff; + SkColor refColor; + if (refX >= 0 && refX < ref.width() && + refY >= 0 && refY < ref.height()) + { + refColor = ref.getColor(refX, refY); + } else { + refColor = bgColor; + } + if (refColor != testColor) { + return false; + } + } + } + return true; +} + +static void test_drawText(skiatest::Reporter* reporter) { + + SkPaint paint; + paint.setColor(SK_ColorGRAY); + paint.setTextSize(SkIntToScalar(20)); + + SkIRect drawTextRect = SkIRect::MakeWH(64, 64); + SkBitmap drawTextBitmap; + create(&drawTextBitmap, drawTextRect, SkBitmap::kARGB_8888_Config); + SkCanvas drawTextCanvas(drawTextBitmap); + + SkIRect drawPosTextRect = SkIRect::MakeWH(64, 64); + SkBitmap drawPosTextBitmap; + create(&drawPosTextBitmap, drawPosTextRect, SkBitmap::kARGB_8888_Config); + SkCanvas drawPosTextCanvas(drawPosTextBitmap); + + for (float offsetY = 0.0f; offsetY < 1.0f; offsetY += (1.0f / 16.0f)) { + for (float offsetX = 0.0f; offsetX < 1.0f; offsetX += (1.0f / 16.0f)) { + SkPoint point = SkPoint::Make(SkFloatToScalar(25.0f + offsetX), + SkFloatToScalar(25.0f + offsetY)); + + for (int align = 0; align < SkPaint::kAlignCount; ++align) { + paint.setTextAlign(static_cast(align)); + + for (unsigned int flags = 0; flags < (1 << 3); ++flags) { + static const unsigned int antiAliasFlag = 1; + static const unsigned int subpixelFlag = 1 << 1; + static const unsigned int lcdFlag = 1 << 2; + + paint.setAntiAlias(SkToBool(flags & antiAliasFlag)); + paint.setSubpixelText(SkToBool(flags & subpixelFlag)); + paint.setLCDRenderText(SkToBool(flags & lcdFlag)); + + // Test: drawText and drawPosText draw the same. + drawBG(&drawTextCanvas); + drawTextCanvas.drawText("A", 1, point.fX, point.fY, paint); + + drawBG(&drawPosTextCanvas); + drawPosTextCanvas.drawPosText("A", 1, &point, paint); + + REPORTER_ASSERT(reporter, + compare(drawTextBitmap, drawTextRect, + drawPosTextBitmap, drawPosTextRect)); + } + } + } + } +} + +#include "TestClassDef.h" +DEFINE_TESTCLASS("DrawText_DrawPosText", DrawTextTestClass, test_drawText) -- cgit v1.2.3