1292632 - Fix a few misc include/using issues in imagelib

Status: RESOLVED FIXED

(Core :: Graphics: ImageLib, defect)

Description

[Daniel Holbert [:dholbert]]

Filing this bug to fix some include/using related issues that I found while poking around imagelib as part of some reviews.

Comment 1

[Daniel Holbert [:dholbert]]

Attachment: (DO NOT LAND) patch to tweak mozbuild to un-unify two .cpp files

Here's the patch that I used for testing this bug.

Comment 2

[Daniel Holbert [:dholbert]]

Attachment: part 1: Remove a stale/unused #include from SurfaceCache.cpp

I noticed an include with comment...
>  // Workaround for flaw in bug 921753 part 2.
...which was included in the initial version of SurfaceCache.h:
https://hg.mozilla.org/mozilla-central/diff/59dd9491503a/image/src/SurfaceCache.cpp#l1.23

I think like that's pointing to the flaw that you called out in bug 921753 comment 16, which ehsan promptly fixed.  So, presumably we don't need this "workaround" for that flaw anymore. :)  (At least, I can build without it.)

Comment 3

[Daniel Holbert [:dholbert]]

Attachment: part 2: Add missing "using" decl for IntRect in IDecodingTask.cpp

IDecodingTask.cpp uses "IntRect" and won't build on its own without this "using" decl.

Comment 4

[Daniel Holbert [:dholbert]]

Attachment: part 3: Include <algorithm> in image/SourceBuffer.h, to provide std::min

IDecodingTask.cpp still won't quite build on its own until I add this patch, to fix a latent problem in SourceBuffer.h (which calls std::min without including <algorithm> -- until now).

Comment 5

[Daniel Holbert [:dholbert]]

Comment on attachment 8778386 [details] [diff] [review]
part 1: Remove a stale/unused #include from SurfaceCache.cpp

erm, sorry, attached the wrong patch for "part 1"

Comment 6

[Daniel Holbert [:dholbert]]

Attachment: part 1: Remove a stale/unused #include from SurfaceCache.cpp

Comment 7

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

Comment on attachment 8778397 [details] [diff] [review]
part 1: Remove a stale/unused #include from SurfaceCache.cpp

Review of attachment 8778397 [details] [diff] [review]:
-----------------------------------------------------------------

Thanks Daniel!

Comment 8

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

Comment on attachment 8778388 [details] [diff] [review]
part 2: Add missing "using" decl for IntRect in IDecodingTask.cpp

Review of attachment 8778388 [details] [diff] [review]:
-----------------------------------------------------------------

Looks good. For the particular case of mozilla::gfx in ImageLib I usually just do "using namespace mozilla::gfx", since usages are so pervasive. But this works too.

Comment 9

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

(In reply to Daniel Holbert [:dholbert] (mostly OOTO until Aug 9th) from comment #2)
> I think like that's pointing to the flaw that you called out in bug 921753
> comment 16, which ehsan promptly fixed.  So, presumably we don't need this
> "workaround" for that flaw anymore. :)  (At least, I can build without it.)

Yep! I should've fixed it right away so it didn't ossify into a mysterious comment to puzzle later maintainers years down the line. Glad we can remove that.

Comment 10

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/27c0dd5afde6
part 1: Remove a stale/unused #include from SurfaceCache.cpp. r=seth
https://hg.mozilla.org/integration/mozilla-inbound/rev/461d7103db3a
part 2: Add missing "using" decl for IntRect in IDecodingTask.cpp. r=seth
https://hg.mozilla.org/integration/mozilla-inbound/rev/d289b7a8ad1f
part 3: Include <algorithm> in image/SourceBuffer.h, to provide std::min. r=seth

Comment 11

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/27c0dd5afde6
https://hg.mozilla.org/mozilla-central/rev/461d7103db3a
https://hg.mozilla.org/mozilla-central/rev/d289b7a8ad1f