[Scummvm-cvs-logs] SF.net SVN: scummvm:[51668] scummvm/trunk

[lordhoto at users.sourceforge.net]

Revision: 51668
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51668&view=rev
Author:   lordhoto
Date:     2010-08-02 22:28:30 +0000 (Mon, 02 Aug 2010)

Log Message:
-----------
GRAPHICS: Renamed skipThumbnailHeader to skipThumbnail.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/saveload.cpp
    scummvm/trunk/engines/sci/engine/savegame.cpp
    scummvm/trunk/engines/scumm/saveload.cpp
    scummvm/trunk/engines/sword1/control.cpp
    scummvm/trunk/graphics/thumbnail.cpp
    scummvm/trunk/graphics/thumbnail.h

Modified: scummvm/trunk/engines/kyra/saveload.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload.cpp	2010-08-02 22:27:50 UTC (rev 51667)
+++ scummvm/trunk/engines/kyra/saveload.cpp	2010-08-02 22:28:30 UTC (rev 51668)
@@ -122,7 +122,7 @@
 				header.thumbnail = 0;
 			}
 		} else {
-			Graphics::skipThumbnailHeader(*in);
+			Graphics::skipThumbnail(*in);
 		}
 	}
 

Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp	2010-08-02 22:27:50 UTC (rev 51667)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2010-08-02 22:28:30 UTC (rev 51668)
@@ -748,7 +748,7 @@
 	}
 
 	// We don't need the thumbnail here, so just read it and discard it
-	Graphics::skipThumbnailHeader(*fh);
+	Graphics::skipThumbnail(*fh);
 
 	s->reset(true);
 	s->saveLoadWithSerializer(ser);	// FIXME: Error handling?

Modified: scummvm/trunk/engines/scumm/saveload.cpp
===================================================================
--- scummvm/trunk/engines/scumm/saveload.cpp	2010-08-02 22:27:50 UTC (rev 51667)
+++ scummvm/trunk/engines/scumm/saveload.cpp	2010-08-02 22:28:30 UTC (rev 51668)
@@ -364,7 +364,7 @@
 			}
 		}
 
-		Graphics::skipThumbnailHeader(*in);
+		Graphics::skipThumbnail(*in);
 	}
 
 	// Since version 56 we save additional information about the creation of
@@ -721,7 +721,7 @@
 		return false;
 	}
 
-	if (!Graphics::skipThumbnailHeader(*in)) {
+	if (!Graphics::skipThumbnail(*in)) {
 		delete in;
 		return false;
 	}

Modified: scummvm/trunk/engines/sword1/control.cpp
===================================================================
--- scummvm/trunk/engines/sword1/control.cpp	2010-08-02 22:27:50 UTC (rev 51667)
+++ scummvm/trunk/engines/sword1/control.cpp	2010-08-02 22:28:30 UTC (rev 51668)
@@ -1175,8 +1175,7 @@
 	if (saveVersion < 2) // These older version of the savegames used a flag to signal presence of thumbnail
 		inf->skip(1);
 
-	if (Graphics::checkThumbnailHeader(*inf))
-		Graphics::skipThumbnailHeader(*inf);
+	Graphics::skipThumbnail(*inf);
 
 	inf->readUint32BE();	// save date
 	inf->readUint16BE();	// save time

Modified: scummvm/trunk/graphics/thumbnail.cpp
===================================================================
--- scummvm/trunk/graphics/thumbnail.cpp	2010-08-02 22:27:50 UTC (rev 51667)
+++ scummvm/trunk/graphics/thumbnail.cpp	2010-08-02 22:28:30 UTC (rev 51668)
@@ -82,7 +82,7 @@
 	return hasHeader;
 }
 
-bool skipThumbnailHeader(Common::SeekableReadStream &in) {
+bool skipThumbnail(Common::SeekableReadStream &in) {
 	uint32 position = in.pos();
 	ThumbnailHeader header;
 

Modified: scummvm/trunk/graphics/thumbnail.h
===================================================================
--- scummvm/trunk/graphics/thumbnail.h	2010-08-02 22:27:50 UTC (rev 51667)
+++ scummvm/trunk/graphics/thumbnail.h	2010-08-02 22:28:30 UTC (rev 51668)
@@ -39,11 +39,11 @@
 bool checkThumbnailHeader(Common::SeekableReadStream &in);
 
 /**
- * Skips a thumbnail header, if present.
+ * Skips a thumbnail, if present.
  *
  * @param in	stream to process
  */
-bool skipThumbnailHeader(Common::SeekableReadStream &in);
+bool skipThumbnail(Common::SeekableReadStream &in);
 
 /**
  * Lodas a thumbnail from the given input stream.


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