2009-07-31 Xan Lopez <xlopez@igalia.com>
authorxan@webkit.org <xan@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 31 Jul 2009 12:06:57 +0000 (12:06 +0000)
committerxan@webkit.org <xan@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 31 Jul 2009 12:06:57 +0000 (12:06 +0000)
        Reviewed by Mark Rowe.

        Fix compiler warning.
        https://bugs.webkit.org/show_bug.cgi?id=27851

        GCC does not like multi-character character constants, so use the
        explicit numerical value of 'BM' in the enum.

        * platform/image-decoders/bmp/BMPImageDecoder.cpp:
        (WebCore::BMPImageDecoder::processFileHeader):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@46626 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp

index 4177876..a5f1f90 100644 (file)
@@ -1,3 +1,16 @@
+2009-07-31  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Mark Rowe.
+
+        Fix compiler warning.
+        https://bugs.webkit.org/show_bug.cgi?id=27851
+
+        GCC does not like multi-character character constants, so use the
+        explicit numerical value of 'BM' in the enum.
+
+        * platform/image-decoders/bmp/BMPImageDecoder.cpp:
+        (WebCore::BMPImageDecoder::processFileHeader):
+
 2009-07-30  Brady Eidson  <beidson@apple.com>
 
         Reviewed by Mark Rowe, but Dan Bernstein also reviewed and asked thoughtful questions.
index edd2c07..8d8e1ee 100644 (file)
@@ -125,7 +125,7 @@ bool BMPImageDecoder::processFileHeader(size_t* imgDataOffset)
 
     // See if this is a bitmap filetype we understand.
     enum {
-        BMAP = 'BM',
+        BMAP = 0x424D, // 'BM'
         // The following additional OS/2 2.x header values (see
         // http://www.fileformat.info/format/os2bmp/egff.htm ) aren't widely
         // decoded, and are unlikely to be in much use.