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

[lordhoto at users.sourceforge.net]

Revision: 52967
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52967&view=rev
Author:   lordhoto
Date:     2010-10-01 20:44:41 +0000 (Fri, 01 Oct 2010)

Log Message:
-----------
GRAPHICS: Cleanup.

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

Modified: scummvm/trunk/graphics/surface.cpp
===================================================================
--- scummvm/trunk/graphics/surface.cpp	2010-10-01 19:24:52 UTC (rev 52966)
+++ scummvm/trunk/graphics/surface.cpp	2010-10-01 20:44:41 UTC (rev 52967)
@@ -180,11 +180,6 @@
 	vLine(r.right-1, r.top, r.bottom-1, color);
 }
 
-// FIXME: LordHoto asks why is this in Surface, since this
-// just supports 8bpp surfaces. Looks like someone wants
-// to subclass Surface to add this or it should be extended
-// to support 16bpp (or marked as just working for 8bpp
-// surfaces).
 void Surface::move(int dx, int dy, int height) {
 	// Short circuit check - do we have to do anything anyway?
 	if ((dx == 0 && dy == 0) || height <= 0)
@@ -224,7 +219,7 @@
 				if (bytesPerPixel == 1) {
 					*dst-- = *src--;
 				} else if (bytesPerPixel == 2) {
-					WRITE_LE_UINT16(dst, READ_LE_UINT16(src));
+					*(uint16 *)dst = *(const uint16 *)src;
 					src -= 2;
 					dst -= 2;
 				}
@@ -241,7 +236,7 @@
 				if (bytesPerPixel == 1) {
 					*dst++ = *src++;
 				} else if (bytesPerPixel == 2) {
-					WRITE_LE_UINT16(dst, READ_LE_UINT16(src));
+					*(uint16 *)dst = *(const uint16 *)src;
 					src += 2;
 					dst += 2;
 				}


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