Starting from 2021-07-01, all LRZ GitLab users will be required to explicitly accept the GitLab Terms of Service. Please see the detailed information at https://doku.lrz.de/display/PUBLIC/GitLab and make sure that your projects conform to the requirements.

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

* Fixed wrong bounding box parsing in AmiraMeshReader

* Fixed MSVC warning in mainwindow.cpp
parent 30c89024
......@@ -322,7 +322,7 @@ namespace campvis {
std::string pipeScript = "pipeline = pipelines[\"" + _selectedPipeline->getName()+"\"]\n\n";
for (size_t i = 0; i < _selectedPipeline->getProcessors().size(); i++) {
pipeScript += "proc = pipeline:getProcessor(" + StringUtils::toString(i) + ")\n";
AbstractProcessor* proc = _selectedPipeline->getProcessor(i);
AbstractProcessor* proc = _selectedPipeline->getProcessor(int(i));
_pcLua->updatePropCollection(proc, &_selectedPipeline->getDataContainer());
std::string res = _pcLua->getLuaScript(std::string(""), std::string("proc:"));
......
......@@ -143,8 +143,8 @@ namespace {
throw cgt::FileException("Unsupported BoundingBox structure in file.", p_url.getValue());
cgt::vec3 llf, urb;
for (size_t i = 0; i < 3; ++i) {
llf[i] = StringUtils::fromString<float>(parts[i+1]);
urb[i] = StringUtils::fromString<float>(parts[i+4]);
llf[i] = StringUtils::fromString<float>(parts[2*i + 1]);
urb[i] = StringUtils::fromString<float>(parts[2*i + 2]);
}
imageOffset = llf;
voxelSize = (urb - llf) / cgt::vec3(size);
......
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