diff options
| author | Steve Kondik <shade@chemlab.org> | 2010-05-19 16:46:57 -0400 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2010-05-19 16:46:57 -0400 |
| commit | 046c41b82bee8789924cc5ca4dfaf29ecf03acf5 (patch) | |
| tree | 1caba10f2c248d0d462246aacfd3cac2b0a0cd70 | |
| parent | 06805ffe5db69849ea4b932039d528737fac888c (diff) | |
| parent | 9b1cba8ccd7554cb30905711a426bd86ad8dd38c (diff) | |
| download | android_external_skia-eclair.tar.gz android_external_skia-eclair.tar.bz2 android_external_skia-eclair.zip | |
Merge branch 'master' of git://android.git.kernel.org/platform/external/skia into eclaireclair
| -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 f3377ebaa9..e7016e2d27 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -816,7 +816,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)); } |