diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-19 09:29:47 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-05-19 09:29:56 -0700 |
| commit | f6f43bd241efd58483c1daf75100a21822aea0e4 (patch) | |
| tree | 8649b243392b9a5aca700f5762d4a8e68ee639e8 | |
| parent | 4701b5d25c5617888ea754f373946c57534750cb (diff) | |
| parent | 9b1cba8ccd7554cb30905711a426bd86ad8dd38c (diff) | |
| download | skia-f6f43bd241efd58483c1daf75100a21822aea0e4.tar.gz | |
merge from open-source masterandroid-sdk-tools_r7android-adt-0.9.8
Change-Id: Ic9add408166bf9a0350db904e15912b723e55a15
| -rw-r--r-- | src/core/SkPaint.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index 604ed76999..da818c48c2 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -906,7 +906,7 @@ size_t SkPaint::breakText(const void* textD, size_t length, SkScalar maxWidth, if (this->isLinearText()) { scale = fTextSize / kCanonicalTextSizeForPaths; - maxWidth = SkScalarMul(maxWidth, SkScalarDiv(kCanonicalTextSizeForPaths, fTextSize)); + maxWidth = SkScalarMulDiv(maxWidth, kCanonicalTextSizeForPaths, fTextSize); // this gets restored by restore ((SkPaint*)this)->setTextSize(SkIntToScalar(kCanonicalTextSizeForPaths)); } |