diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-03-15 04:54:49 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-15 04:54:49 -0700 |
| commit | ea865e804a942e6de638828167d4422c5b44538a (patch) | |
| tree | 6d0398bd36ee622a32628f7963bd54adb35604fe /src/utils | |
| parent | 70c511db32497911529a75652f53b295a5f75917 (diff) | |
| parent | 05b6b4d746867a9fb02e14edfe1bf3685abeb813 (diff) | |
| download | external_skia-ea865e804a942e6de638828167d4422c5b44538a.zip external_skia-ea865e804a942e6de638828167d4422c5b44538a.tar.gz external_skia-ea865e804a942e6de638828167d4422c5b44538a.tar.bz2 | |
Merge "Skia Merge (revision 922)"
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/SkCamera.cpp | 2 | ||||
| -rw-r--r-- | src/utils/SkCullPoints.cpp | 2 | ||||
| -rw-r--r-- | src/utils/SkParsePath.cpp | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/utils/SkCamera.cpp b/src/utils/SkCamera.cpp index c70c4c0..87d2aad 100644 --- a/src/utils/SkCamera.cpp +++ b/src/utils/SkCamera.cpp @@ -400,6 +400,7 @@ void Sk3DView::restore() fRec = next; } +#ifdef ANDROID void Sk3DView::setCameraLocation(SkScalar x, SkScalar y, SkScalar z) { // the camera location is passed in inches, set in pt @@ -409,6 +410,7 @@ void Sk3DView::setCameraLocation(SkScalar x, SkScalar y, SkScalar z) fCamera.update(); } +#endif void Sk3DView::translate(SkScalar x, SkScalar y, SkScalar z) { diff --git a/src/utils/SkCullPoints.cpp b/src/utils/SkCullPoints.cpp index 03bfa99..c8d58c1 100644 --- a/src/utils/SkCullPoints.cpp +++ b/src/utils/SkCullPoints.cpp @@ -27,7 +27,7 @@ static bool cross_product_is_neg(const SkIPoint& v, int dx, int dy) { tmp0.setMul(v.fX, dy); tmp1.setMul(dx, v.fY); tmp0.sub(tmp1); - return tmp0.isNeg(); + return tmp0.isNeg() != 0; #endif } diff --git a/src/utils/SkParsePath.cpp b/src/utils/SkParsePath.cpp index 6b3afca..e08e84c 100644 --- a/src/utils/SkParsePath.cpp +++ b/src/utils/SkParsePath.cpp @@ -184,7 +184,7 @@ static void write_scalar(SkWStream* stream, SkScalar value) { #ifdef SK_SCALAR_IS_FLOAT char buffer[64]; #ifdef SK_BUILD_FOR_WIN32 - int len = sprintf(buffer, "%g", value); + int len = _snprintf(buffer, sizeof(buffer), "%g", value); #else int len = snprintf(buffer, sizeof(buffer), "%g", value); #endif |