Merge pull request #93 from wjp/GPULink

GPULink support

1 files changed, 0 insertions, 226 deletions

diff --git a/src/Float32ProjectionData3D.cpp b/src/Float32ProjectionData3D.cpp
index c751c58..ba41e10 100644
--- a/src/Float32ProjectionData3D.cpp
+++ b/src/Float32ProjectionData3D.cpp
@@ -47,232 +47,6 @@ CFloat32ProjectionData3D::~CFloat32ProjectionData3D() {
 	m_pGeometry = 0;
 }
 
-CFloat32ProjectionData3D& CFloat32ProjectionData3D::operator+=(const CFloat32ProjectionData3D& _data)
-{
-	CProjectionGeometry3D * pThisGeometry = getGeometry();
-
-	int iProjectionCount = pThisGeometry->getProjectionCount();
-	int iDetectorCount = pThisGeometry->getDetectorTotCount();
-#ifdef _DEBUG
-	CProjectionGeometry3D * pDataGeometry = _data.getGeometry();
-	int iDataProjectionDetectorCount = pDataGeometry->getDetectorTotCount();
-
-	ASTRA_ASSERT(iProjectionCount == pDataGeometry->getProjectionCount());
-	ASTRA_ASSERT(iDetectorCount == iDataProjectionDetectorCount);
-#endif
-
-	for(int iProjectionIndex = 0; iProjectionIndex < iProjectionCount; iProjectionIndex++)
-	{
-		CFloat32VolumeData2D * pThisProjection = fetchProjection(iProjectionIndex);
-		CFloat32VolumeData2D * pDataProjection = _data.fetchProjection(iProjectionIndex);
-
-		for(int iDetectorIndex = 0; iDetectorIndex < iDetectorCount; iDetectorIndex++)
-		{
-			float32 fThisValue = pThisProjection->getData()[iDetectorIndex];
-			float32 fDataValue = pDataProjection->getDataConst()[iDetectorIndex];
-
-			fThisValue += fDataValue;
-
-			pThisProjection->getData()[iDetectorIndex] = fThisValue;
-		}
-
-		returnProjection(iProjectionIndex, pThisProjection);
-
-		delete pThisProjection;
-		delete pDataProjection;
-	}
-
-	return *this;
-}
-
-CFloat32ProjectionData3D& CFloat32ProjectionData3D::operator-=(const CFloat32ProjectionData3D& _data)
-{
-	CProjectionGeometry3D * pThisGeometry = getGeometry();
-
-	int iProjectionCount = pThisGeometry->getProjectionCount();
-	int iDetectorCount = pThisGeometry->getDetectorTotCount();
-#ifdef _DEBUG
-	CProjectionGeometry3D * pDataGeometry = _data.getGeometry();
-	int iDataProjectionDetectorCount = pDataGeometry->getDetectorTotCount();
-
-	ASTRA_ASSERT(iProjectionCount == pDataGeometry->getProjectionCount());
-	ASTRA_ASSERT(iDetectorCount == iDataProjectionDetectorCount);
-#endif
-
-	for(int iProjectionIndex = 0; iProjectionIndex < iProjectionCount; iProjectionIndex++)
-	{
-		CFloat32VolumeData2D * pThisProjection = fetchProjection(iProjectionIndex);
-		CFloat32VolumeData2D * pDataProjection = _data.fetchProjection(iProjectionIndex);
-
-		for(int iDetectorIndex = 0; iDetectorIndex < iDetectorCount; iDetectorIndex++)
-		{
-			float32 fThisValue = pThisProjection->getData()[iDetectorIndex];
-			float32 fDataValue = pDataProjection->getDataConst()[iDetectorIndex];
-
-			fThisValue -= fDataValue;
-
-			pThisProjection->getData()[iDetectorIndex] = fThisValue;
-		}
-
-		returnProjection(iProjectionIndex, pThisProjection);
-
-		delete pThisProjection;
-		delete pDataProjection;
-	}
-
-	return *this;
-}
-
-CFloat32ProjectionData3D& CFloat32ProjectionData3D::operator*=(const CFloat32ProjectionData3D& _data)
-{
-	CProjectionGeometry3D * pThisGeometry = getGeometry();
-
-	int iProjectionCount = pThisGeometry->getProjectionCount();
-	int iDetectorCount = pThisGeometry->getDetectorTotCount();
-#ifdef _DEBUG
-	CProjectionGeometry3D * pDataGeometry = _data.getGeometry();
-	int iDataProjectionDetectorCount = pDataGeometry->getDetectorTotCount();
-
-	ASTRA_ASSERT(iProjectionCount == pDataGeometry->getProjectionCount());
-	ASTRA_ASSERT(iDetectorCount == iDataProjectionDetectorCount);
-#endif
-
-	for(int iProjectionIndex = 0; iProjectionIndex < iProjectionCount; iProjectionIndex++)
-	{
-		CFloat32VolumeData2D * pThisProjection = fetchProjection(iProjectionIndex);
-		CFloat32VolumeData2D * pDataProjection = _data.fetchProjection(iProjectionIndex);
-
-		for(int iDetectorIndex = 0; iDetectorIndex < iDetectorCount; iDetectorIndex++)
-		{
-			float32 fThisValue = pThisProjection->getData()[iDetectorIndex];
-			float32 fDataValue = pDataProjection->getDataConst()[iDetectorIndex];
-
-			fThisValue *= fDataValue;
-
-			pThisProjection->getData()[iDetectorIndex] = fThisValue;
-		}
-
-		returnProjection(iProjectionIndex, pThisProjection);
-
-		delete pThisProjection;
-		delete pDataProjection;
-	}
-
-	return *this;
-}
-
-CFloat32ProjectionData3D& CFloat32ProjectionData3D::operator*=(const float32& _fScalar)
-{
-	CProjectionGeometry3D * pThisGeometry = getGeometry();
-
-	int iProjectionCount = pThisGeometry->getProjectionCount();
-	int iDetectorCount = pThisGeometry->getDetectorTotCount();
-
-	for(int iProjectionIndex = 0; iProjectionIndex < iProjectionCount; iProjectionIndex++)
-	{
-		CFloat32VolumeData2D * pThisProjection = fetchProjection(iProjectionIndex);
-
-		for(int iDetectorIndex = 0; iDetectorIndex < iDetectorCount; iDetectorIndex++)
-		{
-			float32 fThisValue = pThisProjection->getData()[iDetectorIndex];
-
-			fThisValue *= _fScalar;
-
-			pThisProjection->getData()[iDetectorIndex] = fThisValue;
-		}
-
-		returnProjection(iProjectionIndex, pThisProjection);
-
-		delete pThisProjection;
-	}
-
-	return *this;
-}
-
-CFloat32ProjectionData3D& CFloat32ProjectionData3D::operator/=(const float32& _fScalar)
-{
-	CProjectionGeometry3D * pThisGeometry = getGeometry();
-
-	int iProjectionCount = pThisGeometry->getProjectionCount();
-	int iDetectorCount = pThisGeometry->getDetectorTotCount();
-
-	for(int iProjectionIndex = 0; iProjectionIndex < iProjectionCount; iProjectionIndex++)
-	{
-		CFloat32VolumeData2D * pThisProjection = fetchProjection(iProjectionIndex);
-
-		for(int iDetectorIndex = 0; iDetectorIndex < iDetectorCount; iDetectorIndex++)
-		{
-			float32 fThisValue = pThisProjection->getData()[iDetectorIndex];
-
-			fThisValue /= _fScalar;
-
-			pThisProjection->getData()[iDetectorIndex] = fThisValue;
-		}
-
-		returnProjection(iProjectionIndex, pThisProjection);
-
-		delete pThisProjection;
-	}
-
-	return *this;
-}
-
-CFloat32ProjectionData3D& CFloat32ProjectionData3D::operator+=(const float32& _fScalar)
-{
-	CProjectionGeometry3D * pThisGeometry = getGeometry();
-
-	int iProjectionCount = pThisGeometry->getProjectionCount();
-	int iDetectorCount = pThisGeometry->getDetectorTotCount();
-
-	for(int iProjectionIndex = 0; iProjectionIndex < iProjectionCount; iProjectionIndex++)
-	{
-		CFloat32VolumeData2D * pThisProjection = fetchProjection(iProjectionIndex);
-
-		for(int iDetectorIndex = 0; iDetectorIndex < iDetectorCount; iDetectorIndex++)
-		{
-			float32 fThisValue = pThisProjection->getData()[iDetectorIndex];
-
-			fThisValue += _fScalar;
-
-			pThisProjection->getData()[iDetectorIndex] = fThisValue;
-		}
-
-		returnProjection(iProjectionIndex, pThisProjection);
-
-		delete pThisProjection;
-	}
-
-	return *this;
-}
-
-CFloat32ProjectionData3D& CFloat32ProjectionData3D::operator-=(const float32& _fScalar)
-{
-	CProjectionGeometry3D * pThisGeometry = getGeometry();
-
-	int iProjectionCount = pThisGeometry->getProjectionCount();
-	int iDetectorCount = pThisGeometry->getDetectorTotCount();
-
-	for(int iProjectionIndex = 0; iProjectionIndex < iProjectionCount; iProjectionIndex++)
-	{
-		CFloat32VolumeData2D * pThisProjection = fetchProjection(iProjectionIndex);
-
-		for(int iDetectorIndex = 0; iDetectorIndex < iDetectorCount; iDetectorIndex++)
-		{
-			float32 fThisValue = pThisProjection->getData()[iDetectorIndex];
-
-			fThisValue -= _fScalar;
-
-			pThisProjection->getData()[iDetectorIndex] = fThisValue;
-		}
-
-		returnProjection(iProjectionIndex, pThisProjection);
-
-		delete pThisProjection;
-	}
-
-	return *this;
-}
-
 void CFloat32ProjectionData3D::changeGeometry(CProjectionGeometry3D* _pGeometry)
 {
 	if (!m_bInitialized) return;