fix cropping data race
Merge branch 'master' of https://github.com/Maddis1337/Cilk-Image-Comparison

Conflicts:
	puzzlediff_cpp/My Amplifier XE Results - puzzlediff_cpp/My Amplifier XE Results - puzzlediff_cpp.amplxeproj
	puzzlediff_cpp/My Amplifier XE Results - puzzlediff_cpp/r000hs/config/log.cfg
	puzzlediff_cpp/My Amplifier XE Results - puzzlediff_cpp/r000hs/config/state.cfg
	puzzlediff_cpp/My Amplifier XE Results - puzzlediff_cpp/r000hs/config/viewpoint.cfg
	puzzlediff_cpp/My Amplifier XE Results - puzzlediff_cpp/r000hs/config/viewpoint_processed.cfg
	puzzlediff_cpp/puzzle-diff.cpp