diff options
| author | ghepeu <ghepeu@gmail.com> | 2013-07-01 01:50:40 +0200 |
|---|---|---|
| committer | ghepeu <ghepeu@gmail.com> | 2013-07-01 01:50:40 +0200 |
| commit | 9c7be1baf27224076087cc221e582da6f70bc660 (patch) | |
| tree | 0f7c0bdaa44d0f04689f2685312f4088ee1713c4 | |
| parent | 4adc54b9973e7d2d2f22b83e32abbbeb545b8b4e (diff) | |
| download | external_skia-9c7be1baf27224076087cc221e582da6f70bc660.zip external_skia-9c7be1baf27224076087cc221e582da6f70bc660.tar.gz external_skia-9c7be1baf27224076087cc221e582da6f70bc660.tar.bz2 | |
Fimg2d3x: fix icon scaling issue with acceleration enabled
* replace undefined TRUE/FALSE with true/false in SkFimgApi3x.h
* fix warning in SkFimgApi3x.cpp
Change-Id: Iabaf66df526892f006573c97450fd36f461d9bb2
| -rw-r--r-- | include/core/SkFimgApi3x.h | 14 | ||||
| -rw-r--r-- | src/core/SkFimgApi3x.cpp | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/core/SkFimgApi3x.h b/include/core/SkFimgApi3x.h index d8285d2..308e211 100644 --- a/include/core/SkFimgApi3x.h +++ b/include/core/SkFimgApi3x.h @@ -48,16 +48,16 @@ //---------------------------------------------------------------------------// -#define FIMGAPI_G2D_BLOCKING TRUE -#define FIMGAPI_FILTERMODE_USE_SW TRUE -#define FIMGAPI_DITHERMODE_USE_SW TRUE -#define FIMGAPI_COMPROMISE_USE TRUE -#define FIMGAPI_HYBRID_USE FALSE +#define FIMGAPI_G2D_BLOCKING true +#define FIMGAPI_FILTERMODE_USE_SW true +#define FIMGAPI_DITHERMODE_USE_SW true +#define FIMGAPI_COMPROMISE_USE true +#define FIMGAPI_HYBRID_USE false #if defined(SWP1_CUSTOMSIMD_ENABLE) -#define FIMGAPI_DMC_SIMD_OPT_USE TRUE +#define FIMGAPI_DMC_SIMD_OPT_USE true #else -#define FIMGAPI_DMC_SIMD_OPT_USE FALSE +#define FIMGAPI_DMC_SIMD_OPT_USE false #endif #define FIMGAPI_FINISHED (0x1<<0) diff --git a/src/core/SkFimgApi3x.cpp b/src/core/SkFimgApi3x.cpp index 5795371..bb8e121 100644 --- a/src/core/SkFimgApi3x.cpp +++ b/src/core/SkFimgApi3x.cpp @@ -143,7 +143,7 @@ bool FimgApiCheckPossible(Fimg *fimg) return false; #endif - if (fimg->colorFilter != NULL) + if (fimg->colorFilter != 0) return false; if ((fimg->srcAddr == NULL) || (fimg->dstAddr == NULL)) |