Bug 926755 add image diff function
merge
solve coding style