Merge pull request #1134 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp4:develop to develop
Fixed HDFFV-10481 and HDFFV-10477
* commit '83ca39ba9a2d6852dd7754b533f7839e9d2a0107':
Combined macro lines as Dana commented Platforms tested: Linux/64 (jelly) (very minor)
Fixed division-by-zero issues Description: Fixed HDFFV-10481 and HDFFV-10477, division by 0. Fixed another occurrence beside what were reported. Also, changed a local variable to avoid an unnecessary cast. Platforms tested: Linux/64 (jelly) Linux/32 (jam) Darwin (osx1010test)
