diff options
101 files changed, 442 insertions, 437 deletions
diff --git a/bench/AAClipBench.cpp b/bench/AAClipBench.cpp index dfdae8e809..dfafe97671 100644 --- a/bench/AAClipBench.cpp +++ b/bench/AAClipBench.cpp @@ -32,8 +32,8 @@ public: doPath ? "path" : "rect", doAA ? "AA" : "BW"); - fClipRect.set(SkFloatToScalar(10.5f), SkFloatToScalar(10.5f), - SkFloatToScalar(50.5f), SkFloatToScalar(50.5f)); + fClipRect.set(10.5f, 10.5f, + 50.5f, 50.5f); fClipPath.addRoundRect(fClipRect, SkIntToScalar(10), SkIntToScalar(10)); fDrawRect.set(SkIntToScalar(0), SkIntToScalar(0), SkIntToScalar(100), SkIntToScalar(100)); diff --git a/bench/BicubicBench.cpp b/bench/BicubicBench.cpp index d0e48f653a..d1f4a4de72 100644 --- a/bench/BicubicBench.cpp +++ b/bench/BicubicBench.cpp @@ -20,7 +20,7 @@ class BicubicBench : public SkBenchmark { public: BicubicBench(float x, float y) - : fScale(SkSize::Make(SkFloatToScalar(x), SkFloatToScalar(y))) { + : fScale(SkSize::Make(x, y)) { fName.printf("bicubic_%gx%g", SkScalarToFloat(fScale.fWidth), SkScalarToFloat(fScale.fHeight)); } diff --git a/bench/BlurBench.cpp b/bench/BlurBench.cpp index 77fbc49b11..49a6297c54 100644 --- a/bench/BlurBench.cpp +++ b/bench/BlurBench.cpp @@ -15,9 +15,9 @@ #include "SkBlurMaskFilter.h" #define SMALL SkIntToScalar(2) -#define REAL SkFloatToScalar(1.5f) +#define REAL 1.5f #define BIG SkIntToScalar(10) -#define REALBIG SkFloatToScalar(100.5f) +#define REALBIG 100.5f static const char* gStyleName[] = { "normal", diff --git a/bench/BlurImageFilterBench.cpp b/bench/BlurImageFilterBench.cpp index dc3edb03d7..1c4d4bf361 100644 --- a/bench/BlurImageFilterBench.cpp +++ b/bench/BlurImageFilterBench.cpp @@ -18,8 +18,8 @@ #define FILTER_HEIGHT_SMALL 32 #define FILTER_WIDTH_LARGE 256 #define FILTER_HEIGHT_LARGE 256 -#define BLUR_SIGMA_SMALL SkFloatToScalar(1.0f) -#define BLUR_SIGMA_LARGE SkFloatToScalar(10.0f) +#define BLUR_SIGMA_SMALL 1.0f +#define BLUR_SIGMA_LARGE 10.0f class BlurImageFilterBench : public SkBenchmark { public: diff --git a/bench/BlurRectBench.cpp b/bench/BlurRectBench.cpp index 8161d0768c..e2528afc7f 100644 --- a/bench/BlurRectBench.cpp +++ b/bench/BlurRectBench.cpp @@ -14,11 +14,11 @@ #include "SkBlurMask.h" #define SMALL SkIntToScalar(2) -#define REAL SkFloatToScalar(1.5f) +#define REAL 1.5f static const SkScalar kMedium = SkIntToScalar(5); #define BIG SkIntToScalar(10) static const SkScalar kMedBig = SkIntToScalar(20); -#define REALBIG SkFloatToScalar(30.5f) +#define REALBIG 30.5f class BlurRectBench: public SkBenchmark { int fLoopCount; diff --git a/bench/ColorFilterBench.cpp b/bench/ColorFilterBench.cpp index 6d98a0eabc..ad27f15806 100644 --- a/bench/ColorFilterBench.cpp +++ b/bench/ColorFilterBench.cpp @@ -28,7 +28,7 @@ protected: } static SkImageFilter* make_brightness(float amount, SkImageFilter* input = NULL) { - SkScalar amount255 = SkScalarMul(SkFloatToScalar(amount), SkIntToScalar(255)); + SkScalar amount255 = SkScalarMul(amount, SkIntToScalar(255)); SkScalar matrix[20] = { 1, 0, 0, 0, amount255, 0, 1, 0, 0, amount255, 0, 0, 1, 0, amount255, @@ -40,10 +40,10 @@ protected: static SkImageFilter* make_grayscale(SkImageFilter* input = NULL) { SkScalar matrix[20]; memset(matrix, 0, 20 * sizeof(SkScalar)); - matrix[0] = matrix[5] = matrix[10] = SkFloatToScalar(0.2126f); - matrix[1] = matrix[6] = matrix[11] = SkFloatToScalar(0.7152f); - matrix[2] = matrix[7] = matrix[12] = SkFloatToScalar(0.0722f); - matrix[18] = SkFloatToScalar(1.0f); + matrix[0] = matrix[5] = matrix[10] = 0.2126f; + matrix[1] = matrix[6] = matrix[11] = 0.7152f; + matrix[2] = matrix[7] = matrix[12] = 0.0722f; + matrix[18] = 1.0f; SkAutoTUnref<SkColorFilter> filter(new SkColorMatrixFilter(matrix)); return SkColorFilterImageFilter::Create(filter, input); } diff --git a/bench/MatrixBench.cpp b/bench/MatrixBench.cpp index c2d68b5b85..4b8cf0223e 100644 --- a/bench/MatrixBench.cpp +++ b/bench/MatrixBench.cpp @@ -74,7 +74,7 @@ private: class ScaleMatrixBench : public MatrixBench { public: ScaleMatrixBench() : INHERITED("scale") { - fSX = fSY = SkFloatToScalar(1.5f); + fSX = fSY = 1.5f; fM0.reset(); fM1.setScale(fSX, fSY); fM2.setTranslate(fSX, fSY); @@ -383,17 +383,17 @@ public: fMatrix.reset(); fIteration = 0; if (flags & kScale_Flag) { - fMatrix.postScale(SkFloatToScalar(1.5f), SkFloatToScalar(2.5f)); + fMatrix.postScale(1.5f, 2.5f); } if (flags & kTranslate_Flag) { - fMatrix.postTranslate(SkFloatToScalar(1.5f), SkFloatToScalar(2.5f)); + fMatrix.postTranslate(1.5f, 2.5f); } if (flags & kRotate_Flag) { - fMatrix.postRotate(SkFloatToScalar(45.0f)); + fMatrix.postRotate(45.0f); } if (flags & kPerspective_Flag) { - fMatrix.setPerspX(SkFloatToScalar(1.5f)); - fMatrix.setPerspY(SkFloatToScalar(2.5f)); + fMatrix.setPerspX(1.5f); + fMatrix.setPerspY(2.5f); } if (0 == (flags & kUncachedTypeMask_Flag)) { fMatrix.getType(); diff --git a/bench/MatrixConvolutionBench.cpp b/bench/MatrixConvolutionBench.cpp index 0ef32fd3be..5e3e201a20 100644 --- a/bench/MatrixConvolutionBench.cpp +++ b/bench/MatrixConvolutionBench.cpp @@ -21,7 +21,7 @@ public: SkIntToScalar( 1), SkIntToScalar(-7), SkIntToScalar( 1), SkIntToScalar( 1), SkIntToScalar( 1), SkIntToScalar( 1), }; - SkScalar gain = SkFloatToScalar(0.3f), bias = SkIntToScalar(100); + SkScalar gain = 0.3f, bias = SkIntToScalar(100); SkIPoint target = SkIPoint::Make(1, 1); fFilter = new SkMatrixConvolutionImageFilter(kernelSize, kernel, gain, bias, target, tileMode, convolveAlpha); } diff --git a/bench/MorphologyBench.cpp b/bench/MorphologyBench.cpp index c670eb2d9f..956cbbee30 100644 --- a/bench/MorphologyBench.cpp +++ b/bench/MorphologyBench.cpp @@ -14,7 +14,7 @@ #include "SkMorphologyImageFilter.h" #define SMALL SkIntToScalar(2) -#define REAL SkFloatToScalar(1.5f) +#define REAL 1.5f #define BIG SkIntToScalar(10) enum MorphologyType { diff --git a/bench/RectBench.cpp b/bench/RectBench.cpp index 2937e5dafe..200fb0d330 100644 --- a/bench/RectBench.cpp +++ b/bench/RectBench.cpp @@ -186,7 +186,7 @@ protected: } virtual void onDraw(SkCanvas* canvas) { - static const SkScalar kHalfRectSize = SkFloatToScalar(0.75f); + static const SkScalar kHalfRectSize = 0.75f; SkPaint paint; this->setupPaint(&paint); diff --git a/experimental/DrawingBoard/SampleDrawingClient.cpp b/experimental/DrawingBoard/SampleDrawingClient.cpp index b86c8c1473..542c589030 100644 --- a/experimental/DrawingBoard/SampleDrawingClient.cpp +++ b/experimental/DrawingBoard/SampleDrawingClient.cpp @@ -44,7 +44,7 @@ public: fPalette->setVisibleP(true); this->attachChildToFront(fPalette); fPalette->unref(); - fBrushSize = SkFloatToScalar(2.5); + fBrushSize = 2.5; fAA = false; fPaletteVisible = true; fSync = true; diff --git a/experimental/PdfViewer/src/SkPdfRenderer.cpp b/experimental/PdfViewer/src/SkPdfRenderer.cpp index 108f936b68..3adb61c146 100644 --- a/experimental/PdfViewer/src/SkPdfRenderer.cpp +++ b/experimental/PdfViewer/src/SkPdfRenderer.cpp @@ -490,7 +490,7 @@ static SkPdfResult DrawText(SkPdfContext* pdfContext, // TODO(edisonn): implement font scaler // if (fCurFont && fCurFont->GetFontScale() != 0) { -// paint.setTextScaleX(SkFloatToScalar(fCurFont->GetFontScale() / 100.0)); +// paint.setTextScaleX(fCurFont->GetFontScale() / 100.0); // } pdfContext->fGraphicsState.applyGraphicsState(&paint, false); diff --git a/gm/blurrect.cpp b/gm/blurrect.cpp index 5e31a1ca74..6b50fe1a13 100644 --- a/gm/blurrect.cpp +++ b/gm/blurrect.cpp @@ -309,8 +309,8 @@ DEF_GM(return new BlurRectGM("blurrect", NULL, 0xFF, SkBlurMaskFilter::kSolid_Bl DEF_GM(return new BlurRectGM("blurrect", NULL, 0xFF, SkBlurMaskFilter::kOuter_BlurStyle);) DEF_GM(return new BlurRectGM("blurrect", NULL, 0xFF, SkBlurMaskFilter::kInner_BlurStyle);) -static const SkScalar kBig = SkFloatToScalar(20); -static const SkScalar kSmall = SkFloatToScalar(2); +static const SkScalar kBig = 20; +static const SkScalar kSmall = 2; // regular size rects, blurs should be small enough not to completely overlap. diff --git a/gm/blurroundrect.cpp b/gm/blurroundrect.cpp index f5a7d214a4..6a466c9c87 100644 --- a/gm/blurroundrect.cpp +++ b/gm/blurroundrect.cpp @@ -111,7 +111,7 @@ protected: } virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { - canvas->scale(SkFloatToScalar(1.5f), SkFloatToScalar(1.5f)); + canvas->scale(1.5f, 1.5f); const int blurRadii[] = { 1, 3, 6, 10 }; const int cornerRadii[] = { 1, 3, 6, 10 }; diff --git a/gm/colorfilterimagefilter.cpp b/gm/colorfilterimagefilter.cpp index 6323d33f6d..3227dfba17 100644 --- a/gm/colorfilterimagefilter.cpp +++ b/gm/colorfilterimagefilter.cpp @@ -23,7 +23,7 @@ static SkImageFilter* make_blur(float amount, SkImageFilter* input = NULL) { } static SkImageFilter* make_brightness(float amount, SkImageFilter* input = NULL) { - SkScalar amount255 = SkScalarMul(SkFloatToScalar(amount), SkIntToScalar(255)); + SkScalar amount255 = SkScalarMul(amount, SkIntToScalar(255)); SkScalar matrix[20] = { 1, 0, 0, 0, amount255, 0, 1, 0, 0, amount255, 0, 0, 1, 0, amount255, @@ -35,10 +35,10 @@ static SkImageFilter* make_brightness(float amount, SkImageFilter* input = NULL) static SkImageFilter* make_grayscale(SkImageFilter* input = NULL) { SkScalar matrix[20]; memset(matrix, 0, 20 * sizeof(SkScalar)); - matrix[0] = matrix[5] = matrix[10] = SkFloatToScalar(0.2126f); - matrix[1] = matrix[6] = matrix[11] = SkFloatToScalar(0.7152f); - matrix[2] = matrix[7] = matrix[12] = SkFloatToScalar(0.0722f); - matrix[18] = SkFloatToScalar(1.0f); + matrix[0] = matrix[5] = matrix[10] = 0.2126f; + matrix[1] = matrix[6] = matrix[11] = 0.7152f; + matrix[2] = matrix[7] = matrix[12] = 0.0722f; + matrix[18] = 1.0f; SkAutoTUnref<SkColorFilter> filter(new SkColorMatrixFilter(matrix)); return SkColorFilterImageFilter::Create(filter, input); } @@ -62,7 +62,7 @@ protected: void drawClippedRect(SkCanvas* canvas, const SkRect& r, const SkPaint& paint, float outset = 0.0f) { canvas->save(); SkRect clip(r); - clip.outset(SkFloatToScalar(outset), SkFloatToScalar(outset)); + clip.outset(outset, outset); canvas->clipRect(clip); canvas->drawRect(r, paint); canvas->restore(); diff --git a/gm/colormatrix.cpp b/gm/colormatrix.cpp index 16086f0346..9ab6563040 100644 --- a/gm/colormatrix.cpp +++ b/gm/colormatrix.cpp @@ -122,19 +122,19 @@ protected: setColorMatrix(&paint, matrix); canvas->drawBitmap(bmps[i], 240, 0, &paint); - matrix.setSaturation(SkFloatToScalar(0.0f)); + matrix.setSaturation(0.0f); setColorMatrix(&paint, matrix); canvas->drawBitmap(bmps[i], 0, 80, &paint); - matrix.setSaturation(SkFloatToScalar(0.5f)); + matrix.setSaturation(0.5f); setColorMatrix(&paint, matrix); canvas->drawBitmap(bmps[i], 80, 80, &paint); - matrix.setSaturation(SkFloatToScalar(1.0f)); + matrix.setSaturation(1.0f); setColorMatrix(&paint, matrix); canvas->drawBitmap(bmps[i], 160, 80, &paint); - matrix.setSaturation(SkFloatToScalar(2.0f)); + matrix.setSaturation(2.0f); setColorMatrix(&paint, matrix); canvas->drawBitmap(bmps[i], 240, 80, &paint); diff --git a/gm/complexclip.cpp b/gm/complexclip.cpp index 86386b3d49..8ff1dfafd9 100644 --- a/gm/complexclip.cpp +++ b/gm/complexclip.cpp @@ -100,10 +100,10 @@ protected: // device boundaries so we need to "undo" the effect of the // scale and translate SkRect bounds = SkRect::MakeLTRB( - SkFloatToScalar(4.0f/3.0f * -20), - SkFloatToScalar(4.0f/3.0f * -20), - SkFloatToScalar(4.0f/3.0f * (this->getISize().fWidth - 20)), - SkFloatToScalar(4.0f/3.0f * (this->getISize().fHeight - 20))); + 4.0f/3.0f * -20, + 4.0f/3.0f * -20, + 4.0f/3.0f * (this->getISize().fWidth - 20), + 4.0f/3.0f * (this->getISize().fHeight - 20)); bounds.inset(SkIntToScalar(100), SkIntToScalar(100)); SkPaint boundPaint; diff --git a/gm/complexclip2.cpp b/gm/complexclip2.cpp index f936ab1c0a..0e8e0bc116 100644 --- a/gm/complexclip2.cpp +++ b/gm/complexclip2.cpp @@ -21,19 +21,19 @@ public: this->setBGColor(SkColorSetRGB(0xDD,0xA0,0xDD)); // offset the rects a bit so we get antialiasing even in the rect case - SkScalar xA = SkFloatToScalar(0.65f); - SkScalar xB = SkFloatToScalar(10.65f); - SkScalar xC = SkFloatToScalar(20.65f); - SkScalar xD = SkFloatToScalar(30.65f); - SkScalar xE = SkFloatToScalar(40.65f); - SkScalar xF = SkFloatToScalar(50.65f); - - SkScalar yA = SkFloatToScalar(0.65f); - SkScalar yB = SkFloatToScalar(10.65f); - SkScalar yC = SkFloatToScalar(20.65f); - SkScalar yD = SkFloatToScalar(30.65f); - SkScalar yE = SkFloatToScalar(40.65f); - SkScalar yF = SkFloatToScalar(50.65f); + SkScalar xA = 0.65f; + SkScalar xB = 10.65f; + SkScalar xC = 20.65f; + SkScalar xD = 30.65f; + SkScalar xE = 40.65f; + SkScalar xF = 50.65f; + + SkScalar yA = 0.65f; + SkScalar yB = 10.65f; + SkScalar yC = 20.65f; + SkScalar yD = 30.65f; + SkScalar yE = 40.65f; + SkScalar yF = 50.65f; fWidth = xF - xA; fHeight = yF - yA; diff --git a/gm/convexpaths.cpp b/gm/convexpaths.cpp index b1b2696bf8..8eb4cba49d 100644 --- a/gm/convexpaths.cpp +++ b/gm/convexpaths.cpp @@ -176,11 +176,11 @@ protected: 30 * SK_Scalar1, 0); // triangle where one edge is a degenerate quad - fPaths.push_back().moveTo(SkFloatToScalar(8.59375f), 45 * SK_Scalar1); - fPaths.back().quadTo(SkFloatToScalar(16.9921875f), 45 * SK_Scalar1, - SkFloatToScalar(31.25f), 45 * SK_Scalar1); + fPaths.push_back().moveTo(8.59375f, 45 * SK_Scalar1); + fPaths.back().quadTo(16.9921875f, 45 * SK_Scalar1, + 31.25f, 45 * SK_Scalar1); fPaths.back().lineTo(100 * SK_Scalar1, 100 * SK_Scalar1); - fPaths.back().lineTo(SkFloatToScalar(8.59375f), 45 * SK_Scalar1); + fPaths.back().lineTo(8.59375f, 45 * SK_Scalar1); // triangle where one edge is a quad with a repeated point fPaths.push_back().moveTo(0, 25 * SK_Scalar1); @@ -197,14 +197,14 @@ protected: // triangle where one edge is a quad with a nearly repeated point fPaths.push_back().moveTo(0, 25 * SK_Scalar1); fPaths.back().lineTo(50 * SK_Scalar1, 0); - fPaths.back().quadTo(50 * SK_Scalar1, SkFloatToScalar(49.95f), + fPaths.back().quadTo(50 * SK_Scalar1, 49.95f, 50 * SK_Scalar1, 50 * SK_Scalar1); // triangle where one edge is a cubic with a 3x nearly repeated point fPaths.push_back().moveTo(0, 25 * SK_Scalar1); fPaths.back().lineTo(50 * SK_Scalar1, 0); - fPaths.back().cubicTo(50 * SK_Scalar1, SkFloatToScalar(49.95f), - 50 * SK_Scalar1, SkFloatToScalar(49.97f), + fPaths.back().cubicTo(50 * SK_Scalar1, 49.95f, + 50 * SK_Scalar1, 49.97f, 50 * SK_Scalar1, 50 * SK_Scalar1); // triangle where there is a point degenerate cubic at one corner @@ -253,7 +253,7 @@ protected: // small circle. This is listed last so that it has device coords far // from the origin (small area relative to x,y values). - fPaths.push_back().addCircle(0, 0, SkFloatToScalar(1.2f)); + fPaths.push_back().addCircle(0, 0, 1.2f); } virtual void onDraw(SkCanvas* canvas) { diff --git a/gm/dashing.cpp b/gm/dashing.cpp index bbd0b65c20..fa88e9e0ab 100644 --- a/gm/dashing.cpp +++ b/gm/dashing.cpp @@ -263,7 +263,7 @@ protected: // 1on/1off 3x3 squares with phase of 1.5 - rects fast path canvas->save(); canvas->translate(112, 110); - this->drawDashedLines(canvas, 100, SkFloatToScalar(1.5f), SkIntToScalar(3), 3, false); + this->drawDashedLines(canvas, 100, 1.5f, SkIntToScalar(3), 3, false); canvas->restore(); // 1on/1off 1x1 circles with phase of 1 - no fast path yet diff --git a/gm/gradient_matrix.cpp b/gm/gradient_matrix.cpp index 508b3eb919..d1d0e42d6e 100644 --- a/gm/gradient_matrix.cpp +++ b/gm/gradient_matrix.cpp @@ -24,7 +24,7 @@ static const SkColor gColors[] = { }; // These annoying defines are necessary, because the only other alternative -// is to use SkIntToScalar(...) or SkFloatToScalar(...) everywhere. +// is to use SkIntToScalar(...) everywhere. static const SkScalar sZero = 0; static const SkScalar sHalf = SK_ScalarHalf; static const SkScalar sOne = SK_Scalar1; diff --git a/gm/gradients.cpp b/gm/gradients.cpp index 8208d62240..d4617bc813 100644 --- a/gm/gradients.cpp +++ b/gm/gradients.cpp @@ -262,7 +262,7 @@ protected: this->drawBG(canvas); SkColor colors[] = { SK_ColorRED, SK_ColorGREEN, SK_ColorGREEN, SK_ColorRED }; - SkScalar pos[] = { 0, SkFloatToScalar(0.01f), SkFloatToScalar(0.99f), SK_Scalar1 }; + SkScalar pos[] = { 0, 0.01f, 0.99f, SK_Scalar1 }; SkPoint c0; c0.iset(-80, 25); SkScalar r0 = SkIntToScalar(70); @@ -343,9 +343,9 @@ protected: center.set(SkIntToScalar(dim.width())/2, SkIntToScalar(dim.height())/2); SkScalar radius = SkIntToScalar(dim.width())/2; const SkColor colors[] = { 0x7f7f7f7f, 0x7f7f7f7f, 0xb2000000 }; - const SkScalar pos[] = { SkFloatToScalar(0.0f), - SkFloatToScalar(0.35f), - SkFloatToScalar(1.0f) }; + const SkScalar pos[] = { 0.0f, + 0.35f, + 1.0f }; SkShader* shader = SkGradientShader::CreateRadial(center, radius, colors, pos, SK_ARRAY_COUNT(pos), diff --git a/gm/hairlines.cpp b/gm/hairlines.cpp index d0f141ba91..fb99d238ea 100644 --- a/gm/hairlines.cpp +++ b/gm/hairlines.cpp @@ -95,13 +95,13 @@ protected: { SkPath* problem2 = &fPaths.push_back(); problem2->moveTo(SkIntToScalar(5), SkIntToScalar(1)); - problem2->lineTo(SkFloatToScalar(4.32787323f), SkFloatToScalar(1.67212653f)); - problem2->cubicTo(SkFloatToScalar(2.75223875f), SkFloatToScalar(3.24776125f), - SkFloatToScalar(3.00581908f), SkFloatToScalar(4.51236057f), - SkFloatToScalar(3.7580452f), SkFloatToScalar(4.37367964f)); - problem2->cubicTo(SkFloatToScalar(4.66472578f), SkFloatToScalar(3.888381f), - SkFloatToScalar(5.f), SkFloatToScalar(2.875f), - SkFloatToScalar(5.f), SkFloatToScalar(1.f)); + problem2->lineTo(4.32787323f, 1.67212653f); + problem2->cubicTo(2.75223875f, 3.24776125f, + 3.00581908f, 4.51236057f, + 3.7580452f, 4.37367964f); + problem2->cubicTo(4.66472578f, 3.888381f, + 5.f, 2.875f, + 5.f, 1.f); problem2->close(); } @@ -137,8 +137,8 @@ protected: { // Arc example to test imperfect truncation bug (crbug.com/295626) static const SkScalar kRad = SkIntToScalar(2000); - static const SkScalar kStartAngle = SkFloatToScalar(262.59717f); - static const SkScalar kSweepAngle = SkScalarHalf(SkFloatToScalar(17.188717f)); + static const SkScalar kStartAngle = 262.59717f; + static const SkScalar kSweepAngle = SkScalarHalf(17.188717f); SkPath* bug = &fPaths.push_back(); diff --git a/gm/imagefiltersgraph.cpp b/gm/imagefiltersgraph.cpp index 4e46869a4e..3de07993f8 100644 --- a/gm/imagefiltersgraph.cpp +++ b/gm/imagefiltersgraph.cpp @@ -140,7 +140,7 @@ protected: SkScalar matrix[20] = { SK_Scalar1, 0, 0, 0, 0, 0, SK_Scalar1, 0, 0, 0, 0, 0, SK_Scalar1, 0, 0, - 0, 0, 0, SkFloatToScalar(0.5f), 0 }; + 0, 0, 0, 0.5f, 0 }; SkAutoTUnref<SkColorFilter> matrixFilter(new SkColorMatrixFilter(matrix)); SkAutoTUnref<SkImageFilter> colorMorph(SkColorFilterImageFilter::Create(matrixFilter, morph)); @@ -156,7 +156,7 @@ protected: SkScalar matrix[20] = { SK_Scalar1, 0, 0, 0, 0, 0, SK_Scalar1, 0, 0, 0, 0, 0, SK_Scalar1, 0, 0, - 0, 0, 0, SkFloatToScalar(0.5f), 0 }; + 0, 0, 0, 0.5f, 0 }; SkColorMatrixFilter matrixCF(matrix); SkAutoTUnref<SkImageFilter> matrixFilter(SkColorFilterImageFilter::Create(&matrixCF)); SimpleOffsetFilter offsetFilter(SkIntToScalar(10), SkIntToScalar(10), matrixFilter); diff --git a/gm/matrixconvolution.cpp b/gm/matrixconvolution.cpp index 1863a7f597..932d997411 100644 --- a/gm/matrixconvolution.cpp +++ b/gm/matrixconvolution.cpp @@ -56,7 +56,7 @@ protected: SkIntToScalar( 1), SkIntToScalar( 1), SkIntToScalar( 1), }; SkISize kernelSize = SkISize::Make(3, 3); - SkScalar gain = SkFloatToScalar(0.3f), bias = SkIntToScalar(100); + SkScalar gain = 0.3f, bias = SkIntToScalar(100); SkPaint paint; SkAutoTUnref<SkImageFilter> filter( SkNEW_ARGS(SkMatrixConvolutionImageFilter, (kernelSize, diff --git a/gm/ovals.cpp b/gm/ovals.cpp index 96e04885e3..53ccb16ee9 100755 --- a/gm/ovals.cpp +++ b/gm/ovals.cpp @@ -127,9 +127,9 @@ protected: SkColor genColor(SkRandom* rand) { SkScalar hsv[3]; - hsv[0] = SkFloatToScalar(rand->nextRangeF(0.0f, 360.0f)); - hsv[1] = SkFloatToScalar(rand->nextRangeF(0.75f, 1.0f)); - hsv[2] = SkFloatToScalar(rand->nextRangeF(0.75f, 1.0f)); + hsv[0] = rand->nextRangeF(0.0f, 360.0f); + hsv[1] = rand->nextRangeF(0.75f, 1.0f); + hsv[2] = rand->nextRangeF(0.75f, 1.0f); return SkHSVToColor(hsv); } diff --git a/gm/perlinnoise.cpp b/gm/perlinnoise.cpp index 098c690ec9..164c0213cd 100644 --- a/gm/perlinnoise.cpp +++ b/gm/perlinnoise.cpp @@ -72,7 +72,7 @@ protected: test(canvas, 100, 300, SkPerlinNoiseShader::kFractalNoise_Type, 0.1f, 0.1f, 3, 4, false); - canvas->scale(SkFloatToScalar(0.75f), SkFloatToScalar(1.0f)); + canvas->scale(0.75f, 1.0f); test(canvas, 0, 400, SkPerlinNoiseShader::kFractalNoise_Type, 0.1f, 0.1f, 2, 0, false); diff --git a/gm/roundrects.cpp b/gm/roundrects.cpp index 3f1c49ebdd..7f5b9eaf08 100644 --- a/gm/roundrects.cpp +++ b/gm/roundrects.cpp @@ -128,9 +128,9 @@ protected: SkColor genColor(SkRandom* rand) { SkScalar hsv[3]; - hsv[0] = SkFloatToScalar(rand->nextRangeF(0.0f, 360.0f)); - hsv[1] = SkFloatToScalar(rand->nextRangeF(0.75f, 1.0f)); - hsv[2] = SkFloatToScalar(rand->nextRangeF(0.75f, 1.0f)); + hsv[0] = rand->nextRangeF(0.0f, 360.0f); + hsv[1] = rand->nextRangeF(0.75f, 1.0f); + hsv[2] = rand->nextRangeF(0.75f, 1.0f); return SkHSVToColor(hsv); } diff --git a/gm/shaderbounds.cpp b/gm/shaderbounds.cpp index 9529151c5f..ef9a7e9015 100644 --- a/gm/shaderbounds.cpp +++ b/gm/shaderbounds.cpp @@ -41,7 +41,7 @@ protected: virtual SkMatrix onGetInitialTransform() const SK_OVERRIDE { SkMatrix result; - SkScalar scale = SkFloatToScalar(0.8f); + SkScalar scale = 0.8f; result.setScale(scale, scale); result.postTranslate(SkIntToScalar(7), SkIntToScalar(23)); return result; @@ -54,7 +54,7 @@ protected: SkIntToScalar(240))); SkMatrix canvasScale; - SkScalar scale = SkFloatToScalar(0.7f); + SkScalar scale = 0.7f; canvasScale.setScale(scale, scale); canvas->concat(canvasScale); @@ -74,9 +74,9 @@ protected: } SkShader* MakeShader(int width, int height, bool background) { - SkScalar scale = SkFloatToScalar(0.5f); + SkScalar scale = 0.5f; if (background) { - scale = SkFloatToScalar(0.6f); + scale = 0.6f; } SkScalar shaderWidth = SkScalarDiv(SkIntToScalar(width), scale); SkScalar shaderHeight = SkScalarDiv(SkIntToScalar(height), scale); diff --git a/gm/simpleaaclip.cpp b/gm/simpleaaclip.cpp index 885226b6ef..e8946b446c 100644 --- a/gm/simpleaaclip.cpp +++ b/gm/simpleaaclip.cpp @@ -53,10 +53,10 @@ public: : fGeomType(geomType) { // offset the rects a bit so we get anti-aliasing in the rect case - fBase.set(SkFloatToScalar(100.65f), - SkFloatToScalar(100.65f), - SkFloatToScalar(150.65f), - SkFloatToScalar(150.65f)); + fBase.set(100.65f, + 100.65f, + 150.65f, + 150.65f); fRect = fBase; fRect.inset(5, 5); fRect.offset(25, 25); diff --git a/gyp/common.gypi b/gyp/common.gypi index aaf741d1aa..d55b7cc57c 100644 --- a/gyp/common.gypi +++ b/gyp/common.gypi @@ -14,6 +14,7 @@ 'defines': [ 'SK_GAMMA_SRGB', 'SK_GAMMA_APPLY_TO_A8', + 'SK_SCALAR_TO_FLOAT_EXCLUDED', # temporary to allow Chrome to call SkFloatToScalar ], # Validate the 'skia_os' setting against 'OS', because only certain diff --git a/include/core/SkDocument.h b/include/core/SkDocument.h index 83b4e7a3ee..dbf4bc5957 100644 --- a/include/core/SkDocument.h +++ b/include/core/SkDocument.h @@ -18,7 +18,7 @@ class SkWStream; /** SK_ScalarDefaultDPI is 72 DPI. */ -#define SK_ScalarDefaultRasterDPI SkFloatToScalar(72.0f) +#define SK_ScalarDefaultRasterDPI 72.0f /** * High-level API for creating a document-based canvas. To use.. diff --git a/include/core/SkScalar.h b/include/core/SkScalar.h index 2dd7a6283f..cc1cf99ac8 100644 --- a/include/core/SkScalar.h +++ b/include/core/SkScalar.h @@ -78,7 +78,9 @@ #define SkScalarToFixed(x) SkFloatToFixed(x) #define SkScalarToFloat(n) (n) +#ifndef SK_SCALAR_TO_FLOAT_EXCLUDED #define SkFloatToScalar(n) (n) +#endif #define SkScalarToDouble(n) (double)(n) #define SkDoubleToScalar(n) (float)(n) @@ -198,7 +200,9 @@ #define SkFixedToScalar(x) (x) #define SkScalarToFixed(x) (x) #define SkScalarToFloat(n) SkFixedToFloat(n) +#ifndef SK_SCALAR_TO_FLOAT_EXCLUDED #define SkFloatToScalar(n) SkFloatToFixed(n) +#endif #define SkScalarToDouble(n) SkFixedToDouble(n) #define SkDoubleToScalar(n) SkDoubleToFixed(n) diff --git a/samplecode/ClockFaceView.cpp b/samplecode/ClockFaceView.cpp index 1e9b89e9de..32c8161aca 100644 --- a/samplecode/ClockFaceView.cpp +++ b/samplecode/ClockFaceView.cpp @@ -154,7 +154,7 @@ static void apply_shader(SkPaint* paint, float scale) SkLayerRasterizer* rast = new SkLayerRasterizer; p.setAntiAlias(true); - r7(rast, p, SkFloatToScalar(scale)); + r7(rast, p, scale); paint->setRasterizer(rast)->unref(); paint->setColor(SK_ColorBLUE); diff --git a/samplecode/SampleAARects.cpp b/samplecode/SampleAARects.cpp index 0f84900010..e84c9664a0 100644 --- a/samplecode/SampleAARects.cpp +++ b/samplecode/SampleAARects.cpp @@ -85,95 +85,95 @@ protected: paints[p].setAlpha(a > 1 ? 0x80 : 0xff); canvas->save(); - rect = SkRect::MakeLTRB(SkFloatToScalar(0.f), - SkFloatToScalar(0.f), - SkFloatToScalar(40.f), - SkFloatToScalar(40.f)); + rect = SkRect::MakeLTRB(0.f, + 0.f, + 40.f, + 40.f); canvas->drawRect(rect, paints[p]); canvas->translate(dx, 0); - rect = SkRect::MakeLTRB(SkFloatToScalar(0.5f), - SkFloatToScalar(0.5f), - SkFloatToScalar(40.5f), - SkFloatToScalar(40.5f)); + rect = SkRect::MakeLTRB(0.5f, + 0.5f, + 40.5f, + 40.5f); canvas->drawRect(rect, paints[p]); canvas->translate(dx, 0); - rect = SkRect::MakeLTRB(SkFloatToScalar(0.5f), - SkFloatToScalar(0.5f), - SkFloatToScalar(40.f), - SkFloatToScalar(40.f)); + rect = SkRect::MakeLTRB(0.5f, + 0.5f, + 40.f, + 40.f); canvas->drawRect(rect, paints[p]); canvas->translate(dx, 0); - rect = SkRect::MakeLTRB(SkFloatToScalar(0.75f), - SkFloatToScalar(0.75f), - SkFloatToScalar(40.75f), - SkFloatToScalar(40.75f)); + rect = SkRect::MakeLTRB(0.75f, + 0.75f, + 40.75f, + 40.75f); canvas->drawRect(rect, paints[p]); canvas->translate(dx, 0); canvas->save(); - canvas->translate(SkFloatToScalar(.33f), SkFloatToScalar(.67f)); - rect = SkRect::MakeLTRB(SkFloatToScalar(0.0f), - SkFloatToScalar(0.0f), - SkFloatToScalar(40.0f), - SkFloatToScalar(40.0f)); + canvas->translate(.33f, .67f); + rect = SkRect::MakeLTRB(0.0f, + 0.0f, + 40.0f, + 40.0f); canvas->drawRect(rect, paints[p]); canvas->restore(); canvas->translate(dx, 0); canvas->save(); - matrix.setRotate(SkFloatToScalar(45.f)); + matrix.setRotate(45.f); canvas->concat(matrix); - canvas->translate(SkFloatToScalar(20.0f / sqrtf(2.f)), - SkFloatToScalar(20.0f / sqrtf(2.f))); - rect = SkRect::MakeLTRB(SkFloatToScalar(-20.0f), - SkFloatToScalar(-20.0f), - SkFloatToScalar(20.0f), - SkFloatToScalar(20.0f)); + canvas->translate(20.0f / sqrtf(2.f), + 20.0f / sqrtf(2.f)); + rect = SkRect::MakeLTRB(-20.0f, + -20.0f, + 20.0f, + 20.0f); canvas->drawRect(rect, paints[p]); canvas->restore(); canvas->translate(dx, 0); canvas->save(); - canvas->rotate(SkFloatToScalar(90.f)); - rect = SkRect::MakeLTRB(SkFloatToScalar(0.0f), - SkFloatToScalar(0.0f), - SkFloatToScalar(40.0f), - SkFloatToScalar(-40.0f)); + canvas->rotate(90.f); + rect = SkRect::MakeLTRB(0.0f, + 0.0f, + 40.0f, + -40.0f); canvas->drawRect(rect, paints[p]); canvas->restore(); canvas->translate(dx, 0); canvas->save(); - canvas->rotate(SkFloatToScalar(90.f)); - rect = SkRect::MakeLTRB(SkFloatToScalar(0.5f), - SkFloatToScalar(0.5f), - SkFloatToScalar(40.5f), - SkFloatToScalar(-40.5f)); + canvas->rotate(90.f); + rect = SkRect::MakeLTRB(0.5f, + 0.5f, + 40.5f, + -40.5f); canvas->drawRect(rect, paints[p]); canvas->restore(); canvas->translate(dx, 0); canvas->save(); - matrix.setScale(SkFloatToScalar(-1.f), SkFloatToScalar(-1.f)); + matrix.setScale(-1.f, -1.f); canvas->concat(matrix); - rect = SkRect::MakeLTRB(SkFloatToScalar(0.5f), - SkFloatToScalar(0.5f), - SkFloatToScalar(-40.5f), - SkFloatToScalar(-40.5f)); + rect = SkRect::MakeLTRB(0.5f, + 0.5f, + -40.5f, + -40.5f); canvas->drawRect(rect, paints[p]); canvas->restore(); canvas->translate(dx, 0); canvas->save(); - matrix.setScale(SkFloatToScalar(2.1f), SkFloatToScalar(4.1f)); + matrix.setScale(2.1f, 4.1f); canvas->concat(matrix); - rect = SkRect::MakeLTRB(SkFloatToScalar(0.1f), - SkFloatToScalar(0.1f), - SkFloatToScalar(19.1f), - SkFloatToScalar(9.1f)); + rect = SkRect::MakeLTRB(0.1f, + 0.1f, + 19.1f, + 9.1f); canvas->drawRect(rect, paints[p]); canvas->restore(); canvas->translate(dx, 0); diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp index 133b653c07..8907a349e8 100644 --- a/samplecode/SampleAll.cpp +++ b/samplecode/SampleAll.cpp @@ -285,8 +285,8 @@ protected: path.addCircle(SkIntToScalar(20), SkIntToScalar(20), SkIntToScalar(20), SkPath::kCCW_Direction); for (int index = 0; index < 10; index++) { - SkScalar x = SkFloatToScalar((float) cos(index / 10.0f * 2 * 3.1415925358f)); - SkScalar y = SkFloatToScalar((float) sin(index / 10.0f * 2 * 3.1415925358f)); + SkScalar x = (float) cos(index / 10.0f * 2 * 3.1415925358f); + SkScalar y = (float) sin(index / 10.0f * 2 * 3.1415925358f); x *= index & 1 ? 7 : 14; y *= index & 1 ? 7 : 14; x += SkIntToScalar(20); diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index de0640e6c4..7162b7b2ad 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -658,8 +658,8 @@ static bool curr_title(SkWindow* wind, SkString* title) { void SampleWindow::setZoomCenter(float x, float y) { - fZoomCenterX = SkFloatToScalar(x); - fZoomCenterY = SkFloatToScalar(y); + fZoomCenterX = x; + fZoomCenterY = y; } bool SampleWindow::zoomIn() @@ -1549,7 +1549,7 @@ static SkBitmap::Config cycle_configs(SkBitmap::Config c) { } void SampleWindow::changeZoomLevel(float delta) { - fZoomLevel += SkFloatToScalar(delta); + fZoomLevel += delta; if (fZoomLevel > 0) { fZoomLevel = SkMinScalar(fZoomLevel, MAX_ZOOM_LEVEL); fZoomScale = fZoomLevel + SK_Scalar1; diff --git a/samplecode/SampleArc.cpp b/samplecode/SampleArc.cpp index 6af37b6c2c..8209c3b764 100644 --- a/samplecode/SampleArc.cpp +++ b/samplecode/SampleArc.cpp @@ -25,7 +25,7 @@ #include "SkParsePath.h" static void testparse() { SkRect r; - r.set(0, 0, SkFloatToScalar(10), SkFloatToScalar(10.5f)); + r.set(0, 0, 10, 10.5f); SkPath p, p2; SkString str, str2; @@ -123,7 +123,7 @@ protected: virtual void onDrawContent(SkCanvas* canvas) { fSweep = SampleCode::GetAnimScalar(SkIntToScalar(360)/24, SkIntToScalar(360)); -// fSweep = SkFloatToScalar(359.99f); +// fSweep = 359.99f; SkRect r; SkPaint paint; diff --git a/samplecode/SampleDegenerateTwoPtRadials.cpp b/samplecode/SampleDegenerateTwoPtRadials.cpp index 4e83ed8f0a..07adae8517 100644 --- a/samplecode/SampleDegenerateTwoPtRadials.cpp +++ b/samplecode/SampleDegenerateTwoPtRadials.cpp @@ -14,7 +14,7 @@ static void draw_gradient2(SkCanvas* canvas, const SkRect& rect, SkScalar delta) { SkColor colors[] = { SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorMAGENTA }; - SkScalar pos[] = { 0, SkFloatToScalar(0.25f), SkFloatToScalar(0.75f), SK_Scalar1 }; + SkScalar pos[] = { 0, 0.25f, 0.75f, SK_Scalar1 }; SkScalar l = rect.fLeft; SkScalar t = rect.fTop; diff --git a/samplecode/SampleDither.cpp b/samplecode/SampleDither.cpp index 2468df7693..38d67ad7cf 100644 --- a/samplecode/SampleDither.cpp +++ b/samplecode/SampleDither.cpp @@ -55,7 +55,7 @@ static void draw_sweep(SkCanvas* c, int width, int height, SkScalar angle) { SkScalar y = r.centerY(); SkScalar radius = r.width() / 2; SkScalar thickness = p.getStrokeWidth(); - SkScalar sweep = SkFloatToScalar(360.0f); + SkScalar sweep = 360.0f; SkPath path; path.moveTo(x + radius, y); diff --git a/samplecode/SampleEffects.cpp b/samplecode/SampleEffects.cpp index a65b10b71f..cbefae8608 100644 --- a/samplecode/SampleEffects.cpp +++ b/samplecode/SampleEffects.cpp @@ -33,8 +33,8 @@ static void paint_proc2(SkPaint* paint) { paint->setMaskFilter( SkBlurMaskFilter::CreateEmboss(SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(1)), dir, - SkFloatToScalar(0.1f), - SkFloatToScalar(0.05f)))->unref(); + 0.1f, + 0.05f))->unref(); } static void paint_proc3(SkPaint* paint) { diff --git a/samplecode/SampleFilter2.cpp b/samplecode/SampleFilter2.cpp index e982778234..b4314c5a5c 100644 --- a/samplecode/SampleFilter2.cpp +++ b/samplecode/SampleFilter2.cpp @@ -72,7 +72,7 @@ protected: const SkScalar H = SkIntToScalar(fBitmaps[0].height() + 1); SkPaint paint; - const SkScalar scale = SkFloatToScalar(0.897917f); + const SkScalar scale = 0.897917f; canvas->scale(SK_Scalar1, scale); for (int k = 0; k < 2; k++) { diff --git a/samplecode/SampleFilterFuzz.cpp b/samplecode/SampleFilterFuzz.cpp index b10fb31834..3e3436f448 100644 --- a/samplecode/SampleFilterFuzz.cpp +++ b/samplecode/SampleFilterFuzz.cpp @@ -80,7 +80,7 @@ static float make_number(bool positiveOnly) { } static SkScalar make_scalar(bool positiveOnly = false) { - return SkFloatToScalar(make_number(positiveOnly)); + return make_number(positiveOnly); } static SkRect make_rect(int offset = 1) { diff --git a/samplecode/SampleFontScalerTest.cpp b/samplecode/SampleFontScalerTest.cpp index a01de03556..bbfd5a5e14 100644 --- a/samplecode/SampleFontScalerTest.cpp +++ b/samplecode/SampleFontScalerTest.cpp @@ -77,12 +77,12 @@ protected: if (false) { SkPoint pts[4]; pts[0].set(1.61061274e+09f, 6291456); - pts[1].set(SkFloatToScalar(-7.18397061e+15f), - SkFloatToScalar(-1.53091184e+13f)); - pts[2].set(SkFloatToScalar(-1.30077315e+16f), - SkFloatToScalar(-2.77196141e+13f)); - pts[3].set(SkFloatToScalar(-1.30077315e+16f), - SkFloatToScalar(-2.77196162e+13f)); + pts[1].set(-7.18397061e+15f, + -1.53091184e+13f); + pts[2].set(-1.30077315e+16f, + -2.77196141e+13f); + pts[3].set(-1.30077315e+16f, + -2.77196162e+13f); SkPath path; path.moveTo(pts[0]); diff --git a/samplecode/SampleHairline.cpp b/samplecode/SampleHairline.cpp index fb42e2c166..bb43d847cd 100644 --- a/samplecode/SampleHairline.cpp +++ b/samplecode/SampleHairline.cpp @@ -39,8 +39,8 @@ static void test_chromium_9005() { SkCanvas canvas(bm); - SkPoint pt0 = { SkFloatToScalar(799.33374f), SkFloatToScalar(1.2360189f) }; - SkPoint pt1 = { SkFloatToScalar(808.49969f), SkFloatToScalar(-7.4338055f) }; + SkPoint pt0 = { 799.33374f, 1.2360189f }; + SkPoint pt1 = { 808.49969f, -7.4338055f }; SkPaint paint; paint.setAntiAlias(true); diff --git a/samplecode/SamplePicture.cpp b/samplecode/SamplePicture.cpp index 7ae87571af..66289affe0 100644 --- a/samplecode/SamplePicture.cpp +++ b/samplecode/SamplePicture.cpp @@ -104,7 +104,7 @@ protected: SkPaint paint; canvas->save(); - canvas->scale(SkFloatToScalar(0.5f), SkFloatToScalar(0.5f)); + canvas->scale(0.5f, 0.5f); canvas->drawBitmap(fBitmap, 0, 0, NULL); canvas->restore(); diff --git a/samplecode/SamplePolyToPoly.cpp b/samplecode/SamplePolyToPoly.cpp index a0401f6339..1283a23bc5 100644 --- a/samplecode/SamplePolyToPoly.cpp +++ b/samplecode/SamplePolyToPoly.cpp @@ -41,11 +41,11 @@ public: m1.reset(); const SkScalar src1[] = { - 0, 0, 0, SkFloatToScalar(427), SkFloatToScalar(316), SkFloatToScalar(427), SkFloatToScalar(316), 0 + 0, 0, 0, 427, 316, 427, 316, 0 }; const SkScalar dst1[] = { - SkFloatToScalar(158), SkFloatToScalar(177.5f), SkFloatToScalar(158), SkFloatToScalar(249.5f), - SkFloatToScalar(158), SkFloatToScalar(604.5f), SkFloatToScalar(158), SkFloatToScalar(-177.5f) + 158, 177.5f, 158, 249.5f, + 158, 604.5f, 158, -177.5f }; (void) m2.setPolyToPoly((const SkPoint*)src1, (SkPoint*)dst1, 4); @@ -112,7 +112,7 @@ protected: SkString str; str.appendS32(count); canvas->drawText(str.c_str(), str.size(), - x, SkFloatToScalar(y), + x, y, *paint); canvas->restore(); diff --git a/samplecode/SampleRegion.cpp b/samplecode/SampleRegion.cpp index 39c27a8928..886eb96c78 100644 --- a/samplecode/SampleRegion.cpp +++ b/samplecode/SampleRegion.cpp @@ -76,7 +76,7 @@ static void drawFadingText(SkCanvas* canvas, // pos[1] value is where we start to fade, relative to the width // of our pts[] array. - const SkScalar pos[] = { 0, SkFloatToScalar(0.9f), SK_Scalar1 }; + const SkScalar pos[] = { 0, 0.9f, SK_Scalar1 }; SkShader* s = SkGradientShader::CreateLinear(pts, colors, pos, 3, SkShader::kClamp_TileMode); diff --git a/samplecode/SampleSlides.cpp b/samplecode/SampleSlides.cpp index 3dba782331..9372d5d468 100644 --- a/samplecode/SampleSlides.cpp +++ b/samplecode/SampleSlides.cpp @@ -80,7 +80,7 @@ static void one_d_pe(SkPaint* paint) { path.lineTo(SkIntToScalar(gXY[i]), SkIntToScalar(gXY[i+1])); path.close(); path.offset(SkIntToScalar(-6), 0); - scale(&path, SkFloatToScalar(1.5f)); + scale(&path, 1.5f); paint->setPathEffect(new SkPath1DPathEffect(path, SkIntToScalar(21), 0, SkPath1DPathEffect::kRotate_Style))->unref(); diff --git a/samplecode/SampleText.cpp b/samplecode/SampleText.cpp index c6aaa52a0b..aa314dd58b 100644 --- a/samplecode/SampleText.cpp +++ b/samplecode/SampleText.cpp @@ -176,7 +176,7 @@ void SkPowerMode::init(SkScalar e) { // printf(" %d %g", i, x); x = powf(x, ee); // printf(" %g", x); - int xx = SkScalarRound(SkFloatToScalar(x * 255)); + int xx = SkScalarRound(x * 255); // printf(" %d\n", xx); fTable[i] = SkToU8(xx); } diff --git a/samplecode/SampleTextOnPath.cpp b/samplecode/SampleTextOnPath.cpp index bfb35f8159..f2b9af6732 100644 --- a/samplecode/SampleTextOnPath.cpp +++ b/samplecode/SampleTextOnPath.cpp @@ -22,29 +22,29 @@ static void textStrokePath(SkCanvas* canvas) { canvas->save(); canvas->scale(SkIntToScalar(250),SkIntToScalar(250)); - rect.set(SkFloatToScalar(0.0f), SkFloatToScalar(0.21f), - SkFloatToScalar(0.78f), SkFloatToScalar(0.99f)); + rect.set(0.0f, 0.21f, + 0.78f, 0.99f); path.addArc(rect, SkIntToScalar(280), SkIntToScalar(350)); paint.setAntiAlias(true); paint.setStyle(SkPaint::kStroke_Style); paint.setColor(0xFFFF0000); - paint.setTextSize(SkFloatToScalar(0.085f)); - paint.setStrokeWidth(SkFloatToScalar(.005f)); + paint.setTextSize(0.085f); + paint.setStrokeWidth(.005f); canvas->drawPath(path, paint); paint.setLooper(new SkBlurDrawLooper(SK_ColorBLACK, - SkBlurMask::ConvertRadiusToSigma(SkFloatToScalar(0.002f)), - SkFloatToScalar(0.0f), - SkFloatToScalar(0.0f)))->unref(); + SkBlurMask::ConvertRadiusToSigma(0.002f), + 0.0f, + 0.0f))->unref(); const char* text = "DRAWING STROKED TEXT WITH A BLUR ON A PATH"; size_t len = strlen(text); canvas->drawTextOnPathHV(text, len, path, 0, - SkFloatToScalar(-0.025f), paint); + -0.025f, paint); canvas->restore(); } diff --git a/samplecode/TransitionView.cpp b/samplecode/TransitionView.cpp index d18585414c..3a37172516 100644 --- a/samplecode/TransitionView.cpp +++ b/samplecode/TransitionView.cpp @@ -158,8 +158,8 @@ protected: fEnd[kPrevX] = -lr; fEnd[kPrevY] = -ud; fEnd[kNextX] = fEnd[kNextY] = 0; - SkScalar blend[] = { SkFloatToScalar(0.8f), SkFloatToScalar(0.0f), - SkFloatToScalar(0.0f), SK_Scalar1 }; + SkScalar blend[] = { 0.8f, 0.0f, + 0.0f, SK_Scalar1 }; fInterp.setKeyFrame(0, SkTime::GetMSecs(), fBegin, blend); fInterp.setKeyFrame(1, SkTime::GetMSecs()+kDurationMS, fEnd, blend); } diff --git a/samplecode/vertexdump.cpp b/samplecode/vertexdump.cpp index ae310a5d54..9bfb0ce40a 100644 --- a/samplecode/vertexdump.cpp +++ b/samplecode/vertexdump.cpp @@ -10,38 +10,38 @@ void setup_vertexbug(SkPoint verts[], SkPoint texs[], uint16_t index[]); void setup_vertexbug(SkPoint verts[], SkPoint texs[], uint16_t index[]) { - verts[0].set(SkFloatToScalar(107), SkFloatToScalar(189)); - texs[0].set(SkFloatToScalar(0), SkFloatToScalar(0)); - verts[1].set(SkFloatToScalar(116), SkFloatToScalar(189)); - texs[1].set(SkFloatToScalar(9), SkFloatToScalar(0)); - verts[2].set(SkFloatToScalar(203), SkFloatToScalar(189)); - texs[2].set(SkFloatToScalar(35), SkFloatToScalar(0)); - verts[3].set(SkFloatToScalar(212), SkFloatToScalar(189)); - texs[3].set(SkFloatToScalar(44), SkFloatToScalar(0)); - verts[4].set(SkFloatToScalar(107), SkFloatToScalar(198)); - texs[4].set(SkFloatToScalar(0), SkFloatToScalar(9)); - verts[5].set(SkFloatToScalar(116), SkFloatToScalar(198)); - texs[5].set(SkFloatToScalar(9), SkFloatToScalar(9)); - verts[6].set(SkFloatToScalar(203), SkFloatToScalar(198)); - texs[6].set(SkFloatToScalar(35), SkFloatToScalar(9)); - verts[7].set(SkFloatToScalar(212), SkFloatToScalar(198)); - texs[7].set(SkFloatToScalar(44), SkFloatToScalar(9)); - verts[8].set(SkFloatToScalar(107), SkFloatToScalar(224)); - texs[8].set(SkFloatToScalar(0), SkFloatToScalar(39)); - verts[9].set(SkFloatToScalar(116), SkFloatToScalar(224)); - texs[9].set(SkFloatToScalar(9), SkFloatToScalar(39)); - verts[10].set(SkFloatToScalar(203), SkFloatToScalar(224)); - texs[10].set(SkFloatToScalar(35), SkFloatToScalar(39)); - verts[11].set(SkFloatToScalar(212), SkFloatToScalar(224)); - texs[11].set(SkFloatToScalar(44), SkFloatToScalar(39)); - verts[12].set(SkFloatToScalar(107), SkFloatToScalar(233)); - texs[12].set(SkFloatToScalar(0), SkFloatToScalar(48)); - verts[13].set(SkFloatToScalar(116), SkFloatToScalar(233)); - texs[13].set(SkFloatToScalar(9), SkFloatToScalar(48)); - verts[14].set(SkFloatToScalar(203), SkFloatToScalar(233)); - texs[14].set(SkFloatToScalar(35), SkFloatToScalar(48)); - verts[15].set(SkFloatToScalar(212), SkFloatToScalar(233)); - texs[15].set(SkFloatToScalar(44), SkFloatToScalar(48)); + verts[0].set(107, 189); + texs[0].set(0, 0); + verts[1].set(116, 189); + texs[1].set(9, 0); + verts[2].set(203, 189); + texs[2].set(35, 0); + verts[3].set(212, 189); + texs[3].set(44, 0); + verts[4].set(107, 198); + texs[4].set(0, 9); + verts[5].set(116, 198); + texs[5].set(9, 9); + verts[6].set(203, 198); + texs[6].set(35, 9); + verts[7].set(212, 198); + texs[7].set(44, 9); + verts[8].set(107, 224); + texs[8].set(0, 39); + verts[9].set(116, 224); + texs[9].set(9, 39); + verts[10].set(203, 224); + texs[10].set(35, 39); + verts[11].set(212, 224); + texs[11].set(44, 39); + verts[12].set(107, 233); + texs[12].set(0, 48); + verts[13].set(116, 233); + texs[13].set(9, 48); + verts[14].set(203, 233); + texs[14].set(35, 48); + verts[15].set(212, 233); + texs[15].set(44, 48); index[0] = 0; index[1] = 5; index[2] = 1; index[3] = 0; index[4] = 4; index[5] = 5; #if 0 diff --git a/src/core/SkBBoxRecord.cpp b/src/core/SkBBoxRecord.cpp index 2349b1c3e1..cdb70bb730 100644 --- a/src/core/SkBBoxRecord.cpp +++ b/src/core/SkBBoxRecord.cpp @@ -53,7 +53,7 @@ void SkBBoxRecord::drawPoints(PointMode mode, size_t count, const SkPoint pts[], // Note: The device coordinate outset in SkBBoxHierarchyRecord::handleBBox is currently // done in the recording coordinate space, which is wrong. // http://code.google.com/p/skia/issues/detail?id=1021 - static const SkScalar kMinWidth = SkFloatToScalar(0.01f); + static const SkScalar kMinWidth = 0.01f; SkScalar halfStrokeWidth = SkMaxScalar(paint.getStrokeWidth(), kMinWidth) / 2; bbox.outset(halfStrokeWidth, halfStrokeWidth); if (this->transformBounds(bbox, &paint)) { diff --git a/src/core/SkBitmapFilter.cpp b/src/core/SkBitmapFilter.cpp index c607e6814b..f06662544e 100644 --- a/src/core/SkBitmapFilter.cpp +++ b/src/core/SkBitmapFilter.cpp @@ -31,8 +31,8 @@ void highQualityFilter(ColorPacker pack, const SkBitmapProcState& s, int x, int while (count-- > 0) { SkPoint srcPt; - s.fInvProc(s.fInvMatrix, SkFloatToScalar(x + 0.5f), - SkFloatToScalar(y + 0.5f), &srcPt); + s.fInvProc(s.fInvMatrix, x + 0.5f, + y + 0.5f, &srcPt); srcPt.fX -= SK_ScalarHalf; srcPt.fY -= SK_ScalarHalf; diff --git a/src/core/SkBitmapFilter.h b/src/core/SkBitmapFilter.h index 0b8483a1e4..8ef0f6e1de 100644 --- a/src/core/SkBitmapFilter.h +++ b/src/core/SkBitmapFilter.h @@ -67,7 +67,7 @@ class SkBitmapFilter { for (int x = 0; x < SKBITMAP_FILTER_TABLE_SIZE; ++x) { float fx = ((float)x + .5f) * this->width() / SKBITMAP_FILTER_TABLE_SIZE; float filter_value = evaluate(fx); - *ftpScalar++ = SkFloatToScalar(filter_value); + *ftpScalar++ = filter_value; *ftp++ = SkFloatToFixed(filter_value); } } diff --git a/src/core/SkBitmapProcState.cpp b/src/core/SkBitmapProcState.cpp index a535f086ea..59483d66a1 100644 --- a/src/core/SkBitmapProcState.cpp +++ b/src/core/SkBitmapProcState.cpp @@ -198,7 +198,7 @@ bool SkBitmapProcState::possiblyScaleImage() { // so we only keep High quality if the scale is greater than this. // // Since we're dealing with the inverse, we compare against its inverse. - const SkScalar bicubicLimit = SkFloatToScalar(4.0f); + const SkScalar bicubicLimit = 4.0f; const SkScalar bicubicLimitSqd = bicubicLimit * bicubicLimit; if (scaleSqd < bicubicLimitSqd) { // use bicubic scanline return false; diff --git a/src/core/SkFDot6.h b/src/core/SkFDot6.h index a88ea92501..afb369e9b2 100644 --- a/src/core/SkFDot6.h +++ b/src/core/SkFDot6.h @@ -41,7 +41,7 @@ inline SkFixed SkFDot6ToFixed(SkFDot6 x) { #ifdef SK_SCALAR_IS_FLOAT #define SkScalarToFDot6(x) (SkFDot6)((x) * 64) - #define SkFDot6ToScalar(x) ((SkScalar)(x) * SkFloatToScalar(0.015625f)) + #define SkFDot6ToScalar(x) ((SkScalar)(x) * 0.015625f) #else #define SkScalarToFDot6(x) ((x) >> 10) #define SkFDot6ToScalar(x) ((x) << 10) diff --git a/src/core/SkGeometry.cpp b/src/core/SkGeometry.cpp index 9b15f9f1f9..11d52b594e 100644 --- a/src/core/SkGeometry.cpp +++ b/src/core/SkGeometry.cpp @@ -1134,9 +1134,9 @@ bool SkXRayCrossesMonotonicCubic(const SkXRay& pt, const SkPoint cubic[4], bool* // instead of down if (cubic[3].fY > cubic[0].fY) { upper_t = SK_Scalar1; - lower_t = SkFloatToScalar(0); + lower_t = 0; } else { - upper_t = SkFloatToScalar(0); + upper_t = 0; lower_t = SK_Scalar1; } do { diff --git a/src/core/SkLineClipper.cpp b/src/core/SkLineClipper.cpp index fc4e3d2592..911cd974da 100644 --- a/src/core/SkLineClipper.cpp +++ b/src/core/SkLineClipper.cpp @@ -176,7 +176,7 @@ static bool is_between_unsorted(SkScalar value, static void sect_with_horizontal_test_for_pin_results() { const SkPoint pts[] = { { -540000, -720000 }, - { SkFloatToScalar(-9.10000017e-05f), SkFloatToScalar(9.99999996e-13f) } + { -9.10000017e-05f, 9.99999996e-13f } }; float x = sect_with_horizontal(pts, 0); SkASSERT(is_between_unsorted(x, pts[0].fX, pts[1].fX)); diff --git a/src/core/SkMaskGamma.cpp b/src/core/SkMaskGamma.cpp index 9066fb7d9f..a305d72162 100644 --- a/src/core/SkMaskGamma.cpp +++ b/src/core/SkMaskGamma.cpp @@ -36,21 +36,21 @@ class SkSRGBColorSpaceLuminance : public SkColorSpaceLuminance { SkASSERT(0 == gamma); //The magic numbers are derived from the sRGB specification. //See http://www.color.org/chardata/rgb/srgb.xalter . - if (luminance <= SkFloatToScalar(0.04045f)) { - return luminance / SkFloatToScalar(12.92f); + if (luminance <= 0.04045f) { + return luminance / 12.92f; } - return SkScalarPow((luminance + SkFloatToScalar(0.055f)) / SkFloatToScalar(1.055f), - SkFloatToScalar(2.4f)); + return SkScalarPow((luminance + 0.055f) / 1.055f, + 2.4f); } virtual SkScalar fromLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luma) const SK_OVERRIDE { SkASSERT(0 == gamma); //The magic numbers are derived from the sRGB specification. //See http://www.color.org/chardata/rgb/srgb.xalter . - if (luma <= SkFloatToScalar(0.0031308f)) { - return luma * SkFloatToScalar(12.92f); + if (luma <= 0.0031308f) { + return luma * 12.92f; } - return SkFloatToScalar(1.055f) * SkScalarPow(luma, SkScalarInvert(SkFloatToScalar(2.4f))) - - SkFloatToScalar(0.055f); + return 1.055f * SkScalarPow(luma, SkScalarInvert(2.4f)) + - 0.055f; } }; diff --git a/src/core/SkMaskGamma.h b/src/core/SkMaskGamma.h index fafe4ac776..9d3fd9a344 100644 --- a/src/core/SkMaskGamma.h +++ b/src/core/SkMaskGamma.h @@ -35,9 +35,9 @@ public: SkScalar r = luminance.toLuma(gamma, SkIntToScalar(SkColorGetR(c)) / 255); SkScalar g = luminance.toLuma(gamma, SkIntToScalar(SkColorGetG(c)) / 255); SkScalar b = luminance.toLuma(gamma, SkIntToScalar(SkColorGetB(c)) / 255); - SkScalar luma = r * SkFloatToScalar(SK_LUM_COEFF_R) + - g * SkFloatToScalar(SK_LUM_COEFF_G) + - b * SkFloatToScalar(SK_LUM_COEFF_B); + SkScalar luma = r * SK_LUM_COEFF_R + + g * SK_LUM_COEFF_G + + b * SK_LUM_COEFF_B; SkASSERT(luma <= SK_Scalar1); return SkScalarRoundToInt(luminance.fromLuma(gamma, luma) * 255); } diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index 6c6f0e6cb9..d6948dd83f 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -1696,7 +1696,7 @@ void SkScalerContext::MakeRec(const SkPaint& paint, * With higher values lcd fringing is worse and the smoothing effect of * partial coverage is diminished. */ - rec->setContrast(SkFloatToScalar(0.5f)); + rec->setContrast(0.5f); #endif rec->fReservedAlign = 0; diff --git a/src/effects/SkBicubicImageFilter.cpp b/src/effects/SkBicubicImageFilter.cpp index d6674153d5..5148e13e12 100644 --- a/src/effects/SkBicubicImageFilter.cpp +++ b/src/effects/SkBicubicImageFilter.cpp @@ -115,7 +115,7 @@ bool SkBicubicImageFilter::onFilterImage(Proxy* proxy, src.getBounds(&srcRect); SkMatrix inverse; inverse.setRectToRect(dstRect, srcRect, SkMatrix::kFill_ScaleToFit); - inverse.postTranslate(SkFloatToScalar(-0.5f), SkFloatToScalar(-0.5f)); + inverse.postTranslate(-0.5f, -0.5f); for (int y = dstIRect.fTop; y < dstIRect.fBottom; ++y) { SkPMColor* dptr = result->getAddr32(dstIRect.fLeft, y); diff --git a/src/effects/SkBlurMask.cpp b/src/effects/SkBlurMask.cpp index 97a623426b..d2484c84b7 100644 --- a/src/effects/SkBlurMask.cpp +++ b/src/effects/SkBlurMask.cpp @@ -21,7 +21,7 @@ SkScalar SkBlurMask::ConvertRadiusToSigma(SkScalar radius) { // Firefox used to do the same too, until 4.0 where they fixed it. So at some // point we should probably get rid of these scaling constants and rebaseline // all the blur tests. - static const SkScalar kBLUR_SIGMA_SCALE = SkFloatToScalar(0.57735f); + static const SkScalar kBLUR_SIGMA_SCALE = 0.57735f; return radius ? kBLUR_SIGMA_SCALE * radius + 0.5f : 0.0f; } @@ -405,7 +405,7 @@ static int boxBlurInterp(const uint8_t* src, int src_y_stride, uint8_t* dst, static void get_adjusted_radii(SkScalar passRadius, int *loRadius, int *hiRadius) { *loRadius = *hiRadius = SkScalarCeil(passRadius); - if (SkIntToScalar(*hiRadius) - passRadius > SkFloatToScalar(0.5f)) { + if (SkIntToScalar(*hiRadius) - passRadius > 0.5f) { *loRadius = *hiRadius - 1; } } diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index 34dde3cabd..9ed6d0c0bb 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -540,8 +540,8 @@ bool SkBlurMaskFilterImpl::canFilterMaskGPU(const SkRect& srcBounds, SkRect srcRect(srcBounds); // Outset srcRect and clipRect by 3 * sigma, to compute affected blur area. - srcRect.outset(SkFloatToScalar(sigma3), SkFloatToScalar(sigma3)); - clipRect.outset(SkFloatToScalar(sigma3), SkFloatToScalar(sigma3)); + srcRect.outset(sigma3, sigma3); + clipRect.outset(sigma3, sigma3); srcRect.intersect(clipRect); *maskRect = srcRect; return true; diff --git a/src/effects/SkColorMatrix.cpp b/src/effects/SkColorMatrix.cpp index d6cb9405fc..535d6cc247 100644 --- a/src/effects/SkColorMatrix.cpp +++ b/src/effects/SkColorMatrix.cpp @@ -108,9 +108,9 @@ static void setrow(SkScalar row[], SkScalar r, SkScalar g, SkScalar b) { row[2] = b; } -static const SkScalar kHueR = SkFloatToScalar(0.213f); -static const SkScalar kHueG = SkFloatToScalar(0.715f); -static const SkScalar kHueB = SkFloatToScalar(0.072f); +static const SkScalar kHueR = 0.213f; +static const SkScalar kHueG = 0.715f; +static const SkScalar kHueB = 0.072f; void SkColorMatrix::setSaturation(SkScalar sat) { memset(fMat, 0, sizeof(fMat)); @@ -125,17 +125,17 @@ void SkColorMatrix::setSaturation(SkScalar sat) { fMat[18] = SK_Scalar1; } -static const SkScalar kR2Y = SkFloatToScalar(0.299f); -static const SkScalar kG2Y = SkFloatToScalar(0.587f); -static const SkScalar kB2Y = SkFloatToScalar(0.114f); +static const SkScalar kR2Y = 0.299f; +static const SkScalar kG2Y = 0.587f; +static const SkScalar kB2Y = 0.114f; -static const SkScalar kR2U = SkFloatToScalar(-0.16874f); -static const SkScalar kG2U = SkFloatToScalar(-0.33126f); -static const SkScalar kB2U = SkFloatToScalar(0.5f); +static const SkScalar kR2U = -0.16874f; +static const SkScalar kG2U = -0.33126f; +static const SkScalar kB2U = 0.5f; -static const SkScalar kR2V = SkFloatToScalar(0.5f); -static const SkScalar kG2V = SkFloatToScalar(-0.41869f); -static const SkScalar kB2V = SkFloatToScalar(-0.08131f); +static const SkScalar kR2V = 0.5f; +static const SkScalar kG2V = -0.41869f; +static const SkScalar kB2V = -0.08131f; void SkColorMatrix::setRGB2YUV() { memset(fMat, 0, sizeof(fMat)); @@ -146,10 +146,10 @@ void SkColorMatrix::setRGB2YUV() { fMat[18] = SK_Scalar1; } -static const SkScalar kV2R = SkFloatToScalar(1.402f); -static const SkScalar kU2G = SkFloatToScalar(-0.34414f); -static const SkScalar kV2G = SkFloatToScalar(-0.71414f); -static const SkScalar kU2B = SkFloatToScalar(1.772f); +static const SkScalar kV2R = 1.402f; +static const SkScalar kU2G = -0.34414f; +static const SkScalar kV2G = -0.71414f; +static const SkScalar kU2B = 1.772f; void SkColorMatrix::setYUV2RGB() { memset(fMat, 0, sizeof(fMat)); diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp index 15ac627372..816807d04e 100644 --- a/src/effects/SkDisplacementMapEffect.cpp +++ b/src/effects/SkDisplacementMapEffect.cpp @@ -49,7 +49,7 @@ template<SkDisplacementMapEffect::ChannelSelectorType typeX, SkDisplacementMapEffect::ChannelSelectorType typeY> void computeDisplacement(SkScalar scale, SkBitmap* dst, SkBitmap* displ, SkBitmap* src, const SkIRect& bounds) { - static const SkScalar Inv8bit = SkScalarDiv(SK_Scalar1, SkFloatToScalar(255.0f)); + static const SkScalar Inv8bit = SkScalarDiv(SK_Scalar1, 255.0f); const int srcW = src->width(); const int srcH = src->height(); const SkScalar scaleForColor = SkScalarMul(scale, Inv8bit); @@ -413,7 +413,7 @@ GrEffectRef* GrDisplacementMapEffect::TestCreate(SkRandom* random, SkDisplacementMapEffect::ChannelSelectorType yChannelSelector = static_cast<SkDisplacementMapEffect::ChannelSelectorType>( random->nextRangeU(1, kMaxComponent)); - SkScalar scale = random->nextRangeScalar(0, SkFloatToScalar(100.0f)); + SkScalar scale = random->nextRangeScalar(0, 100.0f); return GrDisplacementMapEffect::Create(xChannelSelector, yChannelSelector, scale, textures[texIdxDispl], textures[texIdxColor]); diff --git a/src/effects/SkGpuBlurUtils.cpp b/src/effects/SkGpuBlurUtils.cpp index 6188c49540..02fdf485d2 100644 --- a/src/effects/SkGpuBlurUtils.cpp +++ b/src/effects/SkGpuBlurUtils.cpp @@ -22,10 +22,10 @@ namespace SkGpuBlurUtils { #define MAX_BLUR_SIGMA 4.0f static void scale_rect(SkRect* rect, float xScale, float yScale) { - rect->fLeft = SkScalarMul(rect->fLeft, SkFloatToScalar(xScale)); - rect->fTop = SkScalarMul(rect->fTop, SkFloatToScalar(yScale)); - rect->fRight = SkScalarMul(rect->fRight, SkFloatToScalar(xScale)); - rect->fBottom = SkScalarMul(rect->fBottom, SkFloatToScalar(yScale)); + rect->fLeft = SkScalarMul(rect->fLeft, xScale); + rect->fTop = SkScalarMul(rect->fTop, yScale); + rect->fRight = SkScalarMul(rect->fRight, xScale); + rect->fBottom = SkScalarMul(rect->fBottom, yScale); } static float adjust_sigma(float sigma, int *scaleFactor, int *radius) { diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp index db3a1a0924..45a75ab17d 100644 --- a/src/effects/SkLightingImageFilter.cpp +++ b/src/effects/SkLightingImageFilter.cpp @@ -30,8 +30,8 @@ namespace { const SkScalar gOneThird = SkScalarInvert(SkIntToScalar(3)); const SkScalar gTwoThirds = SkScalarDiv(SkIntToScalar(2), SkIntToScalar(3)); -const SkScalar gOneHalf = SkFloatToScalar(0.5f); -const SkScalar gOneQuarter = SkFloatToScalar(0.25f); +const SkScalar gOneHalf = 0.5f; +const SkScalar gOneQuarter = 0.25f; #if SK_SUPPORT_GPU void setUniformPoint3(const GrGLUniformManager& uman, UniformHandle uni, const SkPoint3& point) { @@ -675,7 +675,7 @@ public: fS = target - location; fS.normalize(); fCosOuterConeAngle = SkScalarCos(SkDegreesToRadians(cutoffAngle)); - const SkScalar antiAliasThreshold = SkFloatToScalar(0.016f); + const SkScalar antiAliasThreshold = 0.016f; fCosInnerConeAngle = fCosOuterConeAngle + antiAliasThreshold; fConeScale = SkScalarInvert(antiAliasThreshold); } @@ -791,8 +791,8 @@ private: // According to the spec, the specular term should be in the range [1, 128] : // http://www.w3.org/TR/SVG/filters.html#feSpecularLightingSpecularExponentAttribute -const SkScalar SkSpotLight::kSpecularExponentMin = SkFloatToScalar(1.0f); -const SkScalar SkSpotLight::kSpecularExponentMax = SkFloatToScalar(128.0f); +const SkScalar SkSpotLight::kSpecularExponentMin = 1.0f; +const SkScalar SkSpotLight::kSpecularExponentMax = 128.0f; /////////////////////////////////////////////////////////////////////////////// diff --git a/src/effects/SkPerlinNoiseShader.cpp b/src/effects/SkPerlinNoiseShader.cpp index f2ce67924e..51675ad2bb 100644 --- a/src/effects/SkPerlinNoiseShader.cpp +++ b/src/effects/SkPerlinNoiseShader.cpp @@ -45,7 +45,7 @@ inline int checkNoise(int noiseValue, int limitValue, int newValue) { } inline SkScalar smoothCurve(SkScalar t) { - static const SkScalar SK_Scalar3 = SkFloatToScalar(3.0f); + static const SkScalar SK_Scalar3 = 3.0f; // returns t * t * (3 - 2 * t) return SkScalarMul(SkScalarSquare(t), SK_Scalar3 - 2 * t); @@ -165,7 +165,7 @@ public: } // Half of the largest possible value for 16 bit unsigned int - static const SkScalar gHalfMax16bits = SkFloatToScalar(32767.5f); + static const SkScalar gHalfMax16bits = 32767.5f; // Compute gradients from permutated noise data for (int channel = 0; channel < 4; ++channel) { @@ -729,10 +729,10 @@ GrEffectRef* GrPerlinNoiseEffect::TestCreate(SkRandom* random, bool stitchTiles = random->nextBool(); SkScalar seed = SkIntToScalar(random->nextU()); SkISize tileSize = SkISize::Make(random->nextRangeU(4, 4096), random->nextRangeU(4, 4096)); - SkScalar baseFrequencyX = random->nextRangeScalar(SkFloatToScalar(0.01f), - SkFloatToScalar(0.99f)); - SkScalar baseFrequencyY = random->nextRangeScalar(SkFloatToScalar(0.01f), - SkFloatToScalar(0.99f)); + SkScalar baseFrequencyX = random->nextRangeScalar(0.01f, + 0.99f); + SkScalar baseFrequencyY = random->nextRangeScalar(0.01f, + 0.99f); SkShader* shader = random->nextBool() ? SkPerlinNoiseShader::CreateFractalNoise(baseFrequencyX, baseFrequencyY, numOctaves, seed, diff --git a/src/gpu/GrAAHairLinePathRenderer.cpp b/src/gpu/GrAAHairLinePathRenderer.cpp index 39563105f8..2b5428c47d 100644 --- a/src/gpu/GrAAHairLinePathRenderer.cpp +++ b/src/gpu/GrAAHairLinePathRenderer.cpp @@ -762,7 +762,7 @@ bool GrAAHairLinePathRenderer::createLineGeom(const SkPath& path, add_line(&lines[2*i], toSrc, drawState->getCoverageColor(), &verts); } // All the verts computed by add_line are within sqrt(1^2 + 0.5^2) of the end points. - static const SkScalar kSqrtOfOneAndAQuarter = SkFloatToScalar(1.118f); + static const SkScalar kSqrtOfOneAndAQuarter = 1.118f; // Add a little extra to account for vector normalization precision. static const SkScalar kOutset = kSqrtOfOneAndAQuarter + SK_Scalar1 / 20; devBounds->outset(kOutset, kOutset); diff --git a/src/gpu/GrEffect.cpp b/src/gpu/GrEffect.cpp index 1ada34f372..a64fd7c4bb 100644 --- a/src/gpu/GrEffect.cpp +++ b/src/gpu/GrEffect.cpp @@ -33,8 +33,8 @@ const SkMatrix& TestMatrix(SkRandom* random) { gMatrices[3].postTranslate(SkIntToScalar(66), SkIntToScalar(-33)); gMatrices[3].postScale(SkIntToScalar(2), SK_ScalarHalf); gMatrices[4].setRotate(SkIntToScalar(215)); - gMatrices[4].set(SkMatrix::kMPersp0, SkFloatToScalar(0.00013f)); - gMatrices[4].set(SkMatrix::kMPersp1, SkFloatToScalar(-0.000039f)); + gMatrices[4].set(SkMatrix::kMPersp0, 0.00013f); + gMatrices[4].set(SkMatrix::kMPersp1, -0.000039f); gOnce = true; } return gMatrices[random->nextULessThan(static_cast<uint32_t>(SK_ARRAY_COUNT(gMatrices)))]; diff --git a/src/gpu/GrPathUtils.cpp b/src/gpu/GrPathUtils.cpp index d412b8cd9d..81348ec239 100644 --- a/src/gpu/GrPathUtils.cpp +++ b/src/gpu/GrPathUtils.cpp @@ -34,7 +34,7 @@ SkScalar GrPathUtils::scaleToleranceToSrc(SkScalar devTol, } static const int MAX_POINTS_PER_CURVE = 1 << 10; -static const SkScalar gMinCurveTol = SkFloatToScalar(0.0001f); +static const SkScalar gMinCurveTol = 0.0001f; uint32_t GrPathUtils::quadraticPointCount(const GrPoint points[], SkScalar tol) { @@ -250,7 +250,7 @@ void GrPathUtils::QuadUVMatrix::set(const GrPoint qPts[3]) { m.postConcat(UVpts); // The matrix should not have perspective. - SkDEBUGCODE(static const SkScalar gTOL = SkFloatToScalar(1.f / 100.f)); + SkDEBUGCODE(static const SkScalar gTOL = 1.f / 100.f); SkASSERT(SkScalarAbs(m.get(SkMatrix::kMPersp0)) < gTOL); SkASSERT(SkScalarAbs(m.get(SkMatrix::kMPersp1)) < gTOL); diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index c6194e7031..6fb1403cff 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -45,7 +45,7 @@ // This constant represents the screen alignment criterion in texels for // requiring texture domain clamping to prevent color bleeding when drawing // a sub region of a larger source image. -#define COLOR_BLEED_TOLERANCE SkFloatToScalar(0.001f) +#define COLOR_BLEED_TOLERANCE 0.001f #define DO_DEFERRED_CLEAR() \ do { \ diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp index 804dc41074..bdabc53f0f 100644 --- a/src/pdf/SkPDFDevice.cpp +++ b/src/pdf/SkPDFDevice.cpp @@ -745,7 +745,7 @@ SkPDFDevice::SkPDFDevice(const SkISize& pageSize, const SkISize& contentSize, fLastMarginContentEntry(NULL), fClipStack(NULL), fEncoder(NULL), - fRasterDpi(SkFloatToScalar(72.0f)) { + fRasterDpi(72.0f) { // Just report that PDF does not supports perspective in the // initial transform. NOT_IMPLEMENTED(initialTransform.hasPerspective(), true); @@ -776,7 +776,7 @@ SkPDFDevice::SkPDFDevice(const SkISize& layerSize, fLastMarginContentEntry(NULL), fClipStack(NULL), fEncoder(NULL), - fRasterDpi(SkFloatToScalar(72.0f)) { + fRasterDpi(72.0f) { fInitialTransform.reset(); this->init(); } diff --git a/src/pdf/SkPDFImage.cpp b/src/pdf/SkPDFImage.cpp index 37fff810c3..81adcc20d6 100644 --- a/src/pdf/SkPDFImage.cpp +++ b/src/pdf/SkPDFImage.cpp @@ -556,9 +556,9 @@ SkPDFImage::SkPDFImage(SkStream* stream, SkASSERT(!isAlpha); SkAutoTUnref<SkPDFInt> zeroVal(new SkPDFInt(0)); SkAutoTUnref<SkPDFScalar> scale5Val( - new SkPDFScalar(SkFloatToScalar(8.2258f))); // 255/2^5-1 + new SkPDFScalar(8.2258f)); // 255/2^5-1 SkAutoTUnref<SkPDFScalar> scale6Val( - new SkPDFScalar(SkFloatToScalar(4.0476f))); // 255/2^6-1 + new SkPDFScalar(4.0476f)); // 255/2^6-1 SkAutoTUnref<SkPDFArray> decodeValue(new SkPDFArray()); decodeValue->reserve(6); decodeValue->append(zeroVal.get()); diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp index 1d2f1fa78b..3c1a274887 100755 --- a/src/ports/SkFontHost_mac.cpp +++ b/src/ports/SkFontHost_mac.cpp @@ -273,7 +273,7 @@ static CGFloat ScalarToCG(SkScalar scalar) { static SkScalar CGToScalar(CGFloat cgFloat) { if (sizeof(CGFloat) == sizeof(float)) { - return SkFloatToScalar(cgFloat); + return cgFloat; } else { SkASSERT(sizeof(CGFloat) == sizeof(double)); return SkDoubleToScalar(cgFloat); @@ -1075,7 +1075,7 @@ static void build_power_table(uint8_t table[], float ee) { for (int i = 0; i < 256; i++) { float x = i / 255.f; x = sk_float_pow(x, ee); - int xx = SkScalarRoundToInt(SkFloatToScalar(x * 255)); + int xx = SkScalarRoundToInt(x * 255); table[i] = SkToU8(xx); } } @@ -1325,7 +1325,7 @@ void SkScalerContext_Mac::generatePath(const SkGlyph& glyph, SkPath* path) { fRec.getSingleMatrix(&m); // start out by assuming that we want no hining in X and Y - scaleX = scaleY = SkFloatToScalar(kScaleForSubPixelPositionHinting); + scaleX = scaleY = kScaleForSubPixelPositionHinting; // now see if we need to restore hinting for axis-aligned baselines switch (SkComputeAxisAlignmentForHText(m)) { case kX_SkAxisAlignment: diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp index 0aad4f8a22..aee2b863e6 100755 --- a/src/ports/SkFontHost_win.cpp +++ b/src/ports/SkFontHost_win.cpp @@ -1065,7 +1065,7 @@ static void build_power_table(uint8_t table[], float ee) { for (int i = 0; i < 256; i++) { float x = i / 255.f; x = sk_float_pow(x, ee); - int xx = SkScalarRound(SkFloatToScalar(x * 255)); + int xx = SkScalarRound(x * 255); table[i] = SkToU8(xx); } } diff --git a/src/ports/SkFontHost_win_dw.cpp b/src/ports/SkFontHost_win_dw.cpp index a3d1d17104..89e85b73a0 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 diff --git a/src/utils/SkCamera.cpp b/src/utils/SkCamera.cpp index a7c0b1483d..f5b51d5259 100644 --- a/src/utils/SkCamera.cpp +++ b/src/utils/SkCamera.cpp @@ -365,23 +365,23 @@ void Sk3DView::restore() { #ifdef SK_BUILD_FOR_ANDROID void Sk3DView::setCameraLocation(SkScalar x, SkScalar y, SkScalar z) { // the camera location is passed in inches, set in pt - SkScalar lz = z * SkFloatToScalar(72.0f); - fCamera.fLocation.set(x * SkFloatToScalar(72.0f), y * SkFloatToScalar(72.0f), lz); + SkScalar lz = z * 72.0f; + fCamera.fLocation.set(x * 72.0f, y * 72.0f, lz); fCamera.fObserver.set(0, 0, lz); fCamera.update(); } SkScalar Sk3DView::getCameraLocationX() { - return fCamera.fLocation.fX / SkFloatToScalar(72.0f); + return fCamera.fLocation.fX / 72.0f; } SkScalar Sk3DView::getCameraLocationY() { - return fCamera.fLocation.fY / SkFloatToScalar(72.0f); + return fCamera.fLocation.fY / 72.0f; } SkScalar Sk3DView::getCameraLocationZ() { - return fCamera.fLocation.fZ / SkFloatToScalar(72.0f); + return fCamera.fLocation.fZ / 72.0f; } #endif diff --git a/src/utils/SkPathUtils.cpp b/src/utils/SkPathUtils.cpp index 86b2f10434..fdca09aa63 100644 --- a/src/utils/SkPathUtils.cpp +++ b/src/utils/SkPathUtils.cpp @@ -55,7 +55,7 @@ static void Line2path_pixelCircle(SkPath* path, const char* line, if (GetBit(line,i)) { path->addCircle(i + SK_ScalarHalf, lineIdx + SK_ScalarHalf, - SkFloatToScalar(SQRT_2 / 2.0f)); + SQRT_2 / 2.0f); } } } diff --git a/src/utils/win/SkDWriteGeometrySink.cpp b/src/utils/win/SkDWriteGeometrySink.cpp index a12b514f7e..b7ef88ba3b 100644 --- a/src/utils/win/SkDWriteGeometrySink.cpp +++ b/src/utils/win/SkDWriteGeometrySink.cpp @@ -65,7 +65,7 @@ void STDMETHODCALLTYPE SkDWriteGeometrySink::SetSegmentFlags(D2D1_PATH_SEGMENT v } void STDMETHODCALLTYPE SkDWriteGeometrySink::BeginFigure(D2D1_POINT_2F startPoint, D2D1_FIGURE_BEGIN figureBegin) { - fPath->moveTo(SkFloatToScalar(startPoint.x), SkFloatToScalar(startPoint.y)); + fPath->moveTo(startPoint.x, startPoint.y); if (figureBegin == D2D1_FIGURE_BEGIN_HOLLOW) { SkDEBUGFAIL("Invalid D2D1_FIGURE_BEGIN value."); } @@ -73,7 +73,7 @@ void STDMETHODCALLTYPE SkDWriteGeometrySink::BeginFigure(D2D1_POINT_2F startPoin void STDMETHODCALLTYPE SkDWriteGeometrySink::AddLines(const D2D1_POINT_2F *points, UINT pointsCount) { for (const D2D1_POINT_2F *end = &points[pointsCount]; points < end; ++points) { - fPath->lineTo(SkFloatToScalar(points->x), SkFloatToScalar(points->y)); + fPath->lineTo(points->x, points->y); } } @@ -121,12 +121,12 @@ void STDMETHODCALLTYPE SkDWriteGeometrySink::AddBeziers(const D2D1_BEZIER_SEGMEN { beziers->point3.x, beziers->point3.y }, }; Quadratic quadratic; if (check_quadratic(cubic, quadratic)) { - fPath->quadTo(SkFloatToScalar(quadratic[1].x), SkFloatToScalar(quadratic[1].y), - SkFloatToScalar(quadratic[2].x), SkFloatToScalar(quadratic[2].y)); + fPath->quadTo(quadratic[1].x, quadratic[1].y, + quadratic[2].x, quadratic[2].y); } else { - fPath->cubicTo(SkFloatToScalar(beziers->point1.x), SkFloatToScalar(beziers->point1.y), - SkFloatToScalar(beziers->point2.x), SkFloatToScalar(beziers->point2.y), - SkFloatToScalar(beziers->point3.x), SkFloatToScalar(beziers->point3.y)); + fPath->cubicTo(beziers->point1.x, beziers->point1.y, + beziers->point2.x, beziers->point2.y, + beziers->point3.x, beziers->point3.y); } prevPt = beziers->point3; } diff --git a/src/views/SkTouchGesture.cpp b/src/views/SkTouchGesture.cpp index 3becccd8fc..9b02417771 100644 --- a/src/views/SkTouchGesture.cpp +++ b/src/views/SkTouchGesture.cpp @@ -50,7 +50,7 @@ static void unit_axis_align(SkVector* unit) { void SkFlingState::reset(float sx, float sy) { fActive = true; - fDirection.set(SkFloatToScalar(sx), SkFloatToScalar(sy)); + fDirection.set(sx, sy); fSpeed0 = SkPoint::Normalize(&fDirection); fSpeed0 = pin_max_fling(fSpeed0); fTime0 = getseconds(); @@ -82,7 +82,7 @@ bool SkFlingState::evaluateMatrix(SkMatrix* matrix) { tx = (float)sk_float_round2int(tx); ty = (float)sk_float_round2int(ty); } - matrix->setTranslate(SkFloatToScalar(tx), SkFloatToScalar(ty)); + matrix->setTranslate(tx, ty); // printf("---- evaluate (%g %g)\n", tx, ty); return true; @@ -182,7 +182,7 @@ int SkTouchGesture::findRec(void* owner) const { } static SkScalar center(float pos0, float pos1) { - return SkFloatToScalar((pos0 + pos1) * 0.5f); + return (pos0 + pos1) * 0.5f; } static const float MAX_ZOOM_SCALE = 4; diff --git a/tests/AAClipTest.cpp b/tests/AAClipTest.cpp index f70cfd679f..6c681913eb 100644 --- a/tests/AAClipTest.cpp +++ b/tests/AAClipTest.cpp @@ -386,10 +386,10 @@ static void test_regressions() { { SkAAClip clip; SkRect r; - r.fLeft = SkFloatToScalar(129.892181f); - r.fTop = SkFloatToScalar(10.3999996f); - r.fRight = SkFloatToScalar(130.892181f); - r.fBottom = SkFloatToScalar(20.3999996f); + r.fLeft = 129.892181f; + r.fTop = 10.3999996f; + r.fRight = 130.892181f; + r.fBottom = 20.3999996f; clip.setRect(r, true); } } diff --git a/tests/BlurTest.cpp b/tests/BlurTest.cpp index 9c40aa791c..a1eaca92b4 100644 --- a/tests/BlurTest.cpp +++ b/tests/BlurTest.cpp @@ -349,7 +349,7 @@ static void test_sigma_range(skiatest::Reporter* reporter, GrContextFactory* fac int groundTruthResult[kSize]; int bruteForce1DResult[kSize]; - SkScalar sigma = SkFloatToScalar(10.0f); + SkScalar sigma = 10.0f; for (int i = 0; i < 4; ++i, sigma /= 10) { diff --git a/tests/ClipCubicTest.cpp b/tests/ClipCubicTest.cpp index d19c22dc9c..82eeee3ef5 100644 --- a/tests/ClipCubicTest.cpp +++ b/tests/ClipCubicTest.cpp @@ -44,8 +44,8 @@ static bool CurvesAreEqual(const SkPoint c0[4], const SkPoint c1[4], float tol) { for (int i = 0; i < 4; i++) { - if (SkScalarAbs(c0[i].fX - c1[i].fX) > SkFloatToScalar(tol) || - SkScalarAbs(c0[i].fY - c1[i].fY) > SkFloatToScalar(tol) + if (SkScalarAbs(c0[i].fX - c1[i].fX) > tol || + SkScalarAbs(c0[i].fY - c1[i].fY) > tol ) { PrintCurve("c0", c0); PrintCurve("c1", c1); @@ -61,10 +61,10 @@ static SkPoint* SetCurve(float x0, float y0, float x2, float y2, float x3, float y3, SkPoint crv[4]) { - crv[0].fX = SkFloatToScalar(x0); crv[0].fY = SkFloatToScalar(y0); - crv[1].fX = SkFloatToScalar(x1); crv[1].fY = SkFloatToScalar(y1); - crv[2].fX = SkFloatToScalar(x2); crv[2].fY = SkFloatToScalar(y2); - crv[3].fX = SkFloatToScalar(x3); crv[3].fY = SkFloatToScalar(y3); + crv[0].fX = x0; crv[0].fY = y0; + crv[1].fX = x1; crv[1].fY = y1; + crv[2].fX = x2; crv[2].fY = y2; + crv[3].fX = x3; crv[3].fY = y3; return crv; } @@ -81,7 +81,7 @@ static void TestCubicClipping(skiatest::Reporter* reporter) { SkPoint clipped[4], shouldbe[4]; SkIRect clipRect; bool success; - const float tol = SkFloatToScalar(1e-4f); + const float tol = 1e-4f; // Test no clip, with plenty of room. clipRect.set(-2, -2, 6, 14); diff --git a/tests/ClipperTest.cpp b/tests/ClipperTest.cpp index b4eee60c01..a81e6559f9 100644 --- a/tests/ClipperTest.cpp +++ b/tests/ClipperTest.cpp @@ -22,8 +22,8 @@ static void test_hairclipping(skiatest::Reporter* reporter) { SkCanvas canvas(bm); canvas.clipRect(SkRect::MakeWH(SkIntToScalar(4), SkIntToScalar(2))); - canvas.drawLine(SkFloatToScalar(1.5f), SkFloatToScalar(1.5f), - SkFloatToScalar(3.5f), SkFloatToScalar(3.5f), paint); + canvas.drawLine(1.5f, 1.5f, + 3.5f, 3.5f, paint); /** * We had a bug where we misinterpreted the bottom of the clip, and @@ -52,10 +52,10 @@ static void test_edgeclipper() { SkEdgeClipper clipper; const SkPoint pts[] = { - { SkFloatToScalar(3.0995476e+010f), SkFloatToScalar(42.929779f) }, - { SkFloatToScalar(-3.0995163e+010f), SkFloatToScalar(51.050385f) }, - { SkFloatToScalar(-3.0995157e+010f), SkFloatToScalar(51.050392f) }, - { SkFloatToScalar(-3.0995134e+010f), SkFloatToScalar(51.050400f) }, + { 3.0995476e+010f, 42.929779f }, + { -3.0995163e+010f, 51.050385f }, + { -3.0995157e+010f, 51.050392f }, + { -3.0995134e+010f, 51.050400f }, }; const SkRect clip = { 0, 0, SkIntToScalar(300), SkIntToScalar(200) }; diff --git a/tests/DrawBitmapRectTest.cpp b/tests/DrawBitmapRectTest.cpp index ab667fdfae..4c6d634eb0 100644 --- a/tests/DrawBitmapRectTest.cpp +++ b/tests/DrawBitmapRectTest.cpp @@ -120,13 +120,13 @@ static void test_treatAsSprite(skiatest::Reporter* reporter) { size.set(500, 600); - const SkScalar tooMuchSubpixel = SkFloatToScalar(100.1f); + const SkScalar tooMuchSubpixel = 100.1f; mat.setTranslate(tooMuchSubpixel, 0); REPORTER_ASSERT(reporter, !treat_as_sprite(mat, size, bilerBits)); mat.setTranslate(0, tooMuchSubpixel); REPORTER_ASSERT(reporter, !treat_as_sprite(mat, size, bilerBits)); - const SkScalar tinySubPixel = SkFloatToScalar(100.02f); + const SkScalar tinySubPixel = 100.02f; mat.setTranslate(tinySubPixel, 0); REPORTER_ASSERT(reporter, treat_as_sprite(mat, size, bilerBits)); mat.setTranslate(0, tinySubPixel); @@ -181,12 +181,12 @@ static void test_wacky_bitmapshader(skiatest::Reporter* reporter, SkMatrix matrix; SkCanvas c(dev); - matrix.setAll(SkFloatToScalar(-119.34097f), - SkFloatToScalar(-43.436558f), - SkFloatToScalar(93489.945f), - SkFloatToScalar(43.436558f), - SkFloatToScalar(-119.34097f), - SkFloatToScalar(123.98426f), + matrix.setAll(-119.34097f, + -43.436558f, + 93489.945f, + 43.436558f, + -119.34097f, + 123.98426f, 0, 0, SK_Scalar1); c.concat(matrix); @@ -197,11 +197,11 @@ static void test_wacky_bitmapshader(skiatest::Reporter* reporter, SkShader* s = SkShader::CreateBitmapShader(bm, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode); - matrix.setAll(SkFloatToScalar(0.0078740157f), + matrix.setAll(0.0078740157f, 0, SkIntToScalar(249), 0, - SkFloatToScalar(0.0078740157f), + 0.0078740157f, SkIntToScalar(239), 0, 0, SK_Scalar1); s->setLocalMatrix(matrix); diff --git a/tests/DrawTextTest.cpp b/tests/DrawTextTest.cpp index 4f3eb829a1..b1bb19de65 100644 --- a/tests/DrawTextTest.cpp +++ b/tests/DrawTextTest.cpp @@ -80,8 +80,8 @@ static void test_drawText(skiatest::Reporter* reporter) { 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)); + SkPoint point = SkPoint::Make(25.0f + offsetX, + 25.0f + offsetY); for (int align = 0; align < SkPaint::kAlignCount; ++align) { paint.setTextAlign(static_cast<SkPaint::Align>(align)); diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp index 2328627d7c..69afe47c27 100644 --- a/tests/ImageFilterTest.cpp +++ b/tests/ImageFilterTest.cpp @@ -58,7 +58,7 @@ public: } static SkImageFilter* make_scale(float amount, SkImageFilter* input = NULL) { - SkScalar s = SkFloatToScalar(amount); + SkScalar s = amount; SkScalar matrix[20] = { s, 0, 0, 0, 0, 0, s, 0, 0, 0, 0, 0, s, 0, 0, @@ -70,10 +70,10 @@ public: static SkImageFilter* make_grayscale(SkImageFilter* input = NULL, const SkImageFilter::CropRect* cropRect = NULL) { SkScalar matrix[20]; memset(matrix, 0, 20 * sizeof(SkScalar)); - matrix[0] = matrix[5] = matrix[10] = SkFloatToScalar(0.2126f); - matrix[1] = matrix[6] = matrix[11] = SkFloatToScalar(0.7152f); - matrix[2] = matrix[7] = matrix[12] = SkFloatToScalar(0.0722f); - matrix[18] = SkFloatToScalar(1.0f); + matrix[0] = matrix[5] = matrix[10] = 0.2126f; + matrix[1] = matrix[6] = matrix[11] = 0.7152f; + matrix[2] = matrix[7] = matrix[12] = 0.0722f; + matrix[18] = 1.0f; SkAutoTUnref<SkColorFilter> filter(new SkColorMatrixFilter(matrix)); return SkColorFilterImageFilter::Create(filter, input, cropRect); } @@ -128,12 +128,12 @@ public: // 2 ) location and target at same value SkPoint3 target(location.fX, location.fY, location.fZ); // 3 ) large negative specular exponent value - SkScalar specularExponent = SkFloatToScalar(-1000); + SkScalar specularExponent = -1000; SkAutoTUnref<SkImageFilter> bmSrc(new SkBitmapSource(bitmap)); SkPaint paint; paint.setImageFilter(SkLightingImageFilter::CreateSpotLitSpecular( - location, target, specularExponent, SkFloatToScalar(180), + location, target, specularExponent, 180, 0xFFFFFFFF, SK_Scalar1, SK_Scalar1, SK_Scalar1, bmSrc))->unref(); SkCanvas canvas(result); @@ -144,7 +144,7 @@ public: { // This tests for scale bringing width to 0 - SkSize scale = SkSize::Make(SkFloatToScalar(-0.001f), SK_Scalar1); + SkSize scale = SkSize::Make(-0.001f, SK_Scalar1); SkAutoTUnref<SkImageFilter> bmSrc(new SkBitmapSource(bitmap)); SkAutoTUnref<SkBicubicImageFilter> bicubic( SkBicubicImageFilter::CreateMitchell(scale, bmSrc)); diff --git a/tests/LayerDrawLooperTest.cpp b/tests/LayerDrawLooperTest.cpp index 80f986f867..11ac48869f 100644 --- a/tests/LayerDrawLooperTest.cpp +++ b/tests/LayerDrawLooperTest.cpp @@ -42,7 +42,7 @@ static void test_frontToBack(skiatest::Reporter* reporter) { (void)looper->addLayer(layerInfo); // Add the back layer, with some layer info set. - layerInfo.fOffset.set(SkFloatToScalar(10.0f), SkFloatToScalar(20.0f)); + layerInfo.fOffset.set(10.0f, 20.0f); layerInfo.fPaintBits |= SkLayerDrawLooper::kXfermode_Bit; SkPaint* layerPaint = looper->addLayer(layerInfo); layerPaint->setXfermodeMode(SkXfermode::kSrc_Mode); @@ -55,17 +55,17 @@ static void test_frontToBack(skiatest::Reporter* reporter) { // The back layer should come first. REPORTER_ASSERT(reporter, looper->next(&canvas, &paint)); REPORTER_ASSERT(reporter, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrc_Mode)); - canvas.drawRect(SkRect::MakeWH(SkFloatToScalar(50.0f), SkFloatToScalar(50.0f)), paint); - REPORTER_ASSERT(reporter, SkFloatToScalar(10.0f) == device.fLastMatrix.getTranslateX()); - REPORTER_ASSERT(reporter, SkFloatToScalar(20.0f) == device.fLastMatrix.getTranslateY()); + canvas.drawRect(SkRect::MakeWH(50.0f, 50.0f), paint); + REPORTER_ASSERT(reporter, 10.0f == device.fLastMatrix.getTranslateX()); + REPORTER_ASSERT(reporter, 20.0f == device.fLastMatrix.getTranslateY()); paint.reset(); // Then the front layer. REPORTER_ASSERT(reporter, looper->next(&canvas, &paint)); REPORTER_ASSERT(reporter, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrcOver_Mode)); - canvas.drawRect(SkRect::MakeWH(SkFloatToScalar(50.0f), SkFloatToScalar(50.0f)), paint); - REPORTER_ASSERT(reporter, SkFloatToScalar(0.0f) == device.fLastMatrix.getTranslateX()); - REPORTER_ASSERT(reporter, SkFloatToScalar(0.0f) == device.fLastMatrix.getTranslateY()); + canvas.drawRect(SkRect::MakeWH(50.0f, 50.0f), paint); + REPORTER_ASSERT(reporter, 0.0f == device.fLastMatrix.getTranslateX()); + REPORTER_ASSERT(reporter, 0.0f == device.fLastMatrix.getTranslateY()); // Only two layers were added, so that should be the end. REPORTER_ASSERT(reporter, !looper->next(&canvas, &paint)); @@ -79,7 +79,7 @@ static void test_backToFront(skiatest::Reporter* reporter) { (void)looper->addLayerOnTop(layerInfo); // Add the front layer, with some layer info set. - layerInfo.fOffset.set(SkFloatToScalar(10.0f), SkFloatToScalar(20.0f)); + layerInfo.fOffset.set(10.0f, 20.0f); layerInfo.fPaintBits |= SkLayerDrawLooper::kXfermode_Bit; SkPaint* layerPaint = looper->addLayerOnTop(layerInfo); layerPaint->setXfermodeMode(SkXfermode::kSrc_Mode); @@ -92,17 +92,17 @@ static void test_backToFront(skiatest::Reporter* reporter) { // The back layer should come first. REPORTER_ASSERT(reporter, looper->next(&canvas, &paint)); REPORTER_ASSERT(reporter, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrcOver_Mode)); - canvas.drawRect(SkRect::MakeWH(SkFloatToScalar(50.0f), SkFloatToScalar(50.0f)), paint); - REPORTER_ASSERT(reporter, SkFloatToScalar(0.0f) == device.fLastMatrix.getTranslateX()); - REPORTER_ASSERT(reporter, SkFloatToScalar(0.0f) == device.fLastMatrix.getTranslateY()); + canvas.drawRect(SkRect::MakeWH(50.0f, 50.0f), paint); + REPORTER_ASSERT(reporter, 0.0f == device.fLastMatrix.getTranslateX()); + REPORTER_ASSERT(reporter, 0.0f == device.fLastMatrix.getTranslateY()); paint.reset(); // Then the front layer. REPORTER_ASSERT(reporter, looper->next(&canvas, &paint)); REPORTER_ASSERT(reporter, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrc_Mode)); - canvas.drawRect(SkRect::MakeWH(SkFloatToScalar(50.0f), SkFloatToScalar(50.0f)), paint); - REPORTER_ASSERT(reporter, SkFloatToScalar(10.0f) == device.fLastMatrix.getTranslateX()); - REPORTER_ASSERT(reporter, SkFloatToScalar(20.0f) == device.fLastMatrix.getTranslateY()); + canvas.drawRect(SkRect::MakeWH(50.0f, 50.0f), paint); + REPORTER_ASSERT(reporter, 10.0f == device.fLastMatrix.getTranslateX()); + REPORTER_ASSERT(reporter, 20.0f == device.fLastMatrix.getTranslateY()); // Only two layers were added, so that should be the end. REPORTER_ASSERT(reporter, !looper->next(&canvas, &paint)); @@ -116,7 +116,7 @@ static void test_mixed(skiatest::Reporter* reporter) { (void)looper->addLayer(layerInfo); // Add the front layer, with some layer info set. - layerInfo.fOffset.set(SkFloatToScalar(10.0f), SkFloatToScalar(20.0f)); + layerInfo.fOffset.set(10.0f, 20.0f); layerInfo.fPaintBits |= SkLayerDrawLooper::kXfermode_Bit; SkPaint* layerPaint = looper->addLayerOnTop(layerInfo); layerPaint->setXfermodeMode(SkXfermode::kSrc_Mode); @@ -129,17 +129,17 @@ static void test_mixed(skiatest::Reporter* reporter) { // The back layer should come first. REPORTER_ASSERT(reporter, looper->next(&canvas, &paint)); REPORTER_ASSERT(reporter, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrcOver_Mode)); - canvas.drawRect(SkRect::MakeWH(SkFloatToScalar(50.0f), SkFloatToScalar(50.0f)), paint); - REPORTER_ASSERT(reporter, SkFloatToScalar(0.0f) == device.fLastMatrix.getTranslateX()); - REPORTER_ASSERT(reporter, SkFloatToScalar(0.0f) == device.fLastMatrix.getTranslateY()); + canvas.drawRect(SkRect::MakeWH(50.0f, 50.0f), paint); + REPORTER_ASSERT(reporter, 0.0f == device.fLastMatrix.getTranslateX()); + REPORTER_ASSERT(reporter, 0.0f == device.fLastMatrix.getTranslateY()); paint.reset(); // Then the front layer. REPORTER_ASSERT(reporter, looper->next(&canvas, &paint)); REPORTER_ASSERT(reporter, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrc_Mode)); - canvas.drawRect(SkRect::MakeWH(SkFloatToScalar(50.0f), SkFloatToScalar(50.0f)), paint); - REPORTER_ASSERT(reporter, SkFloatToScalar(10.0f) == device.fLastMatrix.getTranslateX()); - REPORTER_ASSERT(reporter, SkFloatToScalar(20.0f) == device.fLastMatrix.getTranslateY()); + canvas.drawRect(SkRect::MakeWH(50.0f, 50.0f), paint); + REPORTER_ASSERT(reporter, 10.0f == device.fLastMatrix.getTranslateX()); + REPORTER_ASSERT(reporter, 20.0f == device.fLastMatrix.getTranslateY()); // Only two layers were added, so that should be the end. REPORTER_ASSERT(reporter, !looper->next(&canvas, &paint)); diff --git a/tests/MathTest.cpp b/tests/MathTest.cpp index cfb96ad8bb..f5c61cbeb8 100644 --- a/tests/MathTest.cpp +++ b/tests/MathTest.cpp @@ -144,7 +144,7 @@ static void test_blend31() { float f = float_blend(src, dst, a / 31.f); int r1 = (int)f; - int r2 = SkScalarRoundToInt(SkFloatToScalar(f)); + int r2 = SkScalarRoundToInt(f); if (r0 != r1 && r0 != r2) { SkDebugf("src:%d dst:%d a:%d result:%d float:%g\n", @@ -168,7 +168,7 @@ static void test_blend(skiatest::Reporter* reporter) { for (int a = 0; a <= 255; a++) { int r0 = SkAlphaBlend255(src, dst, a); float f1 = float_blend(src, dst, a / 255.f); - int r1 = SkScalarRoundToInt(SkFloatToScalar(f1)); + int r1 = SkScalarRoundToInt(f1); if (r0 != r1) { float diff = sk_float_abs(f1 - r1); diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp index 045c2d22e4..03c93d44c9 100644 --- a/tests/PaintTest.cpp +++ b/tests/PaintTest.cpp @@ -193,14 +193,14 @@ static void regression_cubic(skiatest::Reporter* reporter) { SkPath path, stroke; SkPaint paint; - path.moveTo(SkFloatToScalar(460.2881309415525f), - SkFloatToScalar(303.250847066498f)); - path.cubicTo(SkFloatToScalar(463.36378422175284f), - SkFloatToScalar(302.1169735073363f), - SkFloatToScalar(456.32239330810046f), - SkFloatToScalar(304.720354932878f), - SkFloatToScalar(453.15255460013304f), - SkFloatToScalar(305.788586869862f)); + path.moveTo(460.2881309415525f, + 303.250847066498f); + path.cubicTo(463.36378422175284f, + 302.1169735073363f, + 456.32239330810046f, + 304.720354932878f, + 453.15255460013304f, + 305.788586869862f); SkRect fillR, strokeR; fillR = path.getBounds(); @@ -225,13 +225,13 @@ static void regression_cubic(skiatest::Reporter* reporter) { static void regression_measureText(skiatest::Reporter* reporter) { SkPaint paint; - paint.setTextSize(SkFloatToScalar(12.0f)); + paint.setTextSize(12.0f); SkRect r; r.setLTRB(SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN); // test that the rect was reset - paint.measureText("", 0, &r, SkFloatToScalar(1.0f)); + paint.measureText("", 0, &r, 1.0f); REPORTER_ASSERT(reporter, r.isEmpty()); } diff --git a/tests/ParsePathTest.cpp b/tests/ParsePathTest.cpp index c91186005a..4d0fdba2b8 100644 --- a/tests/ParsePathTest.cpp +++ b/tests/ParsePathTest.cpp @@ -34,8 +34,8 @@ static struct { { "", { 0, 0, 0, 0 } }, { "M0,0L10,10", { 0, 0, SkIntToScalar(10), SkIntToScalar(10) } }, { "M-5.5,-0.5 Q 0 0 6,6.50", - { SkFloatToScalar(-5.5f), SkFloatToScalar(-0.5f), - SkFloatToScalar(6), SkFloatToScalar(6.5f) } } + { -5.5f, -0.5f, + 6, 6.5f } } }; static void TestParsePath(skiatest::Reporter* reporter) { @@ -51,13 +51,13 @@ static void TestParsePath(skiatest::Reporter* reporter) { } SkRect r; - r.set(0, 0, SkFloatToScalar(10), SkFloatToScalar(10.5f)); + r.set(0, 0, 10, 10.5f); SkPath p; p.addRect(r); test_to_from(reporter, p); p.addOval(r); test_to_from(reporter, p); - p.addRoundRect(r, SkFloatToScalar(4), SkFloatToScalar(4.5f)); + p.addRoundRect(r, 4, 4.5f); test_to_from(reporter, p); } diff --git a/tests/PathMeasureTest.cpp b/tests/PathMeasureTest.cpp index 4c26bc17cd..c9acb7ea00 100644 --- a/tests/PathMeasureTest.cpp +++ b/tests/PathMeasureTest.cpp @@ -51,7 +51,7 @@ static void test_small_segment() { const SkPoint pts[] = { { 100000, 100000}, // big jump between these points, makes a big segment - { SkFloatToScalar(1.0005f), SkFloatToScalar(0.9999f) }, + { 1.0005f, 0.9999f }, // tiny (non-zero) jump between these points { SK_Scalar1, SK_Scalar1 }, }; @@ -123,7 +123,7 @@ static void TestPathMeasure(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, SkScalarNearlyEqual(position.fX, -SK_ScalarHalf, - SkFloatToScalar(0.0001f))); + 0.0001f)); REPORTER_ASSERT(reporter, position.fY == 0); REPORTER_ASSERT(reporter, tangent.fX == -SK_Scalar1); REPORTER_ASSERT(reporter, tangent.fY == 0); @@ -148,26 +148,26 @@ static void TestPathMeasure(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, SkScalarNearlyEqual(position.fX, SK_ScalarHalf, - SkFloatToScalar(0.0001f))); + 0.0001f)); REPORTER_ASSERT(reporter, position.fY == 0); REPORTER_ASSERT(reporter, tangent.fX == SK_Scalar1); REPORTER_ASSERT(reporter, tangent.fY == 0); - REPORTER_ASSERT(reporter, meas.getPosTan(SkFloatToScalar(2.5f), &position, &tangent)); + REPORTER_ASSERT(reporter, meas.getPosTan(2.5f, &position, &tangent)); REPORTER_ASSERT(reporter, - SkScalarNearlyEqual(position.fX, SK_Scalar1, SkFloatToScalar(0.0001f))); + SkScalarNearlyEqual(position.fX, SK_Scalar1, 0.0001f)); REPORTER_ASSERT(reporter, - SkScalarNearlyEqual(position.fY, SkFloatToScalar(1.5f))); + SkScalarNearlyEqual(position.fY, 1.5f)); REPORTER_ASSERT(reporter, tangent.fX == 0); REPORTER_ASSERT(reporter, tangent.fY == SK_Scalar1); - REPORTER_ASSERT(reporter, meas.getPosTan(SkFloatToScalar(4.5f), &position, &tangent)); + REPORTER_ASSERT(reporter, meas.getPosTan(4.5f, &position, &tangent)); REPORTER_ASSERT(reporter, SkScalarNearlyEqual(position.fX, - SkFloatToScalar(2.5f), - SkFloatToScalar(0.0001f))); + 2.5f, + 0.0001f)); REPORTER_ASSERT(reporter, SkScalarNearlyEqual(position.fY, - SkFloatToScalar(2.0f), - SkFloatToScalar(0.0001f))); + 2.0f, + 0.0001f)); REPORTER_ASSERT(reporter, tangent.fX == SK_Scalar1); REPORTER_ASSERT(reporter, tangent.fY == 0); @@ -184,7 +184,7 @@ static void TestPathMeasure(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, SkScalarNearlyEqual(position.fX, SK_ScalarHalf, - SkFloatToScalar(0.0001f))); + 0.0001f)); REPORTER_ASSERT(reporter, position.fY == 0); REPORTER_ASSERT(reporter, tangent.fX == SK_Scalar1); REPORTER_ASSERT(reporter, tangent.fY == 0); @@ -194,12 +194,12 @@ static void TestPathMeasure(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, meas.getPosTan(SK_ScalarHalf, &position, &tangent)); REPORTER_ASSERT(reporter, SkScalarNearlyEqual(position.fX, - SkFloatToScalar(1.5f), - SkFloatToScalar(0.0001f))); + 1.5f, + 0.0001f)); REPORTER_ASSERT(reporter, SkScalarNearlyEqual(position.fY, - SkFloatToScalar(2.0f), - SkFloatToScalar(0.0001f))); + 2.0f, + 0.0001f)); REPORTER_ASSERT(reporter, tangent.fX == -SK_Scalar1); REPORTER_ASSERT(reporter, tangent.fY == 0); diff --git a/tests/PathOpsOpTest.cpp b/tests/PathOpsOpTest.cpp index 080aaada3c..e083ac57ae 100644 --- a/tests/PathOpsOpTest.cpp +++ b/tests/PathOpsOpTest.cpp @@ -1151,19 +1151,19 @@ SkPathOp ops[] = { }; static void rRect1(skiatest::Reporter* reporter) { - SkScalar xA = SkFloatToScalar(0.65f); - SkScalar xB = SkFloatToScalar(10.65f); - SkScalar xC = SkFloatToScalar(20.65f); - SkScalar xD = SkFloatToScalar(30.65f); - SkScalar xE = SkFloatToScalar(40.65f); - SkScalar xF = SkFloatToScalar(50.65f); - - SkScalar yA = SkFloatToScalar(0.65f); - SkScalar yB = SkFloatToScalar(10.65f); - SkScalar yC = SkFloatToScalar(20.65f); - SkScalar yD = SkFloatToScalar(30.65f); - SkScalar yE = SkFloatToScalar(40.65f); - SkScalar yF = SkFloatToScalar(50.65f); + SkScalar xA = 0.65f; + SkScalar xB = 10.65f; + SkScalar xC = 20.65f; + SkScalar xD = 30.65f; + SkScalar xE = 40.65f; + SkScalar xF = 50.65f; + + SkScalar yA = 0.65f; + SkScalar yB = 10.65f; + SkScalar yC = 20.65f; + SkScalar yD = 30.65f; + SkScalar yE = 40.65f; + SkScalar yF = 50.65f; SkPath paths[5]; SkRect rects[5]; rects[0].set(xB, yB, xE, yE); diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp index 18d50d005d..131e40ba45 100644 --- a/tests/PathTest.cpp +++ b/tests/PathTest.cpp @@ -833,7 +833,7 @@ static void test_direction(skiatest::Reporter* reporter) { // triangle with one point really far from the origin. path.reset(); // the first point is roughly 1.05e10, 1.05e10 - path.moveTo(SkFloatToScalar(SkBits2Float(0x501c7652)), SkFloatToScalar(SkBits2Float(0x501c7652))); + path.moveTo(SkBits2Float(0x501c7652), SkBits2Float(0x501c7652)); path.lineTo(110 * SK_Scalar1, -10 * SK_Scalar1); path.lineTo(-10 * SK_Scalar1, 60 * SK_Scalar1); check_direction(reporter, path, SkPath::kCCW_Direction); @@ -1274,10 +1274,10 @@ static void test_conservativelyContains(skiatest::Reporter* reporter) { {kBaseRect, true, true, false, false}, // rect well inside of kBaseRect - {SkRect::MakeLTRB(kBaseRect.fLeft + SkFloatToScalar(0.25f)*kBaseRect.width(), - kBaseRect.fTop + SkFloatToScalar(0.25f)*kBaseRect.height(), - kBaseRect.fRight - SkFloatToScalar(0.25f)*kBaseRect.width(), - kBaseRect.fBottom - SkFloatToScalar(0.25f)*kBaseRect.height()), + {SkRect::MakeLTRB(kBaseRect.fLeft + 0.25f*kBaseRect.width(), + kBaseRect.fTop + 0.25f*kBaseRect.height(), + kBaseRect.fRight - 0.25f*kBaseRect.width(), + kBaseRect.fBottom - 0.25f*kBaseRect.height()), true, true, true, true}, // rects with edges off by one from kBaseRect's edges @@ -1382,7 +1382,7 @@ static void test_conservativelyContains(skiatest::Reporter* reporter) { // Slightly non-convex shape, shouldn't contain any rects. path.reset(); path.moveTo(0, 0); - path.lineTo(SkIntToScalar(50), SkFloatToScalar(0.05f)); + path.lineTo(SkIntToScalar(50), 0.05f); path.lineTo(SkIntToScalar(100), 0); path.lineTo(SkIntToScalar(100), SkIntToScalar(100)); path.lineTo(0, SkIntToScalar(100)); @@ -2962,13 +2962,13 @@ static void test_arcTo(skiatest::Reporter* reporter) { p.arcTo(oval, 360, 0, false); check_path_is_move_and_reset(reporter, &p, oval.fRight, oval.centerY()); for (float sweep = 359, delta = 0.5f; sweep != (float) (sweep + delta); ) { - p.arcTo(oval, 0, SkFloatToScalar(sweep), false); + p.arcTo(oval, 0, sweep, false); REPORTER_ASSERT(reporter, p.getBounds() == oval); sweep += delta; delta /= 2; } for (float sweep = 361, delta = 0.5f; sweep != (float) (sweep - delta);) { - p.arcTo(oval, 0, SkFloatToScalar(sweep), false); + p.arcTo(oval, 0, sweep, false); REPORTER_ASSERT(reporter, p.getBounds() == oval); sweep -= delta; delta /= 2; diff --git a/tests/PointTest.cpp b/tests/PointTest.cpp index 9f91c47c1c..d4b9128b3e 100644 --- a/tests/PointTest.cpp +++ b/tests/PointTest.cpp @@ -84,7 +84,7 @@ static float force_as_float(skiatest::Reporter* reporter, float value) { // test that we handle very large values correctly. i.e. that we can // successfully normalize something whose mag overflows a float. static void test_overflow(skiatest::Reporter* reporter) { - SkScalar bigFloat = get_value(reporter, SkFloatToScalar(3.4e38f)); + SkScalar bigFloat = get_value(reporter, 3.4e38f); SkPoint pt = { bigFloat, bigFloat }; SkScalar length = pt.length(); @@ -107,7 +107,7 @@ static void test_overflow(skiatest::Reporter* reporter) { // test that we handle very small values correctly. i.e. that we can // report failure if we try to normalize them. static void test_underflow(skiatest::Reporter* reporter) { - SkPoint pt = { SkFloatToScalar(1.0e-37f), SkFloatToScalar(1.0e-37f) }; + SkPoint pt = { 1.0e-37f, 1.0e-37f }; SkPoint copy = pt; REPORTER_ASSERT(reporter, 0 == SkPoint::Normalize(&pt)); @@ -127,7 +127,7 @@ DEF_TEST(Point, reporter) { SkScalar fLength; } gRec[] = { { SkIntToScalar(3), SkIntToScalar(4), SkIntToScalar(5) }, - { SkFloatToScalar(0.6f), SkFloatToScalar(0.8f), SK_Scalar1 }, + { 0.6f, 0.8f, SK_Scalar1 }, }; for (size_t i = 0; i < SK_ARRAY_COUNT(gRec); ++i) { diff --git a/tests/RoundRectTest.cpp b/tests/RoundRectTest.cpp index 95e455d29b..7cadf01871 100644 --- a/tests/RoundRectTest.cpp +++ b/tests/RoundRectTest.cpp @@ -9,8 +9,8 @@ #include "SkMatrix.h" #include "SkRRect.h" -static const SkScalar kWidth = SkFloatToScalar(100.0f); -static const SkScalar kHeight = SkFloatToScalar(100.0f); +static const SkScalar kWidth = 100.0f; +static const SkScalar kHeight = 100.0f; static void test_inset(skiatest::Reporter* reporter) { SkRRect rr, rr2; @@ -510,7 +510,7 @@ static void test_transform_helper(skiatest::Reporter* reporter, const SkRRect& o // Scale in both directions. SkScalar xScale = SkIntToScalar(3); - SkScalar yScale = SkFloatToScalar(3.2f); + SkScalar yScale = 3.2f; matrix.reset(); matrix.setScaleX(xScale); matrix.setScaleY(yScale); diff --git a/tests/TileGridTest.cpp b/tests/TileGridTest.cpp index 8f5b18a6e9..5cffd3aefe 100644 --- a/tests/TileGridTest.cpp +++ b/tests/TileGridTest.cpp @@ -86,7 +86,7 @@ public: { SkBitmapDevice device(store); MockCanvas mockCanvas(&device); - mockCanvas.translate(SkFloatToScalar(-7.99f), SkFloatToScalar(-7.99f)); + mockCanvas.translate(-7.99f, -7.99f); picture.draw(&mockCanvas); REPORTER_ASSERT(reporter, 1 == mockCanvas.fRects.count()); REPORTER_ASSERT(reporter, rect1 == mockCanvas.fRects[0]); @@ -95,7 +95,7 @@ public: { SkBitmapDevice device(store); MockCanvas mockCanvas(&device); - mockCanvas.translate(SkFloatToScalar(-9.5f), SkFloatToScalar(-9.5f)); + mockCanvas.translate(-9.5f, -9.5f); picture.draw(&mockCanvas); REPORTER_ASSERT(reporter, 2 == mockCanvas.fRects.count()); REPORTER_ASSERT(reporter, rect1 == mockCanvas.fRects[0]); @@ -105,7 +105,7 @@ public: { SkBitmapDevice device(store); MockCanvas mockCanvas(&device); - mockCanvas.translate(SkFloatToScalar(-16.0f), SkFloatToScalar(-16.0f)); + mockCanvas.translate(-16.0f, -16.0f); picture.draw(&mockCanvas); REPORTER_ASSERT(reporter, 1 == mockCanvas.fRects.count()); REPORTER_ASSERT(reporter, rect2 == mockCanvas.fRects[0]); @@ -114,7 +114,7 @@ public: { SkBitmapDevice device(store); MockCanvas mockCanvas(&device); - mockCanvas.translate(SkFloatToScalar(2.0f), SkFloatToScalar(0.0f)); + mockCanvas.translate(2.0f, 0.0f); picture.draw(&mockCanvas); REPORTER_ASSERT(reporter, 1 == mockCanvas.fRects.count()); REPORTER_ASSERT(reporter, rect1 == mockCanvas.fRects[0]); @@ -122,7 +122,7 @@ public: { SkBitmapDevice device(store); MockCanvas mockCanvas(&device); - mockCanvas.translate(SkFloatToScalar(0.0f), SkFloatToScalar(2.0f)); + mockCanvas.translate(0.0f, 2.0f); picture.draw(&mockCanvas); REPORTER_ASSERT(reporter, 1 == mockCanvas.fRects.count()); REPORTER_ASSERT(reporter, rect1 == mockCanvas.fRects[0]); @@ -130,7 +130,7 @@ public: { SkBitmapDevice device(store); MockCanvas mockCanvas(&device); - mockCanvas.translate(SkFloatToScalar(-22.0f), SkFloatToScalar(-16.0f)); + mockCanvas.translate(-22.0f, -16.0f); picture.draw(&mockCanvas); REPORTER_ASSERT(reporter, 1 == mockCanvas.fRects.count()); REPORTER_ASSERT(reporter, rect2 == mockCanvas.fRects[0]); @@ -138,7 +138,7 @@ public: { SkBitmapDevice device(store); MockCanvas mockCanvas(&device); - mockCanvas.translate(SkFloatToScalar(-16.0f), SkFloatToScalar(-22.0f)); + mockCanvas.translate(-16.0f, -22.0f); picture.draw(&mockCanvas); REPORTER_ASSERT(reporter, 1 == mockCanvas.fRects.count()); REPORTER_ASSERT(reporter, rect2 == mockCanvas.fRects[0]); @@ -211,7 +211,7 @@ public: { SkBitmapDevice device(tileBitmap); MockCanvas mockCanvas(&device); - mockCanvas.translate(SkFloatToScalar(-7.9f), SkFloatToScalar(-7.9f)); + mockCanvas.translate(-7.9f, -7.9f); picture.draw(&mockCanvas); REPORTER_ASSERT(reporter, 2 == mockCanvas.fRects.count()); REPORTER_ASSERT(reporter, rect1 == mockCanvas.fRects[0]); @@ -220,7 +220,7 @@ public: { SkBitmapDevice device(tileBitmap); MockCanvas mockCanvas(&device); - mockCanvas.translate(SkFloatToScalar(-8.1f), SkFloatToScalar(-8.1f)); + mockCanvas.translate(-8.1f, -8.1f); picture.draw(&mockCanvas); REPORTER_ASSERT(reporter, 2 == mockCanvas.fRects.count()); REPORTER_ASSERT(reporter, rect2 == mockCanvas.fRects[0]); @@ -232,7 +232,7 @@ public: // adjusted region, sitting right on top of the tile boundary. SkBitmapDevice device(tinyBitmap); MockCanvas mockCanvas(&device); - mockCanvas.translate(SkFloatToScalar(-8.0f), SkFloatToScalar(-8.0f)); + mockCanvas.translate(-8.0f, -8.0f); picture.draw(&mockCanvas); // This test passes by not asserting. We do not validate the rects recorded // because the result is numerically unstable (floating point equality). |