[libheif-freeworld/f37] (2 commits) ...backport fix for issue#590