Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Small cleanup."

Browse Source
This commit is contained in:
Romain Guy
2010-10-18 15:14:16 -07:00
committed by Android (Google) Code Review
parent ab1c57593f 2665b85b2b
commit dbde527e9b
4 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libs/hwui/Patch.cpp
View File

@@ -19,7 +19,6 @@
#include <cmath>
#include <utils/Log.h>
#include <utils/String8.h>
#include "Patch.h"
#include "Caches.h"

16
libs/hwui/Patch.h
View File

@@ -61,14 +61,14 @@ struct PatchDescription {
uint32_t colorKey;
bool operator<(const PatchDescription& rhs) const {
FLOAT_COMPARE(bitmapWidth) {
FLOAT_COMPARE(bitmapHeight) {
FLOAT_COMPARE(pixelWidth) {
FLOAT_COMPARE(pixelHeight) {
INT_COMPARE(xCount) {
INT_COMPARE(yCount) {
INT_COMPARE(emptyCount) {
INT_COMPARE(colorKey) return false;
LTE_FLOAT(bitmapWidth) {
LTE_FLOAT(bitmapHeight) {
LTE_FLOAT(pixelWidth) {
LTE_FLOAT(pixelHeight) {
LTE_INT(xCount) {
LTE_INT(yCount) {
LTE_INT(emptyCount) {
LTE_INT(colorKey) return false;
}
}
}

12
libs/hwui/PathCache.h
View File

@@ -64,12 +64,12 @@ struct PathCacheEntry {
float strokeWidth;
bool operator<(const PathCacheEntry& rhs) const {
INT_COMPARE(path) {
INT_COMPARE(join) {
INT_COMPARE(cap) {
INT_COMPARE(style) {
FLOAT_COMPARE(miter) {
FLOAT_COMPARE(strokeWidth) return false;
LTE_INT(path) {
LTE_INT(join) {
LTE_INT(cap) {
LTE_INT(style) {
LTE_FLOAT(miter) {
LTE_FLOAT(strokeWidth) return false;
}
}
}

4
libs/hwui/utils/Compare.h
View File

@@ -26,14 +26,14 @@
/**
* Compare floats.
*/
#define FLOAT_COMPARE(a) \
#define LTE_FLOAT(a) \
if (a < rhs.a) return true; \
if (ALMOST_EQUAL(a, rhs.a))
/**
* Compare integers.
*/
#define INT_COMPARE(a) \
#define LTE_INT(a) \
if (a < rhs.a) return true; \
if (a == rhs.a)