Commit e7294cd1 authored by Patrik Huber's avatar Patrik Huber

Fixed compile errors on Clang/gcc

parent b48d1ebb
...@@ -208,8 +208,8 @@ OrthographicRenderingParameters estimate_orthographic_camera(std::vector<cv::Vec ...@@ -208,8 +208,8 @@ OrthographicRenderingParameters estimate_orthographic_camera(std::vector<cv::Vec
auto info = lm.minimize(parameters); // we could or should use the return value auto info = lm.minimize(parameters); // we could or should use the return value
// 'parameters' contains the solution now. // 'parameters' contains the solution now.
Frustum camera_frustum{ -1.0f * aspect * parameters[5], 1.0f * aspect * parameters[5], -1.0f * parameters[5], 1.0f * parameters[5] }; Frustum camera_frustum{ -1.0f * aspect * static_cast<float>(parameters[5]), 1.0f * aspect * static_cast<float>(parameters[5]), -1.0f * static_cast<float>(parameters[5]), 1.0f * static_cast<float>(parameters[5]) };
return RenderingParameters{ static_cast<float>(parameters[0]), static_cast<float>(parameters[1]), static_cast<float>(parameters[2]), static_cast<float>(parameters[3]), static_cast<float>(parameters[4]), camera_frustum }; return OrthographicRenderingParameters{ static_cast<float>(parameters[0]), static_cast<float>(parameters[1]), static_cast<float>(parameters[2]), static_cast<float>(parameters[3]), static_cast<float>(parameters[4]), camera_frustum };
}; };
} /* namespace fitting */ } /* namespace fitting */
......
...@@ -214,7 +214,6 @@ Texture create_mipmapped_texture(cv::Mat image, unsigned int mipmapsNum = 0) { ...@@ -214,7 +214,6 @@ Texture create_mipmapped_texture(cv::Mat image, unsigned int mipmapsNum = 0) {
return texture; return texture;
}; };
};
} /* namespace render */ } /* namespace render */
} /* namespace eos */ } /* namespace eos */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment