LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 08:11:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged default into minor

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2014-04-01 20:46:31 -03:00
parent caa61563cc 606c9b8fb1
commit 6dc10cfd15
50 changed files with 416 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/font/GlyphData.cpp
+3 -3
View File
@@ -64,16 +64,16 @@ void *GlyphData::getData() const
return (void *) data;
}
int GlyphData::getSize() const
size_t GlyphData::getSize() const
{
switch (format)
{
case GlyphData::FORMAT_LUMINANCE_ALPHA:
return getWidth() * getHeight() * 2;
return size_t(getWidth() * getHeight() * 2);
break;
case GlyphData::FORMAT_RGBA:
default:
return getWidth() * getHeight() * 4;
return size_t(getWidth() * getHeight() * 4);
break;
}