diff options
| author | Chris Craik <ccraik@google.com> | 2013-02-16 03:36:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-16 03:36:37 +0000 |
| commit | ac838a3ab9d85112576cf2c943930441f62c51d2 (patch) | |
| tree | e29d3d53cd3cf681e99accbf7a1251ff473cd67e /libs | |
| parent | 840b5069707c6f39ec06231dacbcbe8159d581c1 (diff) | |
| parent | 9935abceea10df337969f08cce05b7c02bb1eb19 (diff) | |
| download | frameworks_base-ac838a3ab9d85112576cf2c943930441f62c51d2.zip frameworks_base-ac838a3ab9d85112576cf2c943930441f62c51d2.tar.gz frameworks_base-ac838a3ab9d85112576cf2c943930441f62c51d2.tar.bz2 | |
Merge "Correct PatchCache comparison logic"
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/PatchCache.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/PatchCache.cpp b/libs/hwui/PatchCache.cpp index f48f857..62e38d3 100644 --- a/libs/hwui/PatchCache.cpp +++ b/libs/hwui/PatchCache.cpp @@ -51,10 +51,10 @@ int PatchCache::PatchDescription::compare( if (deltaInt != 0) return deltaInt; if (lhs.pixelWidth < rhs.pixelWidth) return -1; - if (lhs.pixelWidth > lhs.pixelWidth) return +1; + if (lhs.pixelWidth > rhs.pixelWidth) return +1; if (lhs.pixelHeight < rhs.pixelHeight) return -1; - if (lhs.pixelHeight > lhs.pixelHeight) return +1; + if (lhs.pixelHeight > rhs.pixelHeight) return +1; deltaInt = lhs.xCount - rhs.xCount; if (deltaInt != 0) return deltaInt; |