Merge pull request #636 from uclouvain/opj_malloc-625