Merge pull request #1001 from rouault/subtile_decoding_stage2