← Back to branch summary

~ubuntu-branches/ubuntu/lucid/webkit/lucid-updates

« back to all changes in this revision

Viewing changes to WebCore/platform/image-decoders/bmp/BMPImageReader.h

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2010-01-06 21:25:06 UTC
  • mfrom: (1.2.6 upstream) (4.3.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100106212506-gd0czn4zrwf1j19l
http://bugs.debian.org/529271
http://bugs.debian.org/559420
* New upstream release
- adds basic Content-Encoding support, thanks to soup
  (Closes: #529271)
- fixes over-advertising content types as supported by
  the media player (Closes: #559420)
* debian/control:
- updated libsoup build requirement (>= 2.28.2)
* debian/libwebkit-1.0-2.symbols:
- updated with new symbols
* debian/copyright:
- updated information since 1.1.17
* Imported patch from https://bugs.webkit.org/show_bug.cgi?id=30623
- I am shipping this patch because I believe it is correct, it is the
  way to go, it fixes a race, and it needs testing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
WebCore/platform/image-decoders/bmp/BMPImageReader.h
46
46
        {
47
47
            uint16_t result;
48
48
            memcpy(&result, &data->data()[offset], 2);
49
 
        #if PLATFORM(BIG_ENDIAN)
 
49
        #if CPU(BIG_ENDIAN)
50
50
            result = ((result & 0xff) << 8) | ((result & 0xff00) >> 8);
51
51
        #endif
52
52
            return result;
56
56
        {
57
57
            uint32_t result;
58
58
            memcpy(&result, &data->data()[offset], 4);
59
 
        #if PLATFORM(BIG_ENDIAN)
 
59
        #if CPU(BIG_ENDIAN)
60
60
            result = ((result & 0xff) << 24) | ((result & 0xff00) << 8) |
61
61
                ((result & 0xff0000) >> 8) | ((result & 0xff000000) >> 24);
62
62
        #endif
202
202
                // won't read it.
203
203
                uint32_t pixel;
204
204
                memcpy(&pixel, &m_data->data()[m_decodedOffset + offset], 3);
205
 
        #if PLATFORM(BIG_ENDIAN)
 
205
        #if CPU(BIG_ENDIAN)
206
206
                pixel = ((pixel & 0xff00) << 8) | ((pixel & 0xff0000) >> 8) |
207
207
                    ((pixel & 0xff000000) >> 24);
208
208
        #endif