commit e43f785b7ff3fdf75f6d1c92282ebca6db191f2f
author Romain Guy <romainguy@google.com> Tue Sep 04 18:58:46 2012 -0700
committer Romain Guy <romainguy@google.com> Tue Sep 04 18:58:46 2012 -0700
tree fb21c2762b8afa2d09508e775cc025c2d27c0457
parent 8087246d9964b11de8ce116bc63b156faa4197e0

Correctly check the height of a glyph prior to caching it

Change-Id: Iaf3977afc20fcde65bfda7b9e092b3e723241684

libs/hwui/font/CacheTexture.h

diff --git a/libs/hwui/font/CacheTexture.h b/libs/hwui/font/CacheTexture.h
index daaafff..bf1f4a9 100644
--- a/libs/hwui/font/CacheTexture.h
+++ b/libs/hwui/font/CacheTexture.h
@@ -53,12 +53,12 @@
             mX(x), mY(y), mWidth(width), mHeight(height), mNext(NULL), mPrev(NULL) {
     }
 
-    static CacheBlock* insertBlock(CacheBlock* head, CacheBlock *newBlock);
+    static CacheBlock* insertBlock(CacheBlock* head, CacheBlock* newBlock);
 
-    static CacheBlock* removeBlock(CacheBlock* head, CacheBlock *blockToRemove);
+    static CacheBlock* removeBlock(CacheBlock* head, CacheBlock* blockToRemove);
 
     void output() {
-        CacheBlock *currBlock = this;
+        CacheBlock* currBlock = this;
         while (currBlock) {
             ALOGD("Block: this, x, y, w, h = %p, %d, %d, %d, %d",
                     currBlock, currBlock->mX, currBlock->mY, currBlock->mWidth, currBlock->mHeight);
@@ -139,7 +139,7 @@
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
     }
 
-    bool fitBitmap(const SkGlyph& glyph, uint32_t *retOriginX, uint32_t *retOriginY);
+    bool fitBitmap(const SkGlyph& glyph, uint32_t* retOriginX, uint32_t* retOriginY);
 
     inline uint16_t getWidth() const {
         return mWidth;