Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be0488db authored Sep 30, 2010 by Romain Guy Committed by Android (Google) Code Review Sep 30, 2010

Merge "Make simple paths made of lines work."

parents 02f41705 d7999127

graphics/java/android/graphics/Path.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -236,6 +236,7 @@ public class Path {
		* @param y The y-coordinate of the end of a line
		*/
		public void lineTo(float x, float y) {
		isSimplePath = false;
		native_lineTo(mNativePath, x, y);
		}

		@@ -250,6 +251,7 @@ public class Path {
		* this contour, to specify a line
		*/
		public void rLineTo(float dx, float dy) {
		isSimplePath = false;
		native_rLineTo(mNativePath, dx, dy);
		}

libs/hwui/PathCache.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -138,8 +138,8 @@ PathTexture* PathCache::addTexture(const PathCacheEntry& entry,
		const SkPath path, const SkPaint paint) {
		const SkRect& bounds = path->getBounds();

		const float pathWidth = bounds.width();
		const float pathHeight = bounds.height();
		const float pathWidth = fmax(bounds.width(), 1.0f);
		const float pathHeight = fmax(bounds.height(), 1.0f);

		if (pathWidth > mMaxTextureSize \|\| pathHeight > mMaxTextureSize) {
		LOGW("Path too large to be rendered into a texture");