Revert part of the previous commit which was wrong. (Looks like the leak is in ConvertImage when the input and output formats are the same ... fix comming)