Bugfixes. Code compiles now.
Changes in convert_imagepairset.cpp that were missed out on previous commit. Bugfix that lets code compile.