Merge "Correctly check the height of a glyph prior to caching it" into jb-mr1-dev (6c8c6d9d) · Commits · e / os / android_frameworks_base

libs/hwui/font/CacheTexture.cpp

+9 −10

Original line number	Diff line number	Diff line
		@@ -106,7 +106,7 @@ CacheBlock* CacheBlock::removeBlock(CacheBlock* head, CacheBlock *blockToRemove)
		///////////////////////////////////////////////////////////////////////////////

		bool CacheTexture::fitBitmap(const SkGlyph& glyph, uint32_t* retOriginX, uint32_t* retOriginY) {
		if (glyph.fHeight + TEXTURE_BORDER_SIZE > mHeight) {
		if (glyph.fHeight + TEXTURE_BORDER_SIZE * 2 > mHeight) {
		return false;
		}

		@@ -117,8 +117,7 @@ bool CacheTexture::fitBitmap(const SkGlyph& glyph, uint32_t *retOriginX, uint32_
		// This columns for glyphs that are close but not necessarily exactly the same size. It trades
		// off the loss of a few pixels for some glyphs against the ability to store more glyphs
		// of varying sizes in one block.
		uint16_t roundedUpW =
		(glyphW + CACHE_BLOCK_ROUNDING_SIZE - 1) & -CACHE_BLOCK_ROUNDING_SIZE;
		uint16_t roundedUpW = (glyphW + CACHE_BLOCK_ROUNDING_SIZE - 1) & -CACHE_BLOCK_ROUNDING_SIZE;

		CacheBlock* cacheBlock = mCacheBlocks;
		while (cacheBlock) {

+4 −4

File changed.

Contains only whitespace changes.