commit 00a5b7956fce46b8d20b8e1b340c24a90d8f6c55
author tony@chromium.org <tony@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Mon Apr 11 18:36:13 2011 +0000
committer tony@chromium.org <tony@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Mon Apr 11 18:36:13 2011 +0000
tree 43b3f1ad094d192d72ac0e9097e48453862b4613
parent a5a59dd57c98095a7797cbc86922f7a8693a9a91

2011-04-11  Tony Chang  <tony@chromium.org>

        Reviewed by Eric Seidel.

        fix crc computation on 64 bit machines
        https://bugs.webkit.org/show_bug.cgi?id=58243

        unsigned long is dependenct on CPU architecture, so use unsigned which is always 32 bits

        * DumpRenderTree/CyclicRedundancyCheck.cpp:
        (makeCrcTable):
        (computeCrc):
        * DumpRenderTree/CyclicRedundancyCheck.h:
        * DumpRenderTree/PixelDumpSupport.cpp:
        (appendIntToVector):
        (convertChecksumToPNGComment):

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

Tools/DumpRenderTree/CyclicRedundancyCheck.cpp

diff --git a/Tools/DumpRenderTree/CyclicRedundancyCheck.cpp b/Tools/DumpRenderTree/CyclicRedundancyCheck.cpp
index b9291e9..361ea0f 100644
--- a/Tools/DumpRenderTree/CyclicRedundancyCheck.cpp
+++ b/Tools/DumpRenderTree/CyclicRedundancyCheck.cpp
@@ -33,10 +33,10 @@
 
 #include <wtf/Vector.h>
 
-static void makeCrcTable(unsigned long crcTable[256])
+static void makeCrcTable(unsigned crcTable[256])
 {
-    for (unsigned long i = 0; i < 256; i++) {
-        unsigned long c = i;
+    for (unsigned i = 0; i < 256; i++) {
+        unsigned c = i;
         for (int k = 0; k < 8; k++) {
             if (c & 1)
                 c = -306674912 ^ ((c >> 1) & 0x7fffffff);
@@ -47,16 +47,16 @@
     }
 }
 
-unsigned long computeCrc(const Vector<unsigned char>& buffer)
+unsigned computeCrc(const Vector<unsigned char>& buffer)
 {
-    static unsigned long crcTable[256];
+    static unsigned crcTable[256];
     static bool crcTableComputed = false;
     if (!crcTableComputed) {
         makeCrcTable(crcTable);
         crcTableComputed = true;
     }
 
-    unsigned long crc = 0xffffffffL;
+    unsigned crc = 0xffffffffL;
     for (size_t i = 0; i < buffer.size(); ++i)
         crc = crcTable[(crc ^ buffer[i]) & 0xff] ^ ((crc >> 8) & 0x00ffffffL);
     return crc ^ 0xffffffffL;