diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-17 19:22:07 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-17 19:22:07 +0000 |
| commit | e1ca705cac4b946993f6cbf798e2a0ba27e739f3 (patch) | |
| tree | 9757af858cadeea671264651780935b00d8c0252 /src/pdf | |
| parent | 3fb15f4d21292a319dc6522bfc99c89a7a5eac68 (diff) | |
deprecate SkScalarRound (and its ilk), use SkScalarRound[ToInt,ToScalar]. #define SK_SUPPORT_DEPRECATED_SCALARROUND for legacy clients
BUG=
R=robertphillips@google.com
Review URL: https://codereview.chromium.org/111353003
git-svn-id: http://skia.googlecode.com/svn/trunk@12719 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/pdf')
| -rw-r--r-- | src/pdf/SkPDFShader.cpp | 4 | ||||
| -rw-r--r-- | src/pdf/SkPDFTypes.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/pdf/SkPDFShader.cpp b/src/pdf/SkPDFShader.cpp index 94bdf2d78d..62adf5811d 100644 --- a/src/pdf/SkPDFShader.cpp +++ b/src/pdf/SkPDFShader.cpp @@ -988,8 +988,8 @@ SkPDFImageShader::SkPDFImageShader(SkPDFShader::State* state) : fState(state) { SkMatrix unflip; unflip.setTranslate(0, SkScalarRoundToScalar(deviceBounds.height())); unflip.preScale(SK_Scalar1, -SK_Scalar1); - SkISize size = SkISize::Make(SkScalarRound(deviceBounds.width()), - SkScalarRound(deviceBounds.height())); + SkISize size = SkISize::Make(SkScalarRoundToInt(deviceBounds.width()), + SkScalarRoundToInt(deviceBounds.height())); // TODO(edisonn): should we pass here the DCT encoder of the destination device? // TODO(edisonn): NYI Perspective, use SkPDFDeviceFlattener. SkPDFDevice pattern(size, size, unflip); diff --git a/src/pdf/SkPDFTypes.cpp b/src/pdf/SkPDFTypes.cpp index aafad79c44..e3cc90c1de 100644 --- a/src/pdf/SkPDFTypes.cpp +++ b/src/pdf/SkPDFTypes.cpp @@ -142,7 +142,7 @@ void SkPDFScalar::Append(SkScalar value, SkWStream* stream) { #if !defined(SK_ALLOW_LARGE_PDF_SCALARS) if (value > 32767 || value < -32767) { - stream->writeDecAsText(SkScalarRound(value)); + stream->writeDecAsText(SkScalarRoundToInt(value)); return; } |