diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-11 19:31:26 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-11-12 11:22:20 -0800 |
| commit | ff1d8a6635fb6441615778a47e2881129574a5b1 (patch) | |
| tree | d2f490ec6a546461eda288e4383a50796d68059c /libs | |
| parent | 34acb4c8d4abe1c4f580b85ddc84b18b7e38e417 (diff) | |
| download | frameworks_base-ff1d8a6635fb6441615778a47e2881129574a5b1.zip frameworks_base-ff1d8a6635fb6441615778a47e2881129574a5b1.tar.gz frameworks_base-ff1d8a6635fb6441615778a47e2881129574a5b1.tar.bz2 | |
Move frameworks/base over to libc++.
Bug: 15193147
Change-Id: I96109d2d383f0c8a4aaa611f29fcf887afb3c69e
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/Android.mk | 1 | ||||
| -rw-r--r-- | libs/hwui/DisplayList.h | 2 | ||||
| -rw-r--r-- | libs/hwui/PathTessellator.cpp | 6 |
3 files changed, 4 insertions, 5 deletions
diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk index a09355b..3e590a9 100644 --- a/libs/hwui/Android.mk +++ b/libs/hwui/Android.mk @@ -115,7 +115,6 @@ ifeq ($(USE_OPENGL_RENDERER),true) LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code - include external/stlport/libstlport.mk include $(BUILD_SHARED_LIBRARY) include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/libs/hwui/DisplayList.h b/libs/hwui/DisplayList.h index 657632d..9eb8ae3 100644 --- a/libs/hwui/DisplayList.h +++ b/libs/hwui/DisplayList.h @@ -82,7 +82,7 @@ public: LinearAllocator * const mAllocator; SkPath* allocPathForFrame() { - mTempPaths.push_back(); + mTempPaths.push_back(SkPath()); return &mTempPaths.back(); } diff --git a/libs/hwui/PathTessellator.cpp b/libs/hwui/PathTessellator.cpp index d842ed5..b3f779f 100644 --- a/libs/hwui/PathTessellator.cpp +++ b/libs/hwui/PathTessellator.cpp @@ -289,14 +289,14 @@ void getStrokeVerticesFromUnclosedVertices(const PaintInfo& paintInfo, } beginTheta += dTheta; - Vector2 beginRadialOffset = {cos(beginTheta), sin(beginTheta)}; + Vector2 beginRadialOffset = {cosf(beginTheta), sinf(beginTheta)}; paintInfo.scaleOffsetForStrokeWidth(beginRadialOffset); Vertex::set(&buffer[capOffset], vertices[0].x + beginRadialOffset.x, vertices[0].y + beginRadialOffset.y); endTheta += dTheta; - Vector2 endRadialOffset = {cos(endTheta), sin(endTheta)}; + Vector2 endRadialOffset = {cosf(endTheta), sinf(endTheta)}; paintInfo.scaleOffsetForStrokeWidth(endRadialOffset); Vertex::set(&buffer[allocSize - 1 - capOffset], vertices[lastIndex].x + endRadialOffset.x, @@ -467,7 +467,7 @@ inline static void storeCapAA(const PaintInfo& paintInfo, const Vector<Vertex>& for (int i = 0; i < extra; i++) { theta += dTheta; - Vector2 radialOffset = {cos(theta), sin(theta)}; + Vector2 radialOffset = {cosf(theta), sinf(theta)}; // scale to compensate for pinching at sharp angles, see totalOffsetFromNormals() radialOffset *= radialScale; |