[Scummvm-cvs-logs] SF.net SVN: scummvm:[42486] scummvm/trunk/graphics/font.cpp

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Tue Jul 14 20:14:20 CEST 2009


Revision: 42486
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42486&view=rev
Author:   lordhoto
Date:     2009-07-14 18:14:20 +0000 (Tue, 14 Jul 2009)

Log Message:
-----------
Got rid of ioFailed in font code, also added another check for err() when loading bdf fonts from text files.

Modified Paths:
--------------
    scummvm/trunk/graphics/font.cpp

Modified: scummvm/trunk/graphics/font.cpp
===================================================================
--- scummvm/trunk/graphics/font.cpp	2009-07-14 18:11:33 UTC (rev 42485)
+++ scummvm/trunk/graphics/font.cpp	2009-07-14 18:14:20 UTC (rev 42486)
@@ -572,8 +572,10 @@
 
 NewFont *NewFont::loadFont(Common::SeekableReadStream &stream) {
 	NewFontData *data = bdf_read_font(stream);
-	if (!data)
+	if (!data || stream.err()) {
+		free_font(data);
 		return 0;
+	}
 
 	FontDesc desc;
 	desc.name = data->name;
@@ -673,7 +675,7 @@
 	data->defaultchar = stream.readUint16BE();
 	data->bits_size = stream.readUint32BE();
 
-	data->bits = (bitmap_t*)malloc(sizeof(bitmap_t)*data->bits_size);
+	data->bits = (bitmap_t *)malloc(sizeof(bitmap_t) * data->bits_size);
 	if (!data->bits) {
 		free(data);
 		return 0;
@@ -685,7 +687,7 @@
 
 	bool hasOffsetTable = (stream.readByte() != 0);
 	if (hasOffsetTable) {
-		data->offset = (unsigned long*)malloc(sizeof(unsigned long)*data->size);
+		data->offset = (unsigned long *)malloc(sizeof(unsigned long) * data->size);
 		if (!data->offset) {
 			free(data->bits);
 			free(data);
@@ -699,7 +701,7 @@
 
 	bool hasWidthTable = (stream.readByte() != 0);
 	if (hasWidthTable) {
-		data->width = (unsigned char*)malloc(sizeof(unsigned char)*data->size);
+		data->width = (unsigned char *)malloc(sizeof(unsigned char) * data->size);
 		if (!data->width) {
 			free(data->bits);
 			free(data->offset);
@@ -714,7 +716,7 @@
 
 	bool hasBBXTable = (stream.readByte() != 0);
 	if (hasBBXTable) {
-		data->bbx = (BBX *)malloc(sizeof(BBX)*data->size);
+		data->bbx = (BBX *)malloc(sizeof(BBX) * data->size);
 		if (!data->bbx) {
 			free(data->bits);
 			free(data->offset);
@@ -750,7 +752,7 @@
 	desc.bits_size = data->bits_size;
 
 	font = new NewFont(desc, data);
-	if (!font || stream.ioFailed()) {
+	if (!font || stream.err()) {
 		free(data->bits);
 		free(data->offset);
 		free(data->width);


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