DESKADV: Update for changes in upstream master image decoder API.