Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."