Issue #4580: Fix image format constant inconsistence