Mercurial > sdl-ios-xcode
diff src/video/cocoa/SDL_cocoashape.m @ 4832:0c82f20327ec
Correcting minor bugs and adding assertions to help me track down a NULL pointer bug in Cocoa code.
author | egottlieb |
---|---|
date | Thu, 05 Aug 2010 00:53:38 -0400 |
parents | 8dabd625079f |
children | 34fb492cefe3 |
line wrap: on
line diff
--- a/src/video/cocoa/SDL_cocoashape.m Tue Aug 03 23:41:57 2010 -0400 +++ b/src/video/cocoa/SDL_cocoashape.m Thu Aug 05 00:53:38 2010 -0400 @@ -28,7 +28,7 @@ SDL_WindowShaper* Cocoa_CreateShaper(SDL_Window* window) { SDL_WindowData* data = (SDL_WindowData*)window->driverdata; - [data->nswindow setAlpha:1.0]; + [data->nswindow setAlphaValue:1.0]; [data->nswindow setOpaque:YES]; [data->nswindow setStyleMask:NSBorderlessWindowMask]; SDL_WindowShaper* result = SDL_malloc(sizeof(SDL_WindowShaper)); @@ -45,7 +45,7 @@ shape_data->shape = NULL; int resized_properly = Cocoa_ResizeWindowShape(window); - assert(resized_properly == 0); + SDL_assert(resized_properly == 0); return result; } @@ -60,6 +60,7 @@ } void ConglomerateShapeTree(SDL_ShapeTree* tree,SDL_PathConglomeration* cong) { + SDL_assert(tree != NULL); if(tree->kind == OpaqueShape) { NSRect rect = convert_rect(tree->data.shape,cong->window); [cong->clipPath appendBezierPathWithRect:rect]; @@ -91,7 +92,7 @@ int Cocoa_ResizeWindowShape(SDL_Window *window) { SDL_ShapeData* data = window->shaper->driverdata; - assert(data != NULL); + SDL_assert(data != NULL); if(data->shape != NULL) SDL_FreeShapeTree(&data->shape);