diff --git a/include/itkMeshJSON.h b/include/itkMeshJSON.h index 2905ebdbc..441771e4e 100644 --- a/include/itkMeshJSON.h +++ b/include/itkMeshJSON.h @@ -88,7 +88,7 @@ auto meshToMeshJSON(const TMesh * mesh, const WasmMesh * wasmMesh, bool i meshJSON.meshType.dimension = MeshType::PointDimension; - meshJSON.meshType.pointComponentType = wasm::MapComponentType::JSONFloatTypeEnum; + meshJSON.meshType.pointComponentType = wasm::MapComponentType::JSONFloatTypeEnum; using PointPixelType = typename TMesh::PixelType; using ConvertPointPixelTraits = MeshConvertPixelTraits; meshJSON.meshType.pointPixelComponentType = wasm::MapComponentType::JSONComponentEnum; diff --git a/include/itkOutputMesh.h b/include/itkOutputMesh.h index 371a8b8f0..4b3f92025 100644 --- a/include/itkOutputMesh.h +++ b/include/itkOutputMesh.h @@ -87,7 +87,7 @@ class ITK_TEMPLATE_EXPORT OutputMesh if (this->m_Mesh->GetNumberOfPoints() > 0) { const auto pointsAddress = reinterpret_cast< size_t >( &(wasmMesh->GetMesh()->GetPoints()->at(0)) ); - const auto pointsSize = wasmMesh->GetMesh()->GetPoints()->Size() * sizeof(typename MeshType::CoordRepType) * MeshType::PointDimension; + const auto pointsSize = wasmMesh->GetMesh()->GetPoints()->Size() * sizeof(typename MeshType::CoordinateType) * MeshType::PointDimension; setMemoryStoreOutputArray(0, index, 0, pointsAddress, pointsSize); } diff --git a/include/itkOutputPointSet.h b/include/itkOutputPointSet.h index 7db40e72c..0289c9999 100644 --- a/include/itkOutputPointSet.h +++ b/include/itkOutputPointSet.h @@ -87,7 +87,7 @@ class ITK_TEMPLATE_EXPORT OutputPointSet if (this->m_PointSet->GetNumberOfPoints() > 0) { const auto pointsAddress = reinterpret_cast< size_t >( &(wasmPointSet->GetPointSet()->GetPoints()->at(0)) ); - const auto pointsSize = wasmPointSet->GetPointSet()->GetPoints()->Size() * sizeof(typename PointSetType::CoordRepType) * PointSetType::PointDimension; + const auto pointsSize = wasmPointSet->GetPointSet()->GetPoints()->Size() * sizeof(typename PointSetType::CoordinateType) * PointSetType::PointDimension; setMemoryStoreOutputArray(0, index, 0, pointsAddress, pointsSize); } diff --git a/include/itkOutputPolyData.h b/include/itkOutputPolyData.h index 6ffe7974a..2a9d57d26 100644 --- a/include/itkOutputPolyData.h +++ b/include/itkOutputPolyData.h @@ -87,7 +87,7 @@ class ITK_TEMPLATE_EXPORT OutputPolyData if (this->m_PolyData->GetNumberOfPoints() > 0) { const auto pointsAddress = reinterpret_cast< size_t >( &(wasmPolyData->GetPolyData()->GetPoints()->at(0)) ); - const auto pointsSize = wasmPolyData->GetPolyData()->GetPoints()->Size() * PolyDataType::PointDimension * sizeof(typename PolyDataType::CoordRepType); + const auto pointsSize = wasmPolyData->GetPolyData()->GetPoints()->Size() * PolyDataType::PointDimension * sizeof(typename PolyDataType::CoordinateType); setMemoryStoreOutputArray(0, index, 0, pointsAddress, pointsSize); } diff --git a/include/itkPointSetJSON.h b/include/itkPointSetJSON.h index a58bbe6f1..03f65c4db 100644 --- a/include/itkPointSetJSON.h +++ b/include/itkPointSetJSON.h @@ -77,7 +77,7 @@ auto pointSetToPointSetJSON(const TPointSet * pointSet, const WasmPointSet::JSONFloatTypeEnum; + pointSetJSON.pointSetType.pointComponentType = wasm::MapComponentType::JSONFloatTypeEnum; using PointPixelType = typename TPointSet::PixelType; using ConvertPointPixelTraits = MeshConvertPixelTraits; pointSetJSON.pointSetType.pointPixelComponentType = wasm::MapComponentType::JSONComponentEnum; diff --git a/include/itkWasmMeshToMeshFilter.hxx b/include/itkWasmMeshToMeshFilter.hxx index 0ebe0220e..8a5f72c8a 100644 --- a/include/itkWasmMeshToMeshFilter.hxx +++ b/include/itkWasmMeshToMeshFilter.hxx @@ -419,7 +419,7 @@ WasmMeshToMeshFilter const std::string pointsString = meshJSON.points; if (numberOfPoints) { - if (pointComponentType == itk::wasm::MapComponentType::JSONFloatTypeEnum) + if (pointComponentType == itk::wasm::MapComponentType::JSONFloatTypeEnum) { const auto * pointsPtr = reinterpret_cast< PointType * >( std::strtoull(pointsString.substr(35).c_str(), nullptr, 10) ); mesh->GetPoints()->assign(pointsPtr, pointsPtr + meshJSON.numberOfPoints); @@ -428,14 +428,14 @@ WasmMeshToMeshFilter { auto * pointsPtr = reinterpret_cast< float * >( std::strtoull(pointsString.substr(35).c_str(), nullptr, 10) ); const size_t pointComponents = numberOfPoints * dimension; - auto * pointsContainerPtr = reinterpret_cast(&(mesh->GetPoints()->at(0)) ); + auto * pointsContainerPtr = reinterpret_cast(&(mesh->GetPoints()->at(0)) ); std::copy(pointsPtr, pointsPtr + pointComponents, pointsContainerPtr); } else if (pointComponentType == itk::wasm::MapComponentType::JSONFloatTypeEnum) { auto * pointsPtr = reinterpret_cast< double * >( std::strtoull(pointsString.substr(35).c_str(), nullptr, 10) ); const size_t pointComponents = numberOfPoints * dimension; - auto * pointsContainerPtr = reinterpret_cast(&(mesh->GetPoints()->at(0)) ); + auto * pointsContainerPtr = reinterpret_cast(&(mesh->GetPoints()->at(0)) ); std::copy(pointsPtr, pointsPtr + pointComponents, pointsContainerPtr); } else diff --git a/include/itkWasmPointSetToPointSetFilter.hxx b/include/itkWasmPointSetToPointSetFilter.hxx index a756bf2f5..cc1ca300a 100644 --- a/include/itkWasmPointSetToPointSetFilter.hxx +++ b/include/itkWasmPointSetToPointSetFilter.hxx @@ -173,7 +173,7 @@ WasmPointSetToPointSetFilter const std::string pointsString = pointSetJSON.points; if (numberOfPoints) { - if (pointComponentType == itk::wasm::MapComponentType::JSONFloatTypeEnum) + if (pointComponentType == itk::wasm::MapComponentType::JSONFloatTypeEnum) { const auto * pointsPtr = reinterpret_cast< PointType * >( std::strtoull(pointsString.substr(35).c_str(), nullptr, 10) ); pointSet->GetPoints()->assign(pointsPtr, pointsPtr + pointSetJSON.numberOfPoints); @@ -182,14 +182,14 @@ WasmPointSetToPointSetFilter { auto * pointsPtr = reinterpret_cast< float * >( std::strtoull(pointsString.substr(35).c_str(), nullptr, 10) ); const size_t pointComponents = numberOfPoints * dimension; - auto * pointsContainerPtr = reinterpret_cast(&(pointSet->GetPoints()->at(0)) ); + auto * pointsContainerPtr = reinterpret_cast(&(pointSet->GetPoints()->at(0)) ); std::copy(pointsPtr, pointsPtr + pointComponents, pointsContainerPtr); } else if (pointComponentType == itk::wasm::MapComponentType::JSONFloatTypeEnum) { auto * pointsPtr = reinterpret_cast< double * >( std::strtoull(pointsString.substr(35).c_str(), nullptr, 10) ); const size_t pointComponents = numberOfPoints * dimension; - auto * pointsContainerPtr = reinterpret_cast(&(pointSet->GetPoints()->at(0)) ); + auto * pointsContainerPtr = reinterpret_cast(&(pointSet->GetPoints()->at(0)) ); std::copy(pointsPtr, pointsPtr + pointComponents, pointsContainerPtr); } else