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