[Scummvm-cvs-logs] SF.net SVN: scummvm:[33677] scummvm/branches/gsoc2008-vkeybd

kenny-d at users.sourceforge.net kenny-d at users.sourceforge.net
Thu Aug 7 15:19:01 CEST 2008


Revision: 33677
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33677&view=rev
Author:   kenny-d
Date:     2008-08-07 13:19:00 +0000 (Thu, 07 Aug 2008)

Log Message:
-----------
* Some Valgrind fixes
* Got rid of svn:mergeinfo properties

Modified Paths:
--------------
    scummvm/branches/gsoc2008-vkeybd/backends/common/virtual-keyboard-gui.cpp
    scummvm/branches/gsoc2008-vkeybd/backends/common/virtual-keyboard.cpp

Property Changed:
----------------
    scummvm/branches/gsoc2008-vkeybd/
    scummvm/branches/gsoc2008-vkeybd/backends/common/action.cpp
    scummvm/branches/gsoc2008-vkeybd/backends/common/action.h


Property changes on: scummvm/branches/gsoc2008-vkeybd
___________________________________________________________________
Deleted: svn:mergeinfo
   - /scummvm/trunk:32879-33169,33188-33446


Property changes on: scummvm/branches/gsoc2008-vkeybd/backends/common/action.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: scummvm/branches/gsoc2008-vkeybd/backends/common/action.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - 

Modified: scummvm/branches/gsoc2008-vkeybd/backends/common/virtual-keyboard-gui.cpp
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/common/virtual-keyboard-gui.cpp	2008-08-07 10:53:33 UTC (rev 33676)
+++ scummvm/branches/gsoc2008-vkeybd/backends/common/virtual-keyboard-gui.cpp	2008-08-07 13:19:00 UTC (rev 33677)
@@ -43,6 +43,8 @@
 	_firstRun = true;
 
 	_displayEnabled = false;
+
+	_cursorAnimateTimer = 0;
 }
 
 void VirtualKeyboardGUI::initMode(VirtualKeyboard::Mode *mode) {
@@ -266,6 +268,7 @@
 	OverlayColor *scr = (OverlayColor *)surf.pixels;
 	const OverlayColor *ove = (OverlayColor *) _overlayBackup.getBasePtr(_dirtyRect.left, _dirtyRect.top);
 	int16 h = surf.h;
+
 	while (h-- > 0) {
 		memcpy(scr, ove, surf.w * sizeof(OverlayColor));
 		scr += surf.w;

Modified: scummvm/branches/gsoc2008-vkeybd/backends/common/virtual-keyboard.cpp
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/common/virtual-keyboard.cpp	2008-08-07 10:53:33 UTC (rev 33676)
+++ scummvm/branches/gsoc2008-vkeybd/backends/common/virtual-keyboard.cpp	2008-08-07 13:19:00 UTC (rev 33677)
@@ -67,7 +67,6 @@
 }
 
 bool VirtualKeyboard::loadKeyboardPack(Common::String packName) {
-
 	if (Common::File::exists(packName + ".xml")) {
 		// uncompressed keyboard pack
 		if (!_parser->loadFile(packName + ".xml"))
@@ -81,7 +80,7 @@
 			unz_file_info fileInfo;
 			unzOpenCurrentFile(zipFile);
 			unzGetCurrentFileInfo(zipFile, &fileInfo, NULL, 0, NULL, 0, NULL, 0);
-			byte *buffer = new byte[fileInfo.uncompressed_size+1];
+			byte *buffer = (byte *)malloc(fileInfo.uncompressed_size+1 * sizeof(byte));
 			assert(buffer);
 			memset(buffer, 0, (fileInfo.uncompressed_size+1)*sizeof(byte));
 			unzReadCurrentFile(zipFile, buffer, fileInfo.uncompressed_size);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list