merge from trunk r49340 to fix test error message


git-svn-id: https://root.cern.ch/svn/root/branches/v5-34-00-patches@49341 27541ba8-7e3a-0410-8455-c3a389f83636
Add some explicit casts to silence -Wconversion warnings.


git-svn-id: https://root.cern.ch/svn/root/branches/v5-34-00-patches@49346 27541ba8-7e3a-0410-8455-c3a389f83636