diff options
| author |  reed <reed@google.com> | 2015-05-12 09:47:22 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-05-12 09:47:22 -0700 |
| commit | 67d71c898249a7af3523b16c6a69895a63bfae0a (patch) | |
| tree | 718e9b0eb395ffd67ec0e1bcf3074f0289f89600 /src/pdf | |
| parent | 7da2e55ccbad4868a455c1c9f23e5f63bd99e916 (diff) | |
stop calling SkScalarDiv
BUG=skia:
TBR=
Review URL: https://codereview.chromium.org/1135053002
Diffstat (limited to 'src/pdf')
| -rw-r--r-- | src/pdf/SkPDFDevice.cpp | 11 | ||||
| -rw-r--r-- | src/pdf/SkPDFGraphicState.cpp | 2 | ||||
| -rw-r--r-- | src/pdf/SkPDFShader.cpp | 4 |
3 files changed, 7 insertions, 10 deletions
diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp index 814504e5e8..3b0d6f72ae 100644 --- a/src/pdf/SkPDFDevice.cpp +++ b/src/pdf/SkPDFDevice.cpp @@ -39,15 +39,12 @@ static void emit_pdf_color(SkColor color, SkWStream* result) { SkASSERT(SkColorGetA(color) == 0xFF); // We handle alpha elsewhere. - SkScalar colorMax = SkIntToScalar(0xFF); - SkPDFUtils::AppendScalar( - SkScalarDiv(SkIntToScalar(SkColorGetR(color)), colorMax), result); + SkScalar colorScale = SkScalarInvert(0xFF); + SkPDFUtils::AppendScalar(SkColorGetR(color) * colorScale, result); result->writeText(" "); - SkPDFUtils::AppendScalar( - SkScalarDiv(SkIntToScalar(SkColorGetG(color)), colorMax), result); + SkPDFUtils::AppendScalar(SkColorGetG(color) * colorScale, result); result->writeText(" "); - SkPDFUtils::AppendScalar( - SkScalarDiv(SkIntToScalar(SkColorGetB(color)), colorMax), result); + SkPDFUtils::AppendScalar(SkColorGetB(color) * colorScale, result); result->writeText(" "); } diff --git a/src/pdf/SkPDFGraphicState.cpp b/src/pdf/SkPDFGraphicState.cpp index d063c1505e..6cf66456ab 100644 --- a/src/pdf/SkPDFGraphicState.cpp +++ b/src/pdf/SkPDFGraphicState.cpp @@ -201,7 +201,7 @@ void SkPDFGraphicState::emitObject(SkWStream* stream, SkAutoTUnref<SkPDFDict> dict(SkNEW_ARGS(SkPDFDict, ("ExtGState"))); dict->insertName("Type", "ExtGState"); - SkScalar alpha = SkScalarDiv(fAlpha, 0xFF); + SkScalar alpha = SkIntToScalar(fAlpha) / 0xFF; dict->insertScalar("CA", alpha); dict->insertScalar("ca", alpha); diff --git a/src/pdf/SkPDFShader.cpp b/src/pdf/SkPDFShader.cpp index c2f0bc4677..c627c14257 100644 --- a/src/pdf/SkPDFShader.cpp +++ b/src/pdf/SkPDFShader.cpp @@ -58,7 +58,7 @@ static void interpolateColorCode(SkScalar range, SkScalar* curColor, // Figure out how to scale each color component. SkScalar multiplier[kColorComponents]; for (int i = 0; i < kColorComponents; i++) { - multiplier[i] = SkScalarDiv(curColor[i] - prevColor[i], range); + multiplier[i] = (curColor[i] - prevColor[i]) / range; } // Calculate when we no longer need to keep a copy of the input parameter t. @@ -1132,7 +1132,7 @@ SkPDFShader::State::State(const SkShader& shader, const SkMatrix& canvasTransfor static const SkScalar kMaxBitmapArea = 1024 * 1024; SkScalar bitmapArea = rasterScale * bbox.width() * rasterScale * bbox.height(); if (bitmapArea > kMaxBitmapArea) { - rasterScale *= SkScalarSqrt(SkScalarDiv(kMaxBitmapArea, bitmapArea)); + rasterScale *= SkScalarSqrt(kMaxBitmapArea / bitmapArea); } SkISize size = SkISize::Make(SkScalarRoundToInt(rasterScale * bbox.width()), |