Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(432)

Side by Side Diff: Source/platform/image-decoders/bmp/BMPImageReader.h

Issue 213613002: Change the BMP decoder to not reject paletted images which use color indexes (Closed) Base URL: svn://svn.chromium.org/blink/trunk/
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/platform/image-decoders/bmp/BMPImageReader.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2008, 2009, Google Inc. All rights reserved. 2 * Copyright (c) 2008, 2009, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 // the 32 bits of pixel data, and left shift to scale the color values 325 // the 32 bits of pixel data, and left shift to scale the color values
326 // up for fields with less than 8 bits of precision. Sadly, we can't 326 // up for fields with less than 8 bits of precision. Sadly, we can't
327 // just combine these into one shift value because the net shift amount 327 // just combine these into one shift value because the net shift amount
328 // could go either direction. (If only "<< -x" were equivalent to 328 // could go either direction. (If only "<< -x" were equivalent to
329 // ">> x"...) 329 // ">> x"...)
330 uint32_t m_bitMasks[4]; 330 uint32_t m_bitMasks[4];
331 int m_bitShiftsRight[4]; 331 int m_bitShiftsRight[4];
332 int m_bitShiftsLeft[4]; 332 int m_bitShiftsLeft[4];
333 333
334 // The color palette, for paletted formats. 334 // The color palette, for paletted formats.
335 size_t m_tableSizeInBytes;
Peter Kasting 2014/03/26 21:35:52 This is just cleanup unconnected to the bugfix: we
336 Vector<RGBTriple> m_colorTable; 335 Vector<RGBTriple> m_colorTable;
337 336
338 // The coordinate to which we've decoded the image. 337 // The coordinate to which we've decoded the image.
339 IntPoint m_coord; 338 IntPoint m_coord;
340 339
341 // Variables that track whether we've seen pixels with alpha values != 0 340 // Variables that track whether we've seen pixels with alpha values != 0
342 // and == 0, respectively. See comments in processNonRLEData() on how 341 // and == 0, respectively. See comments in processNonRLEData() on how
343 // these are used. 342 // these are used.
344 bool m_seenNonZeroAlphaPixel; 343 bool m_seenNonZeroAlphaPixel;
345 bool m_seenZeroAlphaPixel; 344 bool m_seenZeroAlphaPixel;
346 345
347 // ICOs store a 1bpp "mask" immediately after the main bitmap image data 346 // ICOs store a 1bpp "mask" immediately after the main bitmap image data
348 // (and, confusingly, add its height to the biHeight value in the info 347 // (and, confusingly, add its height to the biHeight value in the info
349 // header, thus doubling it). This variable tracks whether we have such 348 // header, thus doubling it). This variable tracks whether we have such
350 // a mask and if we've started decoding it yet. 349 // a mask and if we've started decoding it yet.
351 AndMaskState m_andMaskState; 350 AndMaskState m_andMaskState;
352 }; 351 };
353 352
354 } // namespace WebCore 353 } // namespace WebCore
355 354
356 #endif 355 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/platform/image-decoders/bmp/BMPImageReader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698