Fix some clang analyzer warnings.
This fixes some analyzer warnings and a couple of minor memory leaks.
This commit is contained in:
parent
b01b128353
commit
e007150b45
6 changed files with 15 additions and 5 deletions
|
@ -392,7 +392,7 @@ static int dollarNormalize(const SDL_DollarPath *path,SDL_FloatPoint *points)
|
||||||
static float dollarRecognize(const SDL_DollarPath *path,int *bestTempl,SDL_GestureTouch* touch)
|
static float dollarRecognize(const SDL_DollarPath *path,int *bestTempl,SDL_GestureTouch* touch)
|
||||||
{
|
{
|
||||||
|
|
||||||
SDL_FloatPoint points[DOLLARNPOINTS];
|
SDL_FloatPoint points[DOLLARNPOINTS] = {};
|
||||||
int i;
|
int i;
|
||||||
float bestDiff = 10000;
|
float bestDiff = 10000;
|
||||||
|
|
||||||
|
|
|
@ -1467,7 +1467,7 @@ SDL_RenderDrawRects(SDL_Renderer * renderer,
|
||||||
int
|
int
|
||||||
SDL_RenderFillRect(SDL_Renderer * renderer, const SDL_Rect * rect)
|
SDL_RenderFillRect(SDL_Renderer * renderer, const SDL_Rect * rect)
|
||||||
{
|
{
|
||||||
SDL_Rect full_rect;
|
SDL_Rect full_rect = {};
|
||||||
|
|
||||||
CHECK_RENDERER_MAGIC(renderer, -1);
|
CHECK_RENDERER_MAGIC(renderer, -1);
|
||||||
|
|
||||||
|
|
|
@ -619,6 +619,8 @@ SDL_UpperBlitScaled(SDL_Surface * src, const SDL_Rect * srcrect,
|
||||||
/* If the destination rectangle is NULL, use the entire dest surface */
|
/* If the destination rectangle is NULL, use the entire dest surface */
|
||||||
if (dstrect == NULL) {
|
if (dstrect == NULL) {
|
||||||
fulldst.x = fulldst.y = 0;
|
fulldst.x = fulldst.y = 0;
|
||||||
|
fulldst.w = dst->w;
|
||||||
|
fulldst.h = dst->h;
|
||||||
dstrect = &fulldst;
|
dstrect = &fulldst;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3062,8 +3062,11 @@ static SDL_bool SDL_MessageboxValidForDriver(const SDL_MessageBoxData *messagebo
|
||||||
}
|
}
|
||||||
|
|
||||||
SDL_VERSION(&info.version);
|
SDL_VERSION(&info.version);
|
||||||
SDL_GetWindowWMInfo(window, &info);
|
if (!SDL_GetWindowWMInfo(window, &info)) {
|
||||||
|
return SDL_TRUE;
|
||||||
|
} else {
|
||||||
return (info.subsystem == drivertype);
|
return (info.subsystem == drivertype);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
|
|
|
@ -138,6 +138,10 @@ CreateApplicationMenus(void)
|
||||||
NSMenu *windowMenu;
|
NSMenu *windowMenu;
|
||||||
NSMenuItem *menuItem;
|
NSMenuItem *menuItem;
|
||||||
|
|
||||||
|
if (!NSApp) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
/* Create the main menu bar */
|
/* Create the main menu bar */
|
||||||
[NSApp setMainMenu:[[NSMenu alloc] init]];
|
[NSApp setMainMenu:[[NSMenu alloc] init]];
|
||||||
|
|
||||||
|
@ -228,7 +232,7 @@ Cocoa_RegisterApp(void)
|
||||||
}
|
}
|
||||||
[NSApp finishLaunching];
|
[NSApp finishLaunching];
|
||||||
}
|
}
|
||||||
if ([NSApp delegate] == nil) {
|
if (NSApp && ![NSApp delegate]) {
|
||||||
[NSApp setDelegate:[[SDLAppDelegate alloc] init]];
|
[NSApp setDelegate:[[SDLAppDelegate alloc] init]];
|
||||||
}
|
}
|
||||||
[pool release];
|
[pool release];
|
||||||
|
|
|
@ -96,6 +96,7 @@ Cocoa_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShape
|
||||||
closure.window = shaper->window;
|
closure.window = shaper->window;
|
||||||
SDL_TraverseShapeTree(data->shape,&ConvertRects,&closure);
|
SDL_TraverseShapeTree(data->shape,&ConvertRects,&closure);
|
||||||
[closure.path addClip];
|
[closure.path addClip];
|
||||||
|
[pool release];
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue