1186112 - Get rid of the #define'd constants in BMPFileHeaders.h

Status: RESOLVED FIXED

(Core :: Graphics: ImageLib, defect)

Description

[Seth Fowler [:seth] [:s2h]]

BMPFileHeaders.h is an obstacle to both refactoring and unified compilation in ImageLib because it defines constants with the same names as constants defined in windows.h. Rather than continuing to fight this issue with careful include order and separate compilation, let's just get rid of those #define's once and for all.

In this bug I'll replace the #define's with a combination of static constants and struct-wrapped enums. (I can't use |enum class| for these constants because we do math with them and assign them to integer variables.)

Comment 1

[Seth Fowler [:seth] [:s2h]]

Attachment: Get rid of the #define'd constants in BMPFileHeaders.h

Here's the patch. Outside of BMPFileHeaders.h this is entirely search and
replace, with a pass over the resulting diff to make sure everything looks right
and fix formatting.

Comment 2

[Seth Fowler [:seth] [:s2h]]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=c25376086365

Comment 3

[Seth Fowler [:seth] [:s2h]]

Attachment: Get rid of the #define'd constants in BMPFileHeaders.h

Needed to rename one more constant. Tricksy #define's...

Comment 4

[Seth Fowler [:seth] [:s2h]]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=5069cbc63109

Comment 5

[Seth Fowler [:seth] [:s2h]]

OK, try looks good.

Comment 6

[Seth Fowler [:seth] [:s2h]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/a06de7923088

Comment 7

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/a06de7923088