Commit b98c84df authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

fixed further MSVC12 warnings in SliceRenderer2D.

parent f0e01912
......@@ -94,8 +94,8 @@ namespace campvis {
float renderTargetRatio = static_cast<float>(getEffectiveViewportSize().x) / static_cast<float>(getEffectiveViewportSize().y);
tgt::vec2 topLeft_px(p_cropLeft.getValue(), p_cropTop.getValue());
tgt::vec2 bottomRight_px(imgSize.x - p_cropRight.getValue(), imgSize.y - p_cropBottom.getValue());
tgt::vec2 topLeft_px(static_cast<float>(p_cropLeft.getValue()), static_cast<float>(p_cropTop.getValue()));
tgt::vec2 bottomRight_px(static_cast<float>(imgSize.x - p_cropRight.getValue()), static_cast<float>(imgSize.y - p_cropBottom.getValue()));
tgt::vec2 croppedSize = bottomRight_px - topLeft_px;
float sliceRatio =
......@@ -157,7 +157,7 @@ namespace campvis {
p_transferFunction.setImageHandle(img.getDataHandle());
if (img != 0) {
const tgt::svec3& size = img->getSize();
tgt::ivec3 size = img->getSize();
/// NOTE: the setMaxValue calls create crashes, probably due to qt threading issues
// it is a lot more stable with this _lastImgSize check
......
......@@ -102,7 +102,7 @@ namespace campvis {
static const std::string loggerCat_;
private:
tgt::svec3 _lastImgSize;
tgt::ivec3 _lastImgSize;
};
}
......
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