Please keep merging some fixes from WinMerge/FreeImage

[guilt]

Hi,

Time to time, I'm looking for a better maintained version of this library. Yours seems to be the most up-to-date one, save some patches in the WinMerge fork. Could I request you to review, pull in their diffs and make a recent release? 🙏