From 74f26160dac2f0c149ab6f191f73cf58b396c62d Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Wed, 18 Sep 2013 18:30:12 -0300 Subject: [PATCH] Fixed a couple bugs caught by clang's static analyzer --- platform/macosx/love-framework.xcodeproj/project.pbxproj | 4 +++- platform/macosx/love.xcodeproj/project.pbxproj | 2 +- src/modules/font/freetype/TrueTypeRasterizer.cpp | 2 +- src/modules/thread/wrap_LuaThread.cpp | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/platform/macosx/love-framework.xcodeproj/project.pbxproj b/platform/macosx/love-framework.xcodeproj/project.pbxproj index 440ad1029..7f10e7976 100644 --- a/platform/macosx/love-framework.xcodeproj/project.pbxproj +++ b/platform/macosx/love-framework.xcodeproj/project.pbxproj @@ -1971,7 +1971,7 @@ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0460; + LastUpgradeCheck = 0500; }; buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "love-framework" */; compatibilityVersion = "Xcode 3.2"; @@ -2322,6 +2322,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + COMBINE_HIDPI_IMAGES = YES; DYLIB_COMPATIBILITY_VERSION = 9.0; DYLIB_CURRENT_VERSION = 9.0; FRAMEWORK_VERSION = A; @@ -2342,6 +2343,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 9.0; DYLIB_CURRENT_VERSION = 9.0; diff --git a/platform/macosx/love.xcodeproj/project.pbxproj b/platform/macosx/love.xcodeproj/project.pbxproj index 14894f0f9..3c89741f6 100644 --- a/platform/macosx/love.xcodeproj/project.pbxproj +++ b/platform/macosx/love.xcodeproj/project.pbxproj @@ -204,7 +204,7 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0460; + LastUpgradeCheck = 0500; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "love" */; compatibilityVersion = "Xcode 3.2"; diff --git a/src/modules/font/freetype/TrueTypeRasterizer.cpp b/src/modules/font/freetype/TrueTypeRasterizer.cpp index 744c1727c..2c490b253 100644 --- a/src/modules/font/freetype/TrueTypeRasterizer.cpp +++ b/src/modules/font/freetype/TrueTypeRasterizer.cpp @@ -65,7 +65,7 @@ int TrueTypeRasterizer::getLineHeight() const GlyphData *TrueTypeRasterizer::getGlyphData(uint32 glyph) const { - love::font::GlyphMetrics glyphMetrics; + love::font::GlyphMetrics glyphMetrics = {}; FT_Glyph ftglyph; // Initialize diff --git a/src/modules/thread/wrap_LuaThread.cpp b/src/modules/thread/wrap_LuaThread.cpp index b6cb01aee..1629051c2 100644 --- a/src/modules/thread/wrap_LuaThread.cpp +++ b/src/modules/thread/wrap_LuaThread.cpp @@ -46,7 +46,7 @@ int w_Thread_start(lua_State *L) { for (int j = i; j >= 0; j--) delete args[j]; - delete args; + delete[] args; return luaL_argerror(L, i+2, "boolean, number, string, love type, or flat table expected"); } }