From 1d851f0a8fa093e044c7264569cc6f88df39a16e Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Thu, 26 Jan 2017 14:57:42 +0100
Subject: Remove unused 3d global min/max
---
matlab/mex/astra_mex_data3d_c.cpp | 4 ----
matlab/mex/mexDataManagerHelpFunctions.cpp | 11 -----------
matlab/mex/mexDataManagerHelpFunctions.h | 2 --
3 files changed, 17 deletions(-)
(limited to 'matlab')
diff --git a/matlab/mex/astra_mex_data3d_c.cpp b/matlab/mex/astra_mex_data3d_c.cpp
index 7909a79..2dca3b8 100644
--- a/matlab/mex/astra_mex_data3d_c.cpp
+++ b/matlab/mex/astra_mex_data3d_c.cpp
@@ -103,7 +103,6 @@ void astra_mex_data3d_create(int& nlhs, mxArray* plhs[], int& nrhs, const mxArra
copyMexToCFloat32Array(data, pDataObject3D->getData(),
pDataObject3D->getSize());
}
- pDataObject3D->updateStatistics();
// step4: store data object
int iIndex = CData3DManager::getSingleton().store(pDataObject3D);
@@ -162,8 +161,6 @@ void astra_mex_data3d_link(int& nlhs, mxArray* plhs[], int& nrhs, const mxArray*
return;
}
- //pDataObject3D->updateStatistics();
-
// step4: store data object
int iIndex = CData3DManager::getSingleton().store(pDataObject3D);
@@ -234,7 +231,6 @@ void astra_mex_data3d_store(int nlhs, mxArray* plhs[], int nrhs, const mxArray*
}
copyMexToCFloat32Array(prhs[2], pDataObject->getData(), pDataObject->getSize());
- pDataObject->updateStatistics();
}
void astra_mex_data3d_dimensions(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[])
diff --git a/matlab/mex/mexDataManagerHelpFunctions.cpp b/matlab/mex/mexDataManagerHelpFunctions.cpp
index ebf6f8f..c47ee27 100644
--- a/matlab/mex/mexDataManagerHelpFunctions.cpp
+++ b/matlab/mex/mexDataManagerHelpFunctions.cpp
@@ -164,17 +164,6 @@ checkDataSize(const mxArray * const mArray,
&& (zOffset + geom->getGridSliceCount()) <= dims[2]);
}
-//-----------------------------------------------------------------------------------------
-void
-updateStatistics(const std::vector<astra::CFloat32Data3DMemory *> & vecIn)
-{
- const size_t tot_size = vecIn.size();
- for (size_t count = 0; count < tot_size; count++)
- {
- vecIn[count]->updateStatistics();
- }
-}
-
//-----------------------------------------------------------------------------------------
void
getDataPointers(const std::vector<astra::CFloat32Data3DMemory *> & vecIn,
diff --git a/matlab/mex/mexDataManagerHelpFunctions.h b/matlab/mex/mexDataManagerHelpFunctions.h
index fff83a0..b7edb0f 100644
--- a/matlab/mex/mexDataManagerHelpFunctions.h
+++ b/matlab/mex/mexDataManagerHelpFunctions.h
@@ -50,8 +50,6 @@ bool checkDataSize(const mxArray * const, const astra::CProjectionGeometry3D * c
bool checkDataSize(const mxArray * const, const astra::CVolumeGeometry3D * const,
const mwIndex & zOffset);
-void updateStatistics(const std::vector<astra::CFloat32Data3DMemory *> &);
-
void getDataPointers(const std::vector<astra::CFloat32Data3DMemory *> &,
std::vector<astra::float32 *> &);
void getDataSizes(const std::vector<astra::CFloat32Data3DMemory *> &,
--
cgit v1.2.3