Merge topic 'FixCppcheckSTLSizeWarning'

1f7b2d7 ENH: Fix Cppcheck possible inefficient checking for emptiness warning
ENH: Fix Cppcheck warnings in RegisterImages

Change-Id: I3eb85d0f7f98390c9b996b7271e57d50dc6e136a