am ac838a3a: Merge "Correct PatchCache comparison logic"

* commit 'ac838a3ab9d85112576cf2c943930441f62c51d2':
  Correct PatchCache comparison logic
This commit is contained in:
Chris Craik
2013-02-15 19:41:32 -08:00
committed by Android Git Automerger

View File

@@ -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;