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