[Scummvm-cvs-logs] SF.net SVN: scummvm:[46721] tools/branches/gsoc2009-gui/create_sjisfnt.cpp

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Tue Dec 29 23:29:59 CET 2009


Revision: 46721
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46721&view=rev
Author:   lordhoto
Date:     2009-12-29 22:29:59 +0000 (Tue, 29 Dec 2009)

Log Message:
-----------
Fix broken compilation, which is a regression from r46711.

Modified Paths:
--------------
    tools/branches/gsoc2009-gui/create_sjisfnt.cpp

Modified: tools/branches/gsoc2009-gui/create_sjisfnt.cpp
===================================================================
--- tools/branches/gsoc2009-gui/create_sjisfnt.cpp	2009-12-29 22:26:09 UTC (rev 46720)
+++ tools/branches/gsoc2009-gui/create_sjisfnt.cpp	2009-12-29 22:29:59 UTC (rev 46721)
@@ -98,14 +98,14 @@
 		return -1;
 	}
 
-	std::atexit(deinitSJIStoUTF32Conversion);
+	atexit(deinitSJIStoUTF32Conversion);
 
 	if (!initFreeType(font)) {
 		error("Could not initialize FreeType library.");
 		return -1;
 	}
 
-	std::atexit(deinitFreeType);
+	atexit(deinitFreeType);
 
 	GlyphList glyphs;
 	int chars8x16 = 0;
@@ -160,7 +160,7 @@
 	for (GlyphList::const_iterator i = glyphs.begin(); i != glyphs.end(); ++i)
 		minXOffset = std::min(minXOffset, i->xOffset);
 
-	minXOffset = std::abs(minXOffset);
+	minXOffset = abs(minXOffset);
 
 	for (GlyphList::iterator i = glyphs.begin(); i != glyphs.end(); ++i)
 		i->xOffset += minXOffset;
@@ -453,7 +453,7 @@
 	glyph.plainData = 0;
 
 	if (glyph.height) {
-		glyph.plainData = new uint8[glyph.height * std::abs(glyph.pitch)];
+		glyph.plainData = new uint8[glyph.height * abs(glyph.pitch)];
 		if (!glyph.plainData)
 			return false;
 
@@ -464,13 +464,13 @@
 			dst += (glyph.height - 1) * (-glyph.pitch);
 
 		for (int i = 0; i < bitmap.rows; ++i) {
-			memcpy(dst, src, std::abs(glyph.pitch));
+			memcpy(dst, src, abs(glyph.pitch));
 			src += bitmap.pitch;
 			dst += glyph.pitch;
 		}
 	}
 
-	glyph.pitch = std::abs(glyph.pitch);
+	glyph.pitch = abs(glyph.pitch);
 
 	return true;
 }


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