Changeset 83461 in webkit

Timestamp:

Apr 11, 2011 11:36:13 AM (13 years ago)

Author:

tony@chromium.org

Message:

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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/CyclicRedundancyCheck.cpp (modified) (3 diffs)
• DumpRenderTree/CyclicRedundancyCheck.h (modified) (1 diff)
• DumpRenderTree/PixelDumpSupport.cpp (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+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):
+
 2011-04-10  Kimmo Kinnunen  <kimmo.t.kinnunen@nokia.com>
 

trunk/Tools/DumpRenderTree/CyclicRedundancyCheck.cpp

@@ -34 +34 @@
 #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)
@@ -48 +48 @@
 }
 
-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) {
@@ -57 +57 @@
     }
 
-    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);

trunk/Tools/DumpRenderTree/CyclicRedundancyCheck.h

@@ -34 +34 @@
 #include <wtf/Vector.h>
 
-unsigned long computeCrc(const Vector<unsigned char>&);
+unsigned computeCrc(const Vector<unsigned char>&);
 
 #endif

trunk/Tools/DumpRenderTree/PixelDumpSupport.cpp

@@ -75 +75 @@
 }
 
-static void appendIntToVector(int number, Vector<unsigned char>& vector)
+static void appendIntToVector(unsigned number, Vector<unsigned char>& vector)
 {
     size_t offset = vector.size();
@@ -98 +98 @@
     dataToCrc.append(textCommentPrefix + 4, prefixLength - 4); // Don't include the chunk length in the crc.
     dataToCrc.append(checksum, checksumLength);
-    unsigned long crc32 = computeCrc(dataToCrc);
+    unsigned crc32 = computeCrc(dataToCrc);
 
     appendIntToVector(crc32, bytesToAdd);