clean up getScaling for complex
make clang a bit happier
Merge branch 'master' into filesystem_v3

Conflicts:
	lib/ImageIO/imageFormat_compressed.cpp