Fix #654, 655: fix build against exiv2-0.27.x