Merge pull request #109 from alkama/master

Fixing potential problems

ogl_editor/src/Commands.c

@@ -764,5 +764,3 @@ static bool CommandList_isEmpty(CommandList* list)
 {
 	return (!list->first && !list->last);
 }
-
-

ogl_editor/src/Commands.h

@@ -35,4 +35,3 @@ void Commands_endMulti();
 int Commands_undoCount();
 
 #endif
-

ogl_editor/src/Dialog.h

@@ -5,4 +5,3 @@
 int Dialog_open(text_t* dest);
 int Dialog_save(text_t* dest);
 void Dialog_showError(const text_t* text);
-

ogl_editor/src/Editor.c

@@ -577,6 +577,8 @@ static void copySelection(int row, int track, int selectLeft, int selectRight, i
 	}
 
 	free(s_copyData.entries);
+	if (copy_count != 0)
+	{
 		entry = s_copyData.entries = malloc(sizeof(CopyEntry) * copy_count);
 
 		for (track = selectLeft; track <= selectRight; ++track)
@@ -594,6 +596,7 @@ static void copySelection(int row, int track, int selectLeft, int selectRight, i
 				entry++;
 			}
 		}
+	}
 
 	s_copyData.bufferWidth = selectRight - selectLeft + 1;
 	s_copyData.bufferHeight = selectBottom - selectTop + 1;
@@ -1989,4 +1992,3 @@ bool Editor_keyDown(int key, int keyCode, int modifiers)
 
 	return true;
 }
-

ogl_editor/src/Editor.h

@@ -24,4 +24,3 @@ text_t** Editor_getRecentFiles();
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 #define EDITOR_VERSION _T(" 1.1 Beta 1 ")
-

ogl_editor/src/ImageData.c

@@ -428,4 +428,3 @@ unsigned char g_arrow_left_png[] = {
 	0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
 };
 int g_arrow_left_png_len = 2519;
-

ogl_editor/src/ImageData.h

@@ -4,4 +4,3 @@ extern unsigned char g_arrow_left_png[];
 extern int g_arrow_left_png_len;
 extern unsigned char g_arrow_right_png[];
 extern int g_arrow_right_png_len;
-

ogl_editor/src/Menu.c

@@ -97,4 +97,3 @@ MenuDescriptor g_viewMenu[] =
 	{ _T("Jump row,start/end & edit"), 	EDITOR_MENU_TAB,				EMGUI_KEY_TAB, 			0, 0 },	
 	{ 0 },
 };
-

ogl_editor/src/Menu.h

@@ -120,4 +120,3 @@ typedef struct MenuDescriptor
 extern MenuDescriptor g_fileMenu[];
 extern MenuDescriptor g_editMenu[];
 extern MenuDescriptor g_viewMenu[];
-

ogl_editor/src/MicroknightFont.c

@@ -365,4 +365,3 @@ struct MicroknightLayout s_microknightLayout[] =
 	{ 72, 117 },
 	{ 81, 117 },
 };
-

ogl_editor/src/MicroknightFont.h

@@ -12,4 +12,3 @@ typedef struct MicroknightLayout
 
 extern unsigned char s_microkinghtFontData[];
 extern struct MicroknightLayout s_microknightLayout[];
-

ogl_editor/src/MinecraftiaFont.h

@@ -5,4 +5,3 @@
 extern EmguiFontLayout g_minecraftiaFontLayout[];
 extern char g_minecraftiaFont[];
 extern int g_minecraftiaFontSize;
-

ogl_editor/src/RemoteConnection.c

@@ -513,4 +513,3 @@ void RemoteConnection_close()
 	closesocket(s_serverSocket);
 	s_serverSocket = INVALID_SOCKET;
 }
-

ogl_editor/src/RemoteConnection.h

@@ -32,4 +32,3 @@ void RemoteConnection_sendKeyFrames(const char* name, struct sync_track* track);
 void RemoteConnection_mapTrackName(const char* name);
 
 void RemoteConnection_getConnectionStatus(char** status);
-

ogl_editor/src/TrackData.c

@@ -382,6 +382,3 @@ int TrackData_getPrevLoopmark(TrackData* trackData, int row)
 {
 	return getPrevMark(trackData->loopmarks, trackData->loopmarkCount, row, -1);
 }
-
-
-

ogl_editor/src/TrackData.h

@@ -108,4 +108,3 @@ uint32_t TrackData_getNextColor(TrackData* trackData);
 void TrackData_linkGroups(TrackData* trackData);
 void TrackData_linkTrack(int index, const char* name, TrackData* trackData);
 void TrackData_setActiveTrack(TrackData* trackData, int track);
-

ogl_editor/src/TrackView.c

@@ -743,7 +743,7 @@ bool TrackView_render(TrackViewInfo* viewInfo, TrackData* trackData)
 		}
 		else
 		{
-			int temp;
+			int temp = 0;
 			x_pos += renderGroup(group, x_pos, &temp, info, trackData);
 		}
 	}
@@ -858,4 +858,3 @@ int TrackView_getTracksOffset(TrackViewInfo* viewInfo, TrackData* trackData, int
 
 	return nextOffset - prevOffset; 
 }
-

ogl_editor/src/TrackView.h

@@ -40,4 +40,3 @@ int TrackView_getScrolledTrack(struct TrackViewInfo* viewInfo, struct TrackData*
 int TrackView_getStartOffset();
 int TrackView_getTracksOffset(struct TrackViewInfo* viewInfo, struct TrackData* trackData, int prevTrack, int nextTrack);
 bool TrackView_isSelectedTrackVisible(struct TrackViewInfo* viewInfo, struct TrackData* trackData, int track);
-

ogl_editor/src/Window.h

@@ -7,4 +7,3 @@
 void Window_setTitle(const text_t* title);
 void Window_populateRecentList(const text_t** files);
 void Window_buildMenu();
-

ogl_editor/src/loadsave.c

@@ -453,4 +453,3 @@ int LoadSave_saveRocketXMLDialog(text_t* path, TrackData* trackData)
 
 	return LoadSave_saveRocketXML(path, trackData);
 }
-

ogl_editor/src/loadsave.h

@@ -8,4 +8,3 @@ int LoadSave_loadRocketXML(const text_t* path, struct TrackData* trackData);
 int LoadSave_loadRocketXMLDialog(text_t* path, struct TrackData* trackData);
 int LoadSave_saveRocketXML(const text_t* path, struct TrackData* trackData);
 int LoadSave_saveRocketXMLDialog(text_t* path, struct TrackData* trackData);
-

ogl_editor/src/macosx/FileDialog.m

@@ -69,10 +69,12 @@ int Dialog_save(char* dest)
 
 - (id)init
 {
-    [super init];
+	if ( self = [super init] ) {
 		m_bIsClosed = false;
-
 		return self;
+	}
+	else
+		return nil;
 }
 
 - (BOOL)windowShouldClose:(id)sender
@@ -132,10 +134,10 @@ void Dialog_showColorPicker(uint32_t* color)
 	//Get the shared color panel along with the chosen color and set the chosen color
 	NSColor* theColor = [[theColorPanel color] colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
 
-	*color = Emgui_color32((unsigned char) ([theColor redComponent] * 255.0),
+	*color = Emgui_color32( (unsigned char) ([theColor redComponent] * 255.0),
 							(unsigned char) ([theColor greenComponent] * 255.0),
 							(unsigned char) ([theColor blueComponent] * 255.0),
-						   255);
+							255 );
 
 	[thePool release];
 }
@@ -151,4 +153,3 @@ void Dialog_showError(const text_t* text)
 
 	[pool drain];
 }
-

ogl_editor/src/macosx/RocketView.h

@@ -6,4 +6,3 @@
 }
 
 @end
-

ogl_editor/src/macosx/RocketView.m

@@ -181,7 +181,9 @@ static int getModifierFlags(int flags)
 -(void) viewWillMoveToWindow:(NSWindow *)newWindow
 {
 	NSTrackingArea* trackingArea = [[NSTrackingArea alloc] initWithRect:[self frame]
-    	options: (NSTrackingMouseMoved | NSTrackingActiveAlways) owner:self userInfo:nil];
+	                                                            options: (NSTrackingMouseMoved | NSTrackingActiveAlways)
+	                                                              owner:self
+	                                                           userInfo:nil];
 	[self addTrackingArea:trackingArea];
 }
 
@@ -258,21 +260,18 @@ static int getModifierFlags(int flags)
 CFStringRef createStringForKey(CGKeyCode keyCode)
 {
 	TISInputSourceRef currentKeyboard = TISCopyCurrentKeyboardInputSource();
-    CFDataRef layoutData =
+	CFDataRef layoutData = TISGetInputSourceProperty(currentKeyboard, kTISPropertyUnicodeKeyLayoutData);
-        TISGetInputSourceProperty(currentKeyboard,
-                                  kTISPropertyUnicodeKeyLayoutData);
 
 	if (!layoutData)
 		return 0;
 
-    const UCKeyboardLayout *keyboardLayout =
+	const UCKeyboardLayout *keyboardLayout = (const UCKeyboardLayout *)CFDataGetBytePtr(layoutData);
-        (const UCKeyboardLayout *)CFDataGetBytePtr(layoutData);
 
 	UInt32 keysDown = 0;
 	UniChar chars[4];
 	UniCharCount realLength;
 
-    UCKeyTranslate(keyboardLayout,
+	UCKeyTranslate( keyboardLayout,
 					keyCode,
 					kUCKeyActionDisplay,
 					0,
@@ -281,7 +280,7 @@ CFStringRef createStringForKey(CGKeyCode keyCode)
 					&keysDown,
 					sizeof(chars) / sizeof(chars[0]),
 					&realLength,
-                   chars);
+					chars );
 	CFRelease(currentKeyboard);
 
 	return CFStringCreateWithCharacters(kCFAllocatorDefault, chars, 1);
@@ -511,5 +510,3 @@ void Window_setTitle(const char* title)
 {
 	[g_window setTitle:[NSString stringWithUTF8String:title]];
 }
-
-

ogl_editor/src/macosx/delegate.h

@@ -1,4 +1,3 @@
-
 #import <Cocoa/Cocoa.h>
 
 @interface RocketAppDelegate : NSObject <NSApplicationDelegate> {

ogl_editor/src/macosx/main.m

@@ -1,4 +1,3 @@
-
 #import <OpenGL/OpenGL.h>
 #import <Cocoa/Cocoa.h>
 

ogl_editor/src/minmax.h

@@ -21,4 +21,3 @@ static EMGUI_INLINE int mini(int a, int b)
 
 	return b;
 }
-

ogl_editor/src/rlog.c

@@ -52,4 +52,3 @@ void rlog_level_pop()
 {
 	s_log_level = s_old_level;
 }
-

ogl_editor/src/rlog.h

@@ -11,4 +11,3 @@ void rlog(int logLevel, const char* format, ...);
 void rlog_set_level(int logLevel);
 void rlog_level_push();
 void rlog_level_pop();
-