Hi,

attached are new versions of patches. This time, the cairo support for
imagemagick is better integrated into existing code.