[Scummvm-cvs-logs] SF.net SVN: scummvm:[55735] scummvm/trunk/engines/gob/surface.cpp

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Wed Feb 2 18:28:29 CET 2011


Revision: 55735
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55735&view=rev
Author:   drmccoy
Date:     2011-02-02 17:28:28 +0000 (Wed, 02 Feb 2011)

Log Message:
-----------
GOB: Fix detection of JPEG images

Thanks, clone :P

Modified Paths:
--------------
    scummvm/trunk/engines/gob/surface.cpp

Modified: scummvm/trunk/engines/gob/surface.cpp
===================================================================
--- scummvm/trunk/engines/gob/surface.cpp	2011-02-02 17:03:14 UTC (rev 55734)
+++ scummvm/trunk/engines/gob/surface.cpp	2011-02-02 17:28:28 UTC (rev 55735)
@@ -819,19 +819,19 @@
 	if ((stream.size() - startPos) < 17)
 		return kImageTypeNone;
 
-	char buffer[4];
-	if (!stream.read(buffer, 4))
+	char buffer[10];
+	if (!stream.read(buffer, 10))
 		return kImageTypeNone;
 
 	stream.seek(startPos);
 
-	if (!strncmp(buffer, "FORM", 4))
+	if (!strncmp(buffer    , "FORM", 4))
 		return kImageTypeLBM;
-	if (!strncmp(buffer, "JFIF", 4))
+	if (!strncmp(buffer + 6, "JFIF", 4))
 		return kImageTypeJPEG;
-	if (!strncmp(buffer, "BRC" , 3))
+	if (!strncmp(buffer    , "BRC" , 3))
 		return kImageTypeBRC;
-	if (!strncmp(buffer, "BM"  , 2))
+	if (!strncmp(buffer    , "BM"  , 2))
 		return kImageTypeBMP;
 
 	// Try to determine if it's maybe a TGA


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