Merge branch 'master' into parallel_vec

1 files changed, 3 insertions, 70 deletions

diff --git a/include/astra/Float32VolumeData3D.h b/include/astra/Float32VolumeData3D.h
index 07df78f..535e960 100644
--- a/include/astra/Float32VolumeData3D.h
+++ b/include/astra/Float32VolumeData3D.h
@@ -1,10 +1,10 @@
 /*
 -----------------------------------------------------------------------
-Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp
-           2014-2015, CWI, Amsterdam
+Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp
+           2014-2016, CWI, Amsterdam
 
 Contact: astra@uantwerpen.be
-Website: http://sf.net/projects/astra-toolbox
+Website: http://www.astra-toolbox.com/
 
 This file is part of the ASTRA Toolbox.
 
@@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License
 along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
 
 -----------------------------------------------------------------------
-$Id$
 */
 
 #ifndef _INC_ASTRA_FLOAT32VOLUMEDATA3D
@@ -86,72 +85,6 @@ public:
 	 */
 	virtual CFloat32Data3D::EDataType getType() const;
 	
-	/** Fetch a slice from the data in the x direction.  Note that if you update the 2D data slice, the data in the 
-	 * 3d data object will remain unaltered.  To copy the data you must return the data by calling 'returnSliceX'.
-	 * You should not delete data fetched with this function yourself, instead call the 'returnSliceX' function.
-	 *
-	 * @param _iColumnIndex slice number
-	 * @return Volume data object
-	 */
-	virtual CFloat32VolumeData2D* fetchSliceX(int _iColumnIndex) const = 0;
-
-	/** Fetch a slice from the data in the y direction.  Note that if you update the 2D data slice, the data in the 
-	 * 3d data object will remain unaltered.  To copy the data you must return the data by calling 'returnSliceY'.
-	 * You should not delete data fetched with this function yourself, instead call the 'returnSliceY' function.
-	 *
-	 * @param _iRowIndex slice number
-	 * @return Volume data object
-	 */
-	virtual CFloat32VolumeData2D* fetchSliceY(int _iRowIndex) const = 0;
-
-	/** Fetch a slice from the data in the z direction.  Note that if you update the 2D data slice, the data in the 
-	 * 3d data object will remain unaltered.  To copy the data you must return the data by calling 'returnSliceZ'.
-	 * You should not delete data fetched with this function yourself, instead call the 'returnSliceZ' function.
-	 *
-	 * @param _iSliceIndex slice number
-	 * @return Volume data object
-	 */
-	virtual CFloat32VolumeData2D* fetchSliceZ(int _iSliceIndex) const = 0;
-
-	/** Return a slice from the data in the x direction to the 3d data.  The data will be deleted. If the slice was 
-	 * fetched with 'fetchSliceX', the data will be stored first. 
-	 *
-	 * @param _iColumnIndex slice number
-	 */
-	virtual void returnSliceX(int _iColumnIndex, CFloat32VolumeData2D * _pSlice) = 0;
-	
-	/** Return a slice from the data in the y direction to the 3d data.  The data will be deleted. If the slice was 
-	 * fetched with 'fetchSliceY', the data will be stored first. 
-	 *
-	 * @param _iRowIndex slice number
-	 */
-	virtual void returnSliceY(int _iRowIndex, CFloat32VolumeData2D * _pSlice) = 0;
-
-	/** Return a slice from the data in the z direction to the 3d data.  The data will be deleted. If the slice was 
-	 * fetched with 'fetchSliceZ', the data will be stored first. 
-	 *
-	 * @param _iSliceIndex slice number
-	 */
-	virtual void returnSliceZ(int _iSliceIndex, CFloat32VolumeData2D * _pSlice) = 0;
-
-	/** This SLOW function returns a voxel value stored at a specific index in the array.
-	 *  Reading values in this way might cause a lot of unnecessary memory operations, don't
-	 *  use it in time-critical code.
-	 * 
-	 *  @param _iIndex Index in the array if the data were stored completely in main memory
-	 *  @return The value stored at the location specified by _iIndex
-	 */
-	virtual float32 getVoxelValue(int _iIndex) = 0;
-
-	/** This SLOW function stores a voxel value at a specific index in the array.
-	 *  Writing values in this way might cause a lot of unnecessary memory operations, don't
-	 *  use it in time-critical code.
-	 * 
-	 *  @param _iIndex Index in the array if the data were stored completely in main memory
-	 *  @param _fValue The value to be stored at the location specified by _iIndex
-	 */
-	virtual void setVoxelValue(int _iIndex, float32 _fValue) = 0;
-
 	/**
 	 * Overloaded Operator: data += data (pointwise)
 	 *