Merge pull request #1010 from rouault/subtile_decoding_stage3