Better PNG detection in guessFormatFromContents

diff --git a/src/Format.cpp b/src/Format.cpp
index 6a3d49ca530883a7247e94954d0d407c9795573c..62c09d0fa4cb2245fb428d9e31c67701a9a17329 100644 (file)
--- a/src/Format.cpp
+++ b/src/Format.cpp
@@ -255,8 +255,12 @@ string guessFormatFromContents(FileName const & fn)
                        } else if (stamp == "\377\330") {
                                format =  "jpg";
 
+                       } else if (prefixIs(str, "\x89PNG")) {
+                               format =  "png";
+
                        } else if (stamp == "\001\332") {
                                format =  "sgi";
+
                        } else if (prefixIs(str, binEPSStamp)) {
                                format =  "eps";
 
@@ -319,9 +323,6 @@ string guessFormatFromContents(FileName const & fn)
                else if (contains(str, " EMF"))
                        format = "emf";
 
-               else if (contains(str, "PNG"))
-                       format = "png";
-
                else if (contains(str, "%!PS-Adobe")) {
                        // eps or ps
                        ifs >> str;