charles.gueunet
/
vtk
mirror of https://gitlab.kitware.com/charles.gueunet/vtk
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

improve(CompositeArray): switch ordering of allocation

HTGFixUnlimitedToRoot
Julien Fausty 2022-11-18 15:56:56 +01:00
parent 2bb46a9b06
commit c0233ec6dd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Common/ImplicitArrays/vtkCompositeArray.txx
View File

@ -33,9 +33,9 @@ vtkSmartPointer<vtkCompositeArray<T>> Concatenate(const std::vector<vtkDataArray
vtkNew<vtkCompositeArray<T>> composite;
composite->SetBackend(
std::make_shared<vtkCompositeImplicitBackend<T>>(lifetimeBuffer[i], lifetimeBuffer[i + 1]));
composite->SetNumberOfComponents(lifetimeBuffer[i]->GetNumberOfComponents());
composite->SetNumberOfTuples(
lifetimeBuffer[i]->GetNumberOfTuples() + lifetimeBuffer[i + 1]->GetNumberOfTuples());
composite->SetNumberOfComponents(lifetimeBuffer[i]->GetNumberOfComponents());
newComps.emplace_back(composite);
}
if (lifetimeBuffer.size() % 2 != 0)
@ -43,9 +43,9 @@ vtkSmartPointer<vtkCompositeArray<T>> Concatenate(const std::vector<vtkDataArray
vtkNew<vtkCompositeArray<T>> composite;
composite->SetBackend(
std::make_shared<vtkCompositeImplicitBackend<T>>(newComps.back(), lifetimeBuffer.back()));
composite->SetNumberOfComponents(lifetimeBuffer.back()->GetNumberOfComponents());
composite->SetNumberOfTuples(
newComps.back()->GetNumberOfTuples() + lifetimeBuffer.back()->GetNumberOfTuples());
composite->SetNumberOfComponents(lifetimeBuffer.back()->GetNumberOfComponents());
newComps.back() = composite;
}
lifetimeBuffer.assign(newComps.begin(), newComps.end());

2
Common/ImplicitArrays/vtkCompositeImplicitBackend.txx
View File

@ -36,7 +36,7 @@ struct vtkCompositeImplicitBackend<ValueType>::Internals
}
this->LeftRange = vtk::DataArrayValueRange(this->Left);
this->RightRange = vtk::DataArrayValueRange(this->Right);
this->Offset = LeftRange.size();
this->Offset = this->LeftRange.size();
}
vtkSmartPointer<vtkDataArray> Left;