Merge pull request #2942 from brendandahl/add-back-cid

Add back cid cff font test.
Fix where image component decoding takes place.