Fix some fixed-point bugs.

Fix some fixed-point bugs.

Committed: https://code.google.com/p/skia/source/detail?r=3714

[bungeman, 2012-04-17 21:36:38]

I'm having trouble getting to the codereview site at the moment, but the
diff in the email LGTM.

On Tue, Apr 17, 2012 at 5:32 PM, <vandebo@chromium.org> wrote:

> Reviewers: bungeman,
>
> Description:
> Fix some fixed-point bugs.
>
>
> Please review this at
https://codereview.appspot.**com/6047046/<https://codereview.appspot.com/6047...
>
> Affected files:
>  M gm/gammatext.cpp
>  M gm/shaderbounds.cpp
>  M src/pdf/SkPDFShader.cpp
>
>
> Index: gm/gammatext.cpp
> diff --git a/gm/gammatext.cpp b/gm/gammatext.cpp
> index 6f1c298c6927edb129363c229be042**b56152373d..**
> 9a24d792c33b6bb5b2cbaae77b473d**27e11dbbbc 100644
> --- a/gm/gammatext.cpp
> +++ b/gm/gammatext.cpp
> @@ -124,7 +124,7 @@ protected:
>     }
>
>     static void drawGrad(SkCanvas* canvas) {
> -        SkPoint pts[] = { { 0, 0 }, { 0, HEIGHT } };
> +        SkPoint pts[] = { { 0, 0 }, { 0, SkIntToScalar(HEIGHT) } };
>  #if 0
>         const SkColor colors[] = { SK_ColorBLACK, SK_ColorWHITE };
>         SkShader* s = SkGradientShader::**CreateLinear(pts, colors, NULL,
> 2, SkShader::kClamp_TileMode);
> @@ -135,7 +135,7 @@ protected:
>         canvas->clear(SK_ColorRED);
>         SkPaint paint;
>         paint.setShader(s)->unref();
> -        SkRect r = { 0, 0, 1024, HEIGHT };
> +        SkRect r = { 0, 0, SkIntToScalar(1024), SkIntToScalar(HEIGHT) };
>         canvas->drawRect(r, paint);
>     }
>
> @@ -162,17 +162,17 @@ protected:
>         paint.setAntiAlias(true);
>         paint.setLCDRenderText(true);
>
> -        SkScalar x = 10;
> +        SkScalar x = SkIntToScalar(10);
>         for (size_t i = 0; i < SK_ARRAY_COUNT(fg); ++i) {
>             paint.setColor(fg[i]);
>
> -            SkScalar y = 40;
> -            SkScalar stopy = HEIGHT;
> +            SkScalar y = SkIntToScalar(40);
> +            SkScalar stopy = SkIntToScalar(HEIGHT);
>             while (y < stopy) {
>  #if 1
>                 canvas->drawText(text, len, x, y, paint);
>  #else
> -                cgDrawText(cg, text, len, x, HEIGHT - y, paint);
> +                cgDrawText(cg, text, len, x, SkIntToScalar(HEIGHT) - y,
> paint);
>  #endif
>                 y += paint.getTextSize() * 2;
>             }
> Index: gm/shaderbounds.cpp
> diff --git a/gm/shaderbounds.cpp b/gm/shaderbounds.cpp
> index ee08ce643d107c46cf95aa389eb842**3ea184c13b..**
> 9529151c5f6ef4afe066318a9d34e4**e303579bde 100644
> --- a/gm/shaderbounds.cpp
> +++ b/gm/shaderbounds.cpp
> @@ -78,8 +78,8 @@ protected:
>         if (background) {
>             scale = SkFloatToScalar(0.6f);
>         }
> -        SkScalar shaderWidth = SkIntToScalar(width)/scale;
> -        SkScalar shaderHeight = SkIntToScalar(height)/scale;
> +        SkScalar shaderWidth = SkScalarDiv(SkIntToScalar(**width),
> scale);
> +        SkScalar shaderHeight = SkScalarDiv(SkIntToScalar(**height),
> scale);
>         SkShader* shader = fShaderMaker(shaderWidth, shaderHeight,
> background);
>         SkMatrix shaderScale;
>         shaderScale.setScale(scale, scale);
> Index: src/pdf/SkPDFShader.cpp
> diff --git a/src/pdf/SkPDFShader.cpp b/src/pdf/SkPDFShader.cpp
> index 3a559ba3d3a3de2070ec07181d4a41**4d5b0aa79a..**
> 2c3bfd0b566377575efad55faaa143**f6fcf3d075 100644
> --- a/src/pdf/SkPDFShader.cpp
> +++ b/src/pdf/SkPDFShader.cpp
> @@ -452,7 +452,7 @@
SkPDFFunctionShader::**SkPDFFunctionShader(**SkPDFShader::State*
> state)
>         }
>         case SkShader::kSweep_GradientType:
>             transformPoints[1] = transformPoints[0];
> -            transformPoints[1].fX += 1;
> +            transformPoints[1].fX += SK_Scalar1;
>             codeFunction = &sweepCode;
>             break;
>         case SkShader::kColor_GradientType:
>
>
>

[reed1, 2012-04-18 11:57:46]

https://codereview.appspot.com/6047046/diff/1/gm/gammatext.cpp
File gm/gammatext.cpp (right):

https://codereview.appspot.com/6047046/diff/1/gm/gammatext.cpp#newcode174
gm/gammatext.cpp:174: #else
cgDrawText is defined to take floats, not scalars, so HEIGHT is just fine as is.