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

Commit dbde527e authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Small cleanup."

parents ab1c5759 2665b85b

libs/hwui/Patch.cpp

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <cmath>



#include <utils/Log.h>

#include <utils/String8.h>



#include "Patch.h"

#include "Caches.h"

libs/hwui/Patch.h

+8 −8
Original line number Diff line number Diff line
@@ -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;

                                }

                            }

                        }

libs/hwui/PathCache.h

+6 −6
Original line number Diff line number Diff line
@@ -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;

                        }

                    }

                }

libs/hwui/utils/Compare.h

+2 −2
Original line number Diff line number Diff line
@@ -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)