[PATCH] D46816: [llvm-rc] Read the Planes/BitCount fields from BITMAPINFOHEADER for icons

[Zachary Turner via Phabricator via llvm-commits]

zturner added inline comments.


================
Comment at: tools/llvm-rc/ResourceFileWriter.cpp:945-946
     RETURN_IF_ERROR(Reader.readObject(BMPHeader));
-    NewHeader.Planes = BMPHeader->Planes;
-    NewHeader.BitCount = BMPHeader->BitCount;
-
-    // Two WORDs were written at the beginning of the resource (hotspot
-    // location). This is reflected in Size field.
-    NewHeader.Size = OldHeader.Size + 2 * sizeof(uint16_t);
+    constexpr size_t BITMAPINFOHEADER_size = 0x28;
+    if (BMPHeader->Size == BITMAPINFOHEADER_size) {
+      NewHeader.Planes = BMPHeader->Planes;
----------------
How about just `sizeof(BitmapInfoHeader)`?


Repository:
  rL LLVM

https://reviews.llvm.org/D46816