Ethan's fixes to my previous changes to this file. The changed function calls should not have template parameters.
Ethan's fixes to my previous changes to this file. The changed function calls should not have template parameters.

oneminot/libcvd,oneminot/libcvd,oneminot/libcvd