diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-10 15:23:43 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-10 15:58:04 -0800 |
| commit | 1e19674107e1aa2224c2b8c7d12bfa057efe80ea (patch) | |
| tree | 512f1a8a715497c2cde26d6ca070d923fd9c3a45 /libs/hwui/font/FontUtil.h | |
| parent | 487ae9b8dc3e08c1a830d519a801a07cd59c8f2b (diff) | |
| download | frameworks_base-1e19674107e1aa2224c2b8c7d12bfa057efe80ea.zip frameworks_base-1e19674107e1aa2224c2b8c7d12bfa057efe80ea.tar.gz frameworks_base-1e19674107e1aa2224c2b8c7d12bfa057efe80ea.tar.bz2 | |
Frameworks/base: Wall Werror in libs/hwui
Turn on -Wall -Werror in libs/hwui. Fix errors.
Change-Id: I74962d08c889712dacbd0d86d6760fc10802b6bd
Diffstat (limited to 'libs/hwui/font/FontUtil.h')
| -rw-r--r-- | libs/hwui/font/FontUtil.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libs/hwui/font/FontUtil.h b/libs/hwui/font/FontUtil.h index c2fd5f5..4e5debe 100644 --- a/libs/hwui/font/FontUtil.h +++ b/libs/hwui/font/FontUtil.h @@ -30,9 +30,12 @@ #define DEFAULT_TEXT_LARGE_CACHE_WIDTH 2048 #define DEFAULT_TEXT_LARGE_CACHE_HEIGHT 512 -#define TEXTURE_BORDER_SIZE 1 -#if TEXTURE_BORDER_SIZE != 1 -# error TEXTURE_BORDER_SIZE other than 1 is not currently supported +#ifdef TEXTURE_BORDER_SIZE + #if TEXTURE_BORDER_SIZE != 1 + #error TEXTURE_BORDER_SIZE other than 1 is not currently supported + #endif +#else + #define TEXTURE_BORDER_SIZE 1 #endif #define CACHE_BLOCK_ROUNDING_SIZE 4 @@ -44,7 +47,7 @@ #define GET_GLYPH(text) nextGlyph((const uint16_t**) &text) #define IS_END_OF_STRING(glyph) false - static glyph_t nextGlyph(const uint16_t** srcPtr) { + static inline glyph_t nextGlyph(const uint16_t** srcPtr) { const uint16_t* src = *srcPtr; glyph_t g = *src++; *srcPtr = src; |