Fix where image component decoding takes place.
Merge pull request #2947 from brendandahl/decoding

Fix where image component decoding takes place.