fix for pedantic warnings
Merge branch 'master' of https://github.com/openframeworks/openFrameworks into fix-pedantic-warnings
Merge pull request #3161 from underdoeg/fix-pedantic-warnings

Fix pedantic warnings