From e87276cbada94ef321febcb042c04bb8498f0636 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 2 Mar 2013 13:39:06 -0800 Subject: [PATCH] Fix some minor warnings. --- Core/Font/PGF.cpp | 8 ++++---- native | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Core/Font/PGF.cpp b/Core/Font/PGF.cpp index 2fd2c4140b..b0b4437818 100644 --- a/Core/Font/PGF.cpp +++ b/Core/Font/PGF.cpp @@ -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; diff --git a/native b/native index 3c1566b9a7..f26d95dba1 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit 3c1566b9a7559708dfd7d1413f723da51299e5c4 +Subproject commit f26d95dba1abc7d3936b929ab01aafff40555c93