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

Side by Side Diff: third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoder.cpp

Issue 2701993002: DO NOT COMMIT: Results of running new (proposed) clang-format on Blink (Closed)
Patch Set: Created 3 years, 10 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
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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 fastReader.getConsecutiveData(0, sizeOfFileHeader, buffer); 101 fastReader.getConsecutiveData(0, sizeOfFileHeader, buffer);
102 const uint16_t fileType = 102 const uint16_t fileType =
103 (fileHeader[0] << 8) | static_cast<uint8_t>(fileHeader[1]); 103 (fileHeader[0] << 8) | static_cast<uint8_t>(fileHeader[1]);
104 imgDataOffset = BMPImageReader::readUint32(&fileHeader[10]); 104 imgDataOffset = BMPImageReader::readUint32(&fileHeader[10]);
105 m_decodedOffset = sizeOfFileHeader; 105 m_decodedOffset = sizeOfFileHeader;
106 106
107 // See if this is a bitmap filetype we understand. 107 // See if this is a bitmap filetype we understand.
108 enum { 108 enum {
109 BMAP = 0x424D, // "BM" 109 BMAP = 0x424D, // "BM"
110 // The following additional OS/2 2.x header values (see 110 // The following additional OS/2 2.x header values (see
111 // http://www.fileformat.info/format/os2bmp/egff.htm ) aren't widely 111 // http://www.fileformat.info/format/os2bmp/egff.htm )
112 // decoded, and are unlikely to be in much use. 112 // aren't widely decoded, and are unlikely to be in much
113 // use.
113 /* 114 /*
114 ICON = 0x4943, // "IC" 115 ICON = 0x4943, // "IC"
115 POINTER = 0x5054, // "PT" 116 POINTER = 0x5054, // "PT"
116 COLORICON = 0x4349, // "CI" 117 COLORICON = 0x4349, // "CI"
117 COLORPOINTER = 0x4350, // "CP" 118 COLORPOINTER = 0x4350, // "CP"
118 BITMAPARRAY = 0x4241, // "BA" 119 BITMAPARRAY = 0x4241, // "BA"
119 */ 120 */
120 }; 121 };
121 return (fileType == BMAP) || setFailed(); 122 return (fileType == BMAP) || setFailed();
122 } 123 }
123 124
124 } // namespace blink 125 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698