commit cd91cc4be424b8c0ff76f99101126ac911aaf795
parent d8926f87aa0f78c2044bb67fc34b627c22631615
Author: Fabian Wermelinger <fabianw@mavt.ethz.ch>
Date: Wed, 28 Jun 2017 11:03:19 +0200
changed input type and paper type from 'hdf5' to 'h5'
Diffstat:
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/apps/polaroidCamera/SceneProcessor.cpp b/apps/polaroidCamera/SceneProcessor.cpp
@@ -45,7 +45,7 @@ void SceneProcessor::_prepare_cam()
m_photo = new PNG_HSV;
else if (paper == "png_mono")
m_photo = new PNG_MONO;
- else if (paper == "hdf5")
+ else if (paper == "h5")
m_photo = new PhotoHDF5;
else if (paper == "ascii")
m_photo = new PhotoASCII;
@@ -61,11 +61,11 @@ void SceneProcessor::_prepare_cam()
void SceneProcessor::_load_cam(Polaroid& cam, const char* const fname) const
{
- const string input_type = m_parser("-input").asString("hdf5");
+ const string input_type = m_parser("-input").asString("h5");
- if (input_type == "hdf5")
+ if (input_type == "h5")
cam.load_hdf5(fname, m_parser);
- else if (input_type == "hdf5_slice")
+ else if (input_type == "h5_slice")
cam.load_hdf5_slice(fname, m_parser);
else if (input_type == "wavelet")
cam.load_wavelet(fname, m_parser);