Merge pull request #1381 from rouault/htj2k_followup