Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-27 23:40:39 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix some minor warnings.

Browse Source
This commit is contained in:
Unknown W. Brackets 2013-03-02 13:39:06 -08:00
parent 26f2301ae4
commit e87276cbad
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Core/Font/PGF.cpp
View File

@ -68,7 +68,7 @@ void PGF::DoState(PointerWrap &p) {
void PGF::ReadPtr(const u8 *ptr, size_t dataSize) {
const u8 *const startPtr = ptr;
INFO_LOG(HLE, "Reading %i bytes of PGF header", sizeof(header));
INFO_LOG(HLE, "Reading %d bytes of PGF header", sizeof(header));
memcpy(&header, ptr, sizeof(header));
ptr += sizeof(header);
@ -183,9 +183,9 @@ void PGF::ReadPtr(const u8 *ptr, size_t dataSize) {
// And shadow glyphs.
for (size_t i = 0; i < shadowGlyphs.size(); i++) {
size_t shadowId = glyphs[i].shadowID;
if (shadowId >= 0 && shadowId < shadowMap.size()) {
if (shadowId < shadowMap.size()) {
size_t charId = shadowMap[shadowId];
if (charId >= 0 && charId < glyphs.size()) {
if (charId < glyphs.size()) {
// TODO: check for pre existing shadow glyph
GetGlyph(fontData, charPointers[charId] * 4 * 8 /* ??? */, FONT_PGF_SHADOWGLYPH, shadowGlyphs[i]);
}
@ -211,7 +211,7 @@ bool PGF::GetCharInfo(int charCode, PGFCharInfo *charInfo) {
// Character not in font, return zeroed charInfo as on real PSP.
return false;
}
memset(charInfo, 0, sizeof(charInfo));
memset(charInfo, 0, sizeof(*charInfo));
charInfo->bitmapWidth = glyph.w;
charInfo->bitmapHeight = glyph.h;

2
native

@ -1 +1 @@
Subproject commit 3c1566b9a7559708dfd7d1413f723da51299e5c4
Subproject commit f26d95dba1abc7d3936b929ab01aafff40555c93