diff options
| author | Romain Guy <romainguy@google.com> | 2013-03-07 17:58:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-07 17:58:59 +0000 |
| commit | 907f69d62960fd6d991af9e297930dccde63c8c7 (patch) | |
| tree | 8898eb25c85c57000a2d0c8f90df1562d768902a | |
| parent | 3d8e7cfa3a80b4704c45cfe7fa99d93b6bc694f9 (diff) | |
| parent | 9a4f0ee617235299345985a7aed219e223f43f24 (diff) | |
| download | frameworks_base-907f69d62960fd6d991af9e297930dccde63c8c7.zip frameworks_base-907f69d62960fd6d991af9e297930dccde63c8c7.tar.gz frameworks_base-907f69d62960fd6d991af9e297930dccde63c8c7.tar.bz2 | |
am 9a4f0ee6: am e30f16df: Merge "Round scale factors to rasterize text" into jb-mr2-dev
* commit '9a4f0ee617235299345985a7aed219e223f43f24':
Round scale factors to rasterize text
| -rw-r--r-- | libs/hwui/DisplayList.cpp | 3 | ||||
| -rw-r--r-- | libs/hwui/font/Font.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/libs/hwui/DisplayList.cpp b/libs/hwui/DisplayList.cpp index bdd539e..5781f4d 100644 --- a/libs/hwui/DisplayList.cpp +++ b/libs/hwui/DisplayList.cpp @@ -442,9 +442,8 @@ status_t DisplayList::replay(OpenGLRenderer& renderer, Rect& dirty, int32_t flag for (unsigned int i = 0; i < mDisplayListData->displayListOps.size(); i++) { DisplayListOp *op = mDisplayListData->displayListOps[i]; #if DEBUG_DISPLAY_LIST_OPS_AS_EVENTS - Caches::getInstance().eventMark(strlen(op->name()), op->name()); + renderer.eventMark(strlen(op->name()), op->name()); #endif - drawGlStatus |= op->replay(renderer, dirty, flags, saveCount, level, mCaching, mMultipliedAlpha, deferredList); logBuffer.writeCommand(level, op->name()); diff --git a/libs/hwui/font/Font.cpp b/libs/hwui/font/Font.cpp index 9307f11..c932087 100644 --- a/libs/hwui/font/Font.cpp +++ b/libs/hwui/font/Font.cpp @@ -53,8 +53,8 @@ Font::FontDescription::FontDescription(const SkPaint* paint, const mat4& matrix) mStrokeWidth = paint->getStrokeWidth(); mAntiAliasing = paint->isAntiAlias(); mLookupTransform.reset(); - mLookupTransform[SkMatrix::kMScaleX] = matrix[mat4::kScaleX]; - mLookupTransform[SkMatrix::kMScaleY] = matrix[mat4::kScaleY]; + mLookupTransform[SkMatrix::kMScaleX] = roundf(fmaxf(1.0f, matrix[mat4::kScaleX])); + mLookupTransform[SkMatrix::kMScaleY] = roundf(fmaxf(1.0f, matrix[mat4::kScaleY])); if (!mLookupTransform.invert(&mInverseLookupTransform)) { ALOGW("Could not query the inverse lookup transform for this font"); } |