AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AxioDL/libSpecter

This commit is contained in:
Jack Andersen 2015-11-30 14:36:48 -10:00
parent fc2a6d64e9 90c99910b6
commit 24718b5bde
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
specter/lib/FontCache.cpp
View File

@ -218,10 +218,7 @@ static bool ReadDecompressed(Athena::io::FileReader& reader, atUint8* data, size
} }
inflateEnd(&z); inflateEnd(&z);
return adler32 == z.adler;
if (adler32 != z.adler)
return false;
return true;
} }
FontAtlas::FontAtlas(boo::IGraphicsDataFactory* gf, FT_Face face, uint32_t dpi, FontAtlas::FontAtlas(boo::IGraphicsDataFactory* gf, FT_Face face, uint32_t dpi,
@ -300,7 +297,7 @@ FontAtlas::FontAtlas(boo::IGraphicsDataFactory* gf, FT_Face face, uint32_t dpi,
else else
{ {
size_t count = TEXMAP_DIM * totalHeight; size_t count = TEXMAP_DIM * totalHeight;
texmap.reset(new RgbaPixel[TEXMAP_DIM * totalHeight]); texmap.reset(new RgbaPixel[count]);
bufSz = count * sizeof(RgbaPixel); bufSz = count * sizeof(RgbaPixel);
memset(texmap.get(), 0, bufSz); memset(texmap.get(), 0, bufSz);
} }
@ -375,7 +372,7 @@ FontAtlas::FontAtlas(boo::IGraphicsDataFactory* gf, FT_Face face, uint32_t dpi,
else else
{ {
size_t count = TEXMAP_DIM * totalHeight; size_t count = TEXMAP_DIM * totalHeight;
texmap.reset(new GreyPixel[TEXMAP_DIM * totalHeight]); texmap.reset(new GreyPixel[count]);
bufSz = count * sizeof(GreyPixel); bufSz = count * sizeof(GreyPixel);
memset(texmap.get(), 0, bufSz); memset(texmap.get(), 0, bufSz);
} }