From 51b2e49e08901fd649f8cc13b8ba1d33166e413f Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Fri, 18 Nov 2016 17:49:45 +0100 Subject: Improve consts in matlab undocumented function declarations --- matlab/mex/mexDataManagerHelpFunctions.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'matlab') diff --git a/matlab/mex/mexDataManagerHelpFunctions.cpp b/matlab/mex/mexDataManagerHelpFunctions.cpp index 1794abb..95d4640 100644 --- a/matlab/mex/mexDataManagerHelpFunctions.cpp +++ b/matlab/mex/mexDataManagerHelpFunctions.cpp @@ -42,10 +42,10 @@ $Id$ #ifdef USE_MATLAB_UNDOCUMENTED extern "C" { mxArray *mxCreateSharedDataCopy(const mxArray *pr); -bool mxUnshareArray(const mxArray *pr, const bool noDeepCopy); -mxArray *mxUnreference(const mxArray *pr); +bool mxUnshareArray(mxArray *pr, bool noDeepCopy); +mxArray *mxUnreference(mxArray *pr); #if 0 -// Unsupported in Matlab R2014b +// Unsupported in Matlab R2014b and later bool mxIsSharedArray(const mxArray *pr); #endif } @@ -66,12 +66,12 @@ public: // First unshare the input array, so that we may modify it. if (bUnshare) { #if 0 - // Unsupported in Matlab R2014b + // Unsupported in Matlab R2014b and later if (mxIsSharedArray(_pArray)) { fprintf(stderr, "Performance note: unsharing shared array in link\n"); } #endif - mxUnshareArray(_pArray, false); + mxUnshareArray(const_cast(_pArray), false); //fprintf(stderr, "Unshared:\narray: %p\tdata: %p\n", (void*)_pArray, (void*)mxGetData(_pArray)); } // Then create a (persistent) copy so the data won't be deleted -- cgit v1.2.3 From 64a48bea80b909311351dc3b1345a17c693ddb69 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Wed, 28 Sep 2016 14:58:41 +0200 Subject: Add experimental support for Octave Based on initial patch by @kalvdans. --- build/linux/Makefile.in | 51 +++++++++++++++++++++++++++++- build/linux/configure.ac | 23 ++++++++++++++ matlab/mex/mexDataManagerHelpFunctions.cpp | 2 +- matlab/mex/octave_support.cpp | 44 ++++++++++++++++++++++++++ 4 files changed, 118 insertions(+), 2 deletions(-) create mode 100644 matlab/mex/octave_support.cpp (limited to 'matlab') diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index 14027e1..076cfd1 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -5,6 +5,7 @@ boostutf=@HAVEBOOSTUTF@ MATLAB_ROOT=@MATLAB_ROOT@ +octave=@HAVEOCTAVE@ TARGETS=libastra.la @@ -16,6 +17,10 @@ ifeq ($(python),yes) TARGETS+=py endif +ifeq ($(octave),yes) +TARGETS+=oct +endif + all: $(TARGETS) prefix=@prefix@ @@ -46,6 +51,16 @@ LIBS += -lcudart -lcufft NVCC = @NVCC@ endif +ifeq ($(octave),yes) +OCTLDFLAGS:=$(LDFLAGS) +CPPFLAGS += @OCTAVE_CPPFLAGS@ +ifeq ($(cuda),yes) +OCTFLAGS=-DASTRA_CUDA +else +OCTFLAGS= +endif +endif + ifeq ($(matlab),yes) CPPFLAGS+=-I$(MATLAB_ROOT)/extern/include -DMATLAB_MEX_FILE CXXFLAGS+=-fopenmp @@ -259,6 +274,20 @@ ifeq ($(python),yes) MATLAB_MEX+=matlab/mex/astra_mex_plugin_c.$(MEXSUFFIX) endif +OCTAVE_CXX_OBJECTS=\ + matlab/mex/octave_support.o + +OCTAVE_MEX=\ + matlab/mex/astra_mex_algorithm_c.mex \ + matlab/mex/astra_mex_data2d_c.mex \ + matlab/mex/astra_mex_c.mex \ + matlab/mex/astra_mex_matrix_c.mex \ + matlab/mex/astra_mex_projector_c.mex \ + matlab/mex/astra_mex_projector3d_c.mex \ + matlab/mex/astra_mex_log_c.mex \ + matlab/mex/astra_mex_data3d_c.mex \ + matlab/mex/astra_mex_direct_c.mex + OBJECT_DIRS = src/ tests/ cuda/2d/ cuda/3d/ matlab/mex/ ./ DEPDIRS = $(addsuffix $(DEPDIR),$(OBJECT_DIRS)) -include $(wildcard $(addsuffix /*.d,$(DEPDIRS))) @@ -294,6 +323,13 @@ python-root-install: libastra.la endif +ifeq ($(octave),yes) +oct: $(OCTAVE_MEX) + +%.mex: %.o $(MATLAB_CXX_OBJECTS) $(OCTAVE_CXX_OBJECTS) libastra.la + mkoctfile --mex $(OCTFLAGS) $(OCTLDFLAGS) $(LIBS) -L.libs -lastra --output $* $*.o $(MATLAB_CXX_OBJECTS) $(OCTAVE_CXX_OBJECTS) +endif + libastra.la: $(ALL_OBJECTS) ./libtool --mode=link --tag=CXX $(LD) -rpath $(LIBDIR) -o $@ $(LDFLAGS) $(LIBS) $+ @@ -374,7 +410,7 @@ distclean: clean rm -rf $(srcdir)/autom4te.cache rm -f $(srcdir)/configure Makefile -install: install-libraries install-matlab install-python +install: install-libraries install-matlab install-python install-octave install-libraries: libastra.la $(INSTALL_SH) -m 755 -d @libdir@ @@ -413,6 +449,19 @@ else install-python: endif +ifeq ($(octave),yes) +# TODO: This install location doesn't work well for /usr or /usr/local +install-octave: $(OCTAVE_MEX) + $(INSTALL_SH) -m 755 -d @prefix@/octave + $(INSTALL_SH) -m 755 -d @prefix@/octave/mex + $(INSTALL_SH) -m 755 -d @prefix@/octave/tools + $(INSTALL_SH) -m 644 $(OCTAVE_MEX) @prefix@/octave/mex + $(INSTALL_SH) -m 644 $(srcdir)/../../matlab/tools/*.m @prefix@/octave/tools +# TODO: docs +else +install-octave: +endif + Makefile: $(srcdir)/Makefile.in config.status CONFIG_HEADERS= CONFIG_LINKS= CONFIG_FILES=$@ $(SHELL) ./config.status diff --git a/build/linux/configure.ac b/build/linux/configure.ac index 630b08d..0d80cec 100644 --- a/build/linux/configure.ac +++ b/build/linux/configure.ac @@ -175,6 +175,28 @@ fi AC_SUBST(HAVEMATLAB) +# octave + +AC_ARG_ENABLE(octave, [[ --disable-octave disable Octave support]]) +if test x"$enable_octave" != xno; then + AC_PATH_PROG([HAVEOCTAVE], [octave-config], [no], [$PATH]) + AC_MSG_CHECKING([for octave]) + if test x"HAVEOCTAVE" != xno -a $HAVEMATLAB = yes; then + HAVEOCTAVE=no + AC_MSG_RESULT([no (since Matlab support is enabled)]) + else + if test x"$HAVEOCTAVE" != xno; then + OCTAVE_CPPFLAGS="-I`octave-config -p OCTINCLUDEDIR`" + AC_SUBST(OCTAVE_CPPFLAGS) + HAVEOCTAVE=yes + fi + AC_MSG_RESULT($HAVEOCTAVE) + fi +else + HAVEOCTAVE=no +fi +AC_SUBST(HAVEOCTAVE) + # python AC_ARG_WITH(python, [[ --with-python=path path of Python binary (optional)]],,) @@ -271,6 +293,7 @@ echo echo "Summary of ASTRA Toolbox build options:" echo " CUDA : $HAVECUDA" echo " Matlab : $HAVEMATLAB" +echo " Octave : $HAVEOCTAVE" echo " Python : $HAVEPYTHON" echo echo " prefix : $prefix" diff --git a/matlab/mex/mexDataManagerHelpFunctions.cpp b/matlab/mex/mexDataManagerHelpFunctions.cpp index 95d4640..a514565 100644 --- a/matlab/mex/mexDataManagerHelpFunctions.cpp +++ b/matlab/mex/mexDataManagerHelpFunctions.cpp @@ -79,7 +79,7 @@ public: m_pLink = mxCreateSharedDataCopy(_pArray); //fprintf(stderr, "SharedDataCopy:\narray: %p\tdata: %p\n", (void*)m_pLink, (void*)mxGetData(m_pLink)); mexMakeArrayPersistent(m_pLink); - m_fPtr = (float *)mxGetData(m_pLink); + m_fPtr = (float *)mxGetData(_pArray); m_fPtr += iOffset; } virtual ~CFloat32CustomMemoryMatlab3D() { diff --git a/matlab/mex/octave_support.cpp b/matlab/mex/octave_support.cpp new file mode 100644 index 0000000..ed04bf0 --- /dev/null +++ b/matlab/mex/octave_support.cpp @@ -0,0 +1,44 @@ +/* +----------------------------------------------------------------------- +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam + +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox + +This file is part of the ASTRA Toolbox. + + +The ASTRA Toolbox is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +The ASTRA Toolbox is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with the ASTRA Toolbox. If not, see . + +----------------------------------------------------------------------- +*/ + +#include + +extern "C" { + +bool utIsInterruptPending() { + return octave_signal_caught; +} + +mxArray *mxCreateSharedDataCopy(const mxArray *) { + return 0; +} + +bool mxUnshareArray(mxArray *, bool) { + return false; +} + +} -- cgit v1.2.3 From aec75045ce5394eec3ecc0137ec1b821f6059f77 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Fri, 18 Nov 2016 12:14:10 +0100 Subject: Remove VS2008/VS2012 build files --- astra_vc09.sln | 243 -- astra_vc09.vcproj | 3248 ------------------------- astra_vc11.sln | 243 -- astra_vc11.vcxproj | 857 ------- astra_vc11.vcxproj.filters | 766 ------ matlab/mex/astra_mex_algorithm_vc09.vcproj | 612 ----- matlab/mex/astra_mex_algorithm_vc11.vcxproj | 306 --- matlab/mex/astra_mex_data2d_vc09.vcproj | 628 ----- matlab/mex/astra_mex_data2d_vc11.vcxproj | 310 --- matlab/mex/astra_mex_data3d_vc09.vcproj | 628 ----- matlab/mex/astra_mex_data3d_vc11.vcxproj | 310 --- matlab/mex/astra_mex_direct_vc09.vcproj | 628 ----- matlab/mex/astra_mex_direct_vc11.vcxproj | 310 --- matlab/mex/astra_mex_file_vc11.vcxproj | 289 --- matlab/mex/astra_mex_log_vc09.vcproj | 612 ----- matlab/mex/astra_mex_log_vc11.vcxproj | 306 --- matlab/mex/astra_mex_matrix_vc09.vcproj | 612 ----- matlab/mex/astra_mex_matrix_vc11.vcxproj | 306 --- matlab/mex/astra_mex_projector3d_vc09.vcproj | 612 ----- matlab/mex/astra_mex_projector3d_vc11.vcxproj | 306 --- matlab/mex/astra_mex_projector_vc09.vcproj | 612 ----- matlab/mex/astra_mex_projector_vc11.vcxproj | 306 --- matlab/mex/astra_mex_vc09.vcproj | 612 ----- matlab/mex/astra_mex_vc11.vcxproj | 306 --- 24 files changed, 13968 deletions(-) delete mode 100644 astra_vc09.sln delete mode 100644 astra_vc09.vcproj delete mode 100644 astra_vc11.sln delete mode 100644 astra_vc11.vcxproj delete mode 100644 astra_vc11.vcxproj.filters delete mode 100644 matlab/mex/astra_mex_algorithm_vc09.vcproj delete mode 100644 matlab/mex/astra_mex_algorithm_vc11.vcxproj delete mode 100644 matlab/mex/astra_mex_data2d_vc09.vcproj delete mode 100644 matlab/mex/astra_mex_data2d_vc11.vcxproj delete mode 100644 matlab/mex/astra_mex_data3d_vc09.vcproj delete mode 100644 matlab/mex/astra_mex_data3d_vc11.vcxproj delete mode 100644 matlab/mex/astra_mex_direct_vc09.vcproj delete mode 100644 matlab/mex/astra_mex_direct_vc11.vcxproj delete mode 100644 matlab/mex/astra_mex_file_vc11.vcxproj delete mode 100644 matlab/mex/astra_mex_log_vc09.vcproj delete mode 100644 matlab/mex/astra_mex_log_vc11.vcxproj delete mode 100644 matlab/mex/astra_mex_matrix_vc09.vcproj delete mode 100644 matlab/mex/astra_mex_matrix_vc11.vcxproj delete mode 100644 matlab/mex/astra_mex_projector3d_vc09.vcproj delete mode 100644 matlab/mex/astra_mex_projector3d_vc11.vcxproj delete mode 100644 matlab/mex/astra_mex_projector_vc09.vcproj delete mode 100644 matlab/mex/astra_mex_projector_vc11.vcxproj delete mode 100644 matlab/mex/astra_mex_vc09.vcproj delete mode 100644 matlab/mex/astra_mex_vc11.vcxproj (limited to 'matlab') diff --git a/astra_vc09.sln b/astra_vc09.sln deleted file mode 100644 index 371e9b1..0000000 --- a/astra_vc09.sln +++ /dev/null @@ -1,243 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra", "astra_vc09.vcproj", "{12926444-6723-46A8-B388-12E65E0577FA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "astra_mex", "astra_mex", "{33EF0AC5-B475-40BF-BAE5-67075B204D10}" - ProjectSection(ProjectDependencies) = postProject - {12926444-6723-46A8-B388-12E65E0577FA} = {12926444-6723-46A8-B388-12E65E0577FA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex", "matlab\mex\astra_mex_vc09.vcproj", "{3FDA35E0-0D54-4663-A3E6-5ABA96F32221}" - ProjectSection(ProjectDependencies) = postProject - {12926444-6723-46A8-B388-12E65E0577FA} = {12926444-6723-46A8-B388-12E65E0577FA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_algorithm", "matlab\mex\astra_mex_algorithm_vc09.vcproj", "{056BF7A9-294D-487C-8CC3-BE629077CA94}" - ProjectSection(ProjectDependencies) = postProject - {12926444-6723-46A8-B388-12E65E0577FA} = {12926444-6723-46A8-B388-12E65E0577FA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_data2d", "matlab\mex\astra_mex_data2d_vc09.vcproj", "{E4092269-B19C-46F7-A84E-4F146CC70E44}" - ProjectSection(ProjectDependencies) = postProject - {12926444-6723-46A8-B388-12E65E0577FA} = {12926444-6723-46A8-B388-12E65E0577FA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_data3d", "matlab\mex\astra_mex_data3d_vc09.vcproj", "{0BEC029B-0929-4BF9-BD8B-9C9806A52065}" - ProjectSection(ProjectDependencies) = postProject - {12926444-6723-46A8-B388-12E65E0577FA} = {12926444-6723-46A8-B388-12E65E0577FA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_matrix", "matlab\mex\astra_mex_matrix_vc09.vcproj", "{9D041710-2119-4230-BCF2-5FBE753FDE49}" - ProjectSection(ProjectDependencies) = postProject - {12926444-6723-46A8-B388-12E65E0577FA} = {12926444-6723-46A8-B388-12E65E0577FA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_projector", "matlab\mex\astra_mex_projector_vc09.vcproj", "{4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}" - ProjectSection(ProjectDependencies) = postProject - {12926444-6723-46A8-B388-12E65E0577FA} = {12926444-6723-46A8-B388-12E65E0577FA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_projector3d", "matlab\mex\astra_mex_projector3d_vc09.vcproj", "{F94CCD79-AA11-42DF-AC8A-6C9D2238A883}" - ProjectSection(ProjectDependencies) = postProject - {12926444-6723-46A8-B388-12E65E0577FA} = {12926444-6723-46A8-B388-12E65E0577FA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_log", "matlab\mex\astra_mex_log_vc09.vcproj", "{CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}" - ProjectSection(ProjectDependencies) = postProject - {12926444-6723-46A8-B388-12E65E0577FA} = {12926444-6723-46A8-B388-12E65E0577FA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_direct", "matlab\mex\astra_mex_direct_vc09.vcproj", "{85FE09A6-FA49-4314-A2B1-59D77C7442A8}" - ProjectSection(ProjectDependencies) = postProject - {12926444-6723-46A8-B388-12E65E0577FA} = {12926444-6723-46A8-B388-12E65E0577FA} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_CUDA|Win32 = Debug_CUDA|Win32 - Debug_CUDA|x64 = Debug_CUDA|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release_CUDA|Win32 = Release_CUDA|Win32 - Release_CUDA|x64 = Release_CUDA|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {12926444-6723-46A8-B388-12E65E0577FA}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {12926444-6723-46A8-B388-12E65E0577FA}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {12926444-6723-46A8-B388-12E65E0577FA}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {12926444-6723-46A8-B388-12E65E0577FA}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {12926444-6723-46A8-B388-12E65E0577FA}.Debug|Win32.ActiveCfg = Debug|Win32 - {12926444-6723-46A8-B388-12E65E0577FA}.Debug|Win32.Build.0 = Debug|Win32 - {12926444-6723-46A8-B388-12E65E0577FA}.Debug|x64.ActiveCfg = Debug|x64 - {12926444-6723-46A8-B388-12E65E0577FA}.Debug|x64.Build.0 = Debug|x64 - {12926444-6723-46A8-B388-12E65E0577FA}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {12926444-6723-46A8-B388-12E65E0577FA}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {12926444-6723-46A8-B388-12E65E0577FA}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {12926444-6723-46A8-B388-12E65E0577FA}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {12926444-6723-46A8-B388-12E65E0577FA}.Release|Win32.ActiveCfg = Release|Win32 - {12926444-6723-46A8-B388-12E65E0577FA}.Release|Win32.Build.0 = Release|Win32 - {12926444-6723-46A8-B388-12E65E0577FA}.Release|x64.ActiveCfg = Release|x64 - {12926444-6723-46A8-B388-12E65E0577FA}.Release|x64.Build.0 = Release|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug|Win32.ActiveCfg = Debug|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug|Win32.Build.0 = Debug|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug|x64.ActiveCfg = Debug|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug|x64.Build.0 = Debug|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release|Win32.ActiveCfg = Release|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release|Win32.Build.0 = Release|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release|x64.ActiveCfg = Release|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release|x64.Build.0 = Release|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug|Win32.ActiveCfg = Debug|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug|Win32.Build.0 = Debug|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug|x64.ActiveCfg = Debug|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug|x64.Build.0 = Debug|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release|Win32.ActiveCfg = Release|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release|Win32.Build.0 = Release|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release|x64.ActiveCfg = Release|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release|x64.Build.0 = Release|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug|Win32.ActiveCfg = Debug|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug|Win32.Build.0 = Debug|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug|x64.ActiveCfg = Debug|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug|x64.Build.0 = Debug|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release|Win32.ActiveCfg = Release|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release|Win32.Build.0 = Release|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release|x64.ActiveCfg = Release|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release|x64.Build.0 = Release|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug|Win32.ActiveCfg = Debug|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug|Win32.Build.0 = Debug|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug|x64.ActiveCfg = Debug|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug|x64.Build.0 = Debug|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release|Win32.ActiveCfg = Release|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release|Win32.Build.0 = Release|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release|x64.ActiveCfg = Release|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release|x64.Build.0 = Release|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug|Win32.ActiveCfg = Debug|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug|Win32.Build.0 = Debug|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug|x64.ActiveCfg = Debug|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug|x64.Build.0 = Debug|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release|Win32.ActiveCfg = Release|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release|Win32.Build.0 = Release|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release|x64.ActiveCfg = Release|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release|x64.Build.0 = Release|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug|Win32.ActiveCfg = Debug|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug|Win32.Build.0 = Debug|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug|x64.ActiveCfg = Debug|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug|x64.Build.0 = Debug|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release|Win32.ActiveCfg = Release|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release|Win32.Build.0 = Release|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release|x64.ActiveCfg = Release|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release|x64.Build.0 = Release|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug|Win32.ActiveCfg = Debug|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug|Win32.Build.0 = Debug|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug|x64.ActiveCfg = Debug|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug|x64.Build.0 = Debug|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release|Win32.ActiveCfg = Release|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release|Win32.Build.0 = Release|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release|x64.ActiveCfg = Release|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release|x64.Build.0 = Release|x64 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Debug|Win32.ActiveCfg = Debug|Win32 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Debug|Win32.Build.0 = Debug|Win32 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Debug|x64.ActiveCfg = Debug|x64 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Debug|x64.Build.0 = Debug|x64 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Release|Win32.ActiveCfg = Release|Win32 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Release|Win32.Build.0 = Release|Win32 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Release|x64.ActiveCfg = Release|x64 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Release|x64.Build.0 = Release|x64 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Debug|Win32.ActiveCfg = Debug|Win32 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Debug|Win32.Build.0 = Debug|Win32 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Debug|x64.ActiveCfg = Debug|x64 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Debug|x64.Build.0 = Debug|x64 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Release|Win32.ActiveCfg = Release|Win32 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Release|Win32.Build.0 = Release|Win32 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Release|x64.ActiveCfg = Release|x64 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221} = {33EF0AC5-B475-40BF-BAE5-67075B204D10} - {056BF7A9-294D-487C-8CC3-BE629077CA94} = {33EF0AC5-B475-40BF-BAE5-67075B204D10} - {E4092269-B19C-46F7-A84E-4F146CC70E44} = {33EF0AC5-B475-40BF-BAE5-67075B204D10} - {0BEC029B-0929-4BF9-BD8B-9C9806A52065} = {33EF0AC5-B475-40BF-BAE5-67075B204D10} - {9D041710-2119-4230-BCF2-5FBE753FDE49} = {33EF0AC5-B475-40BF-BAE5-67075B204D10} - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97} = {33EF0AC5-B475-40BF-BAE5-67075B204D10} - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883} = {33EF0AC5-B475-40BF-BAE5-67075B204D10} - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8} = {33EF0AC5-B475-40BF-BAE5-67075B204D10} - {85FE09A6-FA49-4314-A2B1-59D77C7442A8} = {33EF0AC5-B475-40BF-BAE5-67075B204D10} - EndGlobalSection -EndGlobal diff --git a/astra_vc09.vcproj b/astra_vc09.vcproj deleted file mode 100644 index f2cf62a..0000000 --- a/astra_vc09.vcproj +++ /dev/null @@ -1,3248 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/astra_vc11.sln b/astra_vc11.sln deleted file mode 100644 index 92fb584..0000000 --- a/astra_vc11.sln +++ /dev/null @@ -1,243 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_vc11", "astra_vc11.vcxproj", "{BE9F1326-527C-4284-AE2C-D1E25D539CEA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "astra_mex", "astra_mex", "{5E99A109-374E-4102-BE9B-99BA1FA8AA30}" - ProjectSection(ProjectDependencies) = postProject - {BE9F1326-527C-4284-AE2C-D1E25D539CEA} = {BE9F1326-527C-4284-AE2C-D1E25D539CEA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex", "matlab\mex\astra_mex_vc11.vcxproj", "{3FDA35E0-0D54-4663-A3E6-5ABA96F32221}" - ProjectSection(ProjectDependencies) = postProject - {BE9F1326-527C-4284-AE2C-D1E25D539CEA} = {BE9F1326-527C-4284-AE2C-D1E25D539CEA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_algorithm", "matlab\mex\astra_mex_algorithm_vc11.vcxproj", "{056BF7A9-294D-487C-8CC3-BE629077CA94}" - ProjectSection(ProjectDependencies) = postProject - {BE9F1326-527C-4284-AE2C-D1E25D539CEA} = {BE9F1326-527C-4284-AE2C-D1E25D539CEA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_data2d", "matlab\mex\astra_mex_data2d_vc11.vcxproj", "{E4092269-B19C-46F7-A84E-4F146CC70E44}" - ProjectSection(ProjectDependencies) = postProject - {BE9F1326-527C-4284-AE2C-D1E25D539CEA} = {BE9F1326-527C-4284-AE2C-D1E25D539CEA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_data3d", "matlab\mex\astra_mex_data3d_vc11.vcxproj", "{0BEC029B-0929-4BF9-BD8B-9C9806A52065}" - ProjectSection(ProjectDependencies) = postProject - {BE9F1326-527C-4284-AE2C-D1E25D539CEA} = {BE9F1326-527C-4284-AE2C-D1E25D539CEA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_matrix", "matlab\mex\astra_mex_matrix_vc11.vcxproj", "{9D041710-2119-4230-BCF2-5FBE753FDE49}" - ProjectSection(ProjectDependencies) = postProject - {BE9F1326-527C-4284-AE2C-D1E25D539CEA} = {BE9F1326-527C-4284-AE2C-D1E25D539CEA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_projector", "matlab\mex\astra_mex_projector_vc11.vcxproj", "{4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}" - ProjectSection(ProjectDependencies) = postProject - {BE9F1326-527C-4284-AE2C-D1E25D539CEA} = {BE9F1326-527C-4284-AE2C-D1E25D539CEA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_projector3d", "matlab\mex\astra_mex_projector3d_vc11.vcxproj", "{F94CCD79-AA11-42DF-AC8A-6C9D2238A883}" - ProjectSection(ProjectDependencies) = postProject - {BE9F1326-527C-4284-AE2C-D1E25D539CEA} = {BE9F1326-527C-4284-AE2C-D1E25D539CEA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_log", "matlab\mex\astra_mex_log_vc11.vcxproj", "{03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}" - ProjectSection(ProjectDependencies) = postProject - {BE9F1326-527C-4284-AE2C-D1E25D539CEA} = {BE9F1326-527C-4284-AE2C-D1E25D539CEA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_direct", "matlab\mex\astra_mex_direct_vc11.vcxproj", "{0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}" - ProjectSection(ProjectDependencies) = postProject - {BE9F1326-527C-4284-AE2C-D1E25D539CEA} = {BE9F1326-527C-4284-AE2C-D1E25D539CEA} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_CUDA|Win32 = Debug_CUDA|Win32 - Debug_CUDA|x64 = Debug_CUDA|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release_CUDA|Win32 = Release_CUDA|Win32 - Release_CUDA|x64 = Release_CUDA|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Debug|Win32.ActiveCfg = Debug|Win32 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Debug|Win32.Build.0 = Debug|Win32 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Debug|x64.ActiveCfg = Debug|x64 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Debug|x64.Build.0 = Debug|x64 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Release|Win32.ActiveCfg = Release|Win32 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Release|Win32.Build.0 = Release|Win32 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Release|x64.ActiveCfg = Release|x64 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Release|x64.Build.0 = Release|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug|Win32.ActiveCfg = Debug|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug|Win32.Build.0 = Debug|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug|x64.ActiveCfg = Debug|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug|x64.Build.0 = Debug|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release|Win32.ActiveCfg = Release|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release|Win32.Build.0 = Release|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release|x64.ActiveCfg = Release|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release|x64.Build.0 = Release|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug|Win32.ActiveCfg = Debug|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug|Win32.Build.0 = Debug|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug|x64.ActiveCfg = Debug|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug|x64.Build.0 = Debug|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release|Win32.ActiveCfg = Release|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release|Win32.Build.0 = Release|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release|x64.ActiveCfg = Release|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release|x64.Build.0 = Release|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug|Win32.ActiveCfg = Debug|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug|Win32.Build.0 = Debug|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug|x64.ActiveCfg = Debug|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug|x64.Build.0 = Debug|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release|Win32.ActiveCfg = Release|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release|Win32.Build.0 = Release|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release|x64.ActiveCfg = Release|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release|x64.Build.0 = Release|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug|Win32.ActiveCfg = Debug|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug|Win32.Build.0 = Debug|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug|x64.ActiveCfg = Debug|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug|x64.Build.0 = Debug|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release|Win32.ActiveCfg = Release|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release|Win32.Build.0 = Release|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release|x64.ActiveCfg = Release|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release|x64.Build.0 = Release|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug|Win32.ActiveCfg = Debug|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug|Win32.Build.0 = Debug|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug|x64.ActiveCfg = Debug|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug|x64.Build.0 = Debug|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release|Win32.ActiveCfg = Release|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release|Win32.Build.0 = Release|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release|x64.ActiveCfg = Release|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release|x64.Build.0 = Release|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug|Win32.ActiveCfg = Debug|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug|Win32.Build.0 = Debug|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug|x64.ActiveCfg = Debug|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug|x64.Build.0 = Debug|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release|Win32.ActiveCfg = Release|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release|Win32.Build.0 = Release|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release|x64.ActiveCfg = Release|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release|x64.Build.0 = Release|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug|Win32.ActiveCfg = Debug|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug|Win32.Build.0 = Debug|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug|x64.ActiveCfg = Debug|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug|x64.Build.0 = Debug|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release|Win32.ActiveCfg = Release|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release|Win32.Build.0 = Release|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release|x64.ActiveCfg = Release|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release|x64.Build.0 = Release|x64 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Debug|Win32.ActiveCfg = Debug|Win32 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Debug|Win32.Build.0 = Debug|Win32 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Debug|x64.ActiveCfg = Debug|x64 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Debug|x64.Build.0 = Debug|x64 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Release|Win32.ActiveCfg = Release|Win32 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Release|Win32.Build.0 = Release|Win32 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Release|x64.ActiveCfg = Release|x64 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Release|x64.Build.0 = Release|x64 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Debug|Win32.ActiveCfg = Debug|Win32 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Debug|Win32.Build.0 = Debug|Win32 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Debug|x64.ActiveCfg = Debug|x64 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Debug|x64.Build.0 = Debug|x64 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Release|Win32.ActiveCfg = Release|Win32 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Release|Win32.Build.0 = Release|Win32 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Release|x64.ActiveCfg = Release|x64 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221} = {5E99A109-374E-4102-BE9B-99BA1FA8AA30} - {056BF7A9-294D-487C-8CC3-BE629077CA94} = {5E99A109-374E-4102-BE9B-99BA1FA8AA30} - {E4092269-B19C-46F7-A84E-4F146CC70E44} = {5E99A109-374E-4102-BE9B-99BA1FA8AA30} - {0BEC029B-0929-4BF9-BD8B-9C9806A52065} = {5E99A109-374E-4102-BE9B-99BA1FA8AA30} - {9D041710-2119-4230-BCF2-5FBE753FDE49} = {5E99A109-374E-4102-BE9B-99BA1FA8AA30} - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97} = {5E99A109-374E-4102-BE9B-99BA1FA8AA30} - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883} = {5E99A109-374E-4102-BE9B-99BA1FA8AA30} - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E} = {5E99A109-374E-4102-BE9B-99BA1FA8AA30} - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7} = {5E99A109-374E-4102-BE9B-99BA1FA8AA30} - EndGlobalSection -EndGlobal diff --git a/astra_vc11.vcxproj b/astra_vc11.vcxproj deleted file mode 100644 index d050b96..0000000 --- a/astra_vc11.vcxproj +++ /dev/null @@ -1,857 +0,0 @@ - - - - - Debug_CUDA - Win32 - - - Debug_CUDA - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_CUDA - Win32 - - - Release_CUDA - x64 - - - Release - Win32 - - - Release - x64 - - - - {BE9F1326-527C-4284-AE2C-D1E25D539CEA} - astra_vc11 - - - - DynamicLibrary - true - v110 - MultiByte - - - DynamicLibrary - true - v110 - MultiByte - - - DynamicLibrary - true - v110 - MultiByte - - - DynamicLibrary - true - v110 - MultiByte - - - DynamicLibrary - false - v110 - true - MultiByte - - - DynamicLibrary - false - v110 - true - MultiByte - - - DynamicLibrary - false - v110 - true - MultiByte - - - DynamicLibrary - false - v110 - true - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(CUDA_INC_PATH);$(IncludePath) - $(CUDA_LIB_PATH);$(LibraryPath) - $(SolutionDir)bin\$(Platform)\Debug_CUDA\ - $(OutDir)obj\ - .dll - AstraCuda32D - true - - - $(CUDA_INC_PATH);$(IncludePath) - $(CUDA_LIB_PATH);$(LibraryPath) - $(SolutionDir)bin\$(Platform)\Debug_CUDA\ - $(OutDir)obj\ - .dll - AstraCuda64D - true - - - $(SolutionDir)bin\$(Platform)\Debug\ - $(OutDir)obj\ - .dll - Astra32D - true - - - $(SolutionDir)bin\$(Platform)\Debug\ - $(OutDir)obj\ - .dll - Astra64D - true - - - $(CUDA_INC_PATH);$(IncludePath) - $(CUDA_LIB_PATH);$(LibraryPath) - $(SolutionDir)bin\$(Platform)\Release_CUDA\ - $(OutDir)obj\ - .dll - AstraCuda32 - true - - - $(CUDA_INC_PATH);$(IncludePath) - $(CUDA_LIB_PATH);$(LibraryPath) - $(SolutionDir)bin\$(Platform)\Release_CUDA\ - $(OutDir)obj\ - .dll - AstraCuda64 - true - - - $(SolutionDir)bin\$(Platform)\Release\ - $(OutDir)obj\ - .dll - Astra32 - true - - - $(SolutionDir)bin\$(Platform)\Release\ - $(OutDir)obj\ - .dll - Astra64 - true - - - - MultiThreadedDebugDLL - Level3 - lib\include;include\;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - ASTRA_CUDA;__SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - true - - - true - bin\Win32\Debug_CUDA\AstraCuda32D.dll - cudart.lib;cufft.lib;%(AdditionalDependencies) - lib\win32;%(AdditionalLibraryDirectories);$(CudaToolkitLibDir) - - - 32 - true - compute_20,sm_20;compute_30,sm_30;compute_30,sm_35;compute_30,compute_30 - - - - - MultiThreadedDebugDLL - Level3 - lib\include;include\;%(AdditionalIncludeDirectories) - true - Disabled - ASTRA_CUDA;__SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - true - - - true - bin\x64\Debug_CUDA\AstraCuda64D.dll - cudart.lib;cufft.lib;%(AdditionalDependencies) - lib\x64;%(AdditionalLibraryDirectories);$(CudaToolkitLibDir) - - - 64 - true - compute_20,sm_20;compute_30,sm_30;compute_30,sm_35;compute_30,compute_30 - - - - - MultiThreadedDebugDLL - Level3 - lib\include;include\;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - __SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - true - - - true - bin\Win32\Debug\Astra32D.dll - lib\win32;%(AdditionalLibraryDirectories) - - - - - MultiThreadedDebugDLL - Level3 - lib\include;include\;%(AdditionalIncludeDirectories) - true - Disabled - __SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - true - - - true - bin\x64\Debug\Astra64D.dll - lib\x64;%(AdditionalLibraryDirectories) - - - - - MultiThreadedDLL - Level3 - lib\include;include\;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - true - true - AnySuitable - Speed - ASTRA_CUDA;__SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - true - - - true - true - true - bin\Win32\Release_CUDA\AstraCuda32.dll - cudart.lib;cufft.lib;%(AdditionalDependencies) - lib\win32;%(AdditionalLibraryDirectories);$(CudaToolkitLibDir) - - - 32 - true - compute_20,sm_20;compute_30,sm_30;compute_30,sm_35;compute_30,compute_30 - - - - - MultiThreadedDLL - Level3 - lib\include;include\;%(AdditionalIncludeDirectories) - true - MaxSpeed - true - true - AnySuitable - Speed - ASTRA_CUDA;__SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - true - - - true - true - true - bin\x64\Release_CUDA\AstraCuda64.dll - cudart.lib;cufft.lib;%(AdditionalDependencies) - lib\x64;%(AdditionalLibraryDirectories);$(CudaToolkitLibDir) - - - 64 - true - compute_20,sm_20;compute_30,sm_30;compute_30,sm_35;compute_30,compute_30 - - - - - MultiThreadedDLL - Level3 - lib\include;include\;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - true - true - AnySuitable - Speed - __SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - true - - - true - true - true - bin\Win32\Release\Astra32.dll - lib\win32;%(AdditionalLibraryDirectories) - - - - - MultiThreadedDLL - Level3 - lib\include;include\;%(AdditionalIncludeDirectories) - true - MaxSpeed - true - true - AnySuitable - Speed - __SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - true - - - true - true - true - bin\x64\Release\Astra64.dll - lib\x64;%(AdditionalLibraryDirectories) - - - - - - - - - - - - - - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/astra_vc11.vcxproj.filters b/astra_vc11.vcxproj.filters deleted file mode 100644 index dd7f574..0000000 --- a/astra_vc11.vcxproj.filters +++ /dev/null @@ -1,766 +0,0 @@ - - - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - - - Algorithms\source - - - Algorithms\source - - - Algorithms\source - - - Algorithms\source - - - Algorithms\source - - - Algorithms\source - - - Algorithms\source - - - Algorithms\source - - - Algorithms\source - - - Algorithms\source - - - Algorithms\source - - - Algorithms\source - - - Data Structures\source - - - Data Structures\source - - - Data Structures\source - - - Data Structures\source - - - Data Structures\source - - - Data Structures\source - - - Data Structures\source - - - Data Structures\source - - - Data Structures\source - - - Data Structures\source - - - Data Structures\source - - - Global & Other\source - - - Global & Other\source - - - Global & Other\source - - - Global & Other\source - - - Global & Other\source - - - Global & Other\source - - - Global & Other\source - - - Global & Other\source - - - Global & Other\source - - - Global & Other\source - - - Global & Other\source - - - Geometries\source - - - Geometries\source - - - Geometries\source - - - Geometries\source - - - Geometries\source - - - Geometries\source - - - Geometries\source - - - Geometries\source - - - Geometries\source - - - Geometries\source - - - Geometries\source - - - Geometries\source - - - Geometries\source - - - Projectors\source - - - Projectors\source - - - Projectors\source - - - Projectors\source - - - Projectors\source - - - Projectors\source - - - Projectors\source - - - Projectors\source - - - Projectors\source - - - Projectors\source - - - Projectors\source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - - - Algorithms\headers - - - Algorithms\headers - - - Algorithms\headers - - - Algorithms\headers - - - Algorithms\headers - - - Algorithms\headers - - - Algorithms\headers - - - Algorithms\headers - - - Algorithms\headers - - - Algorithms\headers - - - Algorithms\headers - - - Algorithms\headers - - - Algorithms\headers - - - Algorithms\headers - - - Algorithms\headers - - - Data Structures\headers - - - Data Structures\headers - - - Data Structures\headers - - - Data Structures\headers - - - Data Structures\headers - - - Data Structures\headers - - - Data Structures\headers - - - Data Structures\headers - - - Data Structures\headers - - - Data Structures\headers - - - Data Structures\headers - - - Global & Other\headers - - - Global & Other\headers - - - Global & Other\headers - - - Global & Other\headers - - - Global & Other\headers - - - Global & Other\headers - - - Global & Other\headers - - - Global & Other\headers - - - Global & Other\headers - - - Global & Other\headers - - - Global & Other\headers - - - Global & Other\headers - - - Global & Other\headers - - - Global & Other\headers - - - Global & Other\headers - - - Geometries\headers - - - Geometries\headers - - - Geometries\headers - - - Geometries\headers - - - Geometries\headers - - - Geometries\headers - - - Geometries\headers - - - Geometries\headers - - - Geometries\headers - - - Geometries\headers - - - Geometries\headers - - - Geometries\headers - - - Geometries\headers - - - Geometries\headers - - - Projectors\headers - - - Projectors\headers - - - Projectors\headers - - - Projectors\headers - - - Projectors\headers - - - Projectors\headers - - - Projectors\headers - - - Projectors\headers - - - Projectors\headers - - - Projectors\headers - - - Projectors\headers - - - Projectors\headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - - - Projectors\inline - - - Projectors\inline - - - Projectors\inline - - - Projectors\inline - - - Projectors\inline - - - Projectors\inline - - - Projectors\inline - - - Projectors\inline - - - - - {262b0d17-774a-4cb1-b51a-b358d2d02791} - - - {76d6d672-670b-4454-b3ab-10dc8f9b8710} - - - {77a581a9-60da-4265-97c0-80cdf97408c0} - - - {c1af0e56-5fcc-4e75-b5db-88eeb4148185} - - - {72fbe846-10ef-4c52-88df-13bd66c4cbfc} - - - {7ef37c12-c98c-4dd6-938d-12f49279eae0} - - - {a76ffd6d-3895-4365-b27e-fc9a72f2ed75} - - - {9df653ab-26c3-4bec-92a2-3dda22fda761} - - - {444c44b0-6454-483a-be26-7cb9c8ab0b98} - - - {95346487-8185-487b-a794-3e7fb5fcbd4c} - - - {1c52efc8-a77e-4c72-b9be-f6429a87e6d7} - - - {1546cb47-7e5b-42c2-b695-ef172024c14b} - - - {eddb31ba-0db7-4ab1-a490-36623aaf8901} - - - {dc27bff7-4256-4311-a131-47612a44af20} - - - {91ae2cfd-6b45-46eb-ad99-2f16e5ce4b1e} - - - {0daffd63-ba49-4a5f-8d7a-5322e0e74f22} - - - {2d60e3c8-7874-4cee-b139-991ac15e811d} - - - {bd4e1f94-2f56-4db6-b946-20c29d65a351} - - - {bbef012e-598a-456f-90d8-416bdcb4221c} - - - {4e17872e-db7d-41bc-9760-fad1c253b583} - - - {04a878ed-77b4-4525-9bc2-38ccd65282c5} - - - \ No newline at end of file diff --git a/matlab/mex/astra_mex_algorithm_vc09.vcproj b/matlab/mex/astra_mex_algorithm_vc09.vcproj deleted file mode 100644 index d5cebc0..0000000 --- a/matlab/mex/astra_mex_algorithm_vc09.vcproj +++ /dev/null @@ -1,612 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/matlab/mex/astra_mex_algorithm_vc11.vcxproj b/matlab/mex/astra_mex_algorithm_vc11.vcxproj deleted file mode 100644 index c133e26..0000000 --- a/matlab/mex/astra_mex_algorithm_vc11.vcxproj +++ /dev/null @@ -1,306 +0,0 @@ - - - - - Debug_CUDA - Win32 - - - Debug_CUDA - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_CUDA - Win32 - - - Release_CUDA - x64 - - - Release - Win32 - - - Release - x64 - - - - astra_mex_algorithm - {056BF7A9-294D-487C-8CC3-BE629077CA94} - astraMatlab - - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.60610.1 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/matlab/mex/astra_mex_data2d_vc09.vcproj b/matlab/mex/astra_mex_data2d_vc09.vcproj deleted file mode 100644 index 2c8a63f..0000000 --- a/matlab/mex/astra_mex_data2d_vc09.vcproj +++ /dev/null @@ -1,628 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/matlab/mex/astra_mex_data2d_vc11.vcxproj b/matlab/mex/astra_mex_data2d_vc11.vcxproj deleted file mode 100644 index 636780a..0000000 --- a/matlab/mex/astra_mex_data2d_vc11.vcxproj +++ /dev/null @@ -1,310 +0,0 @@ - - - - - Debug_CUDA - Win32 - - - Debug_CUDA - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_CUDA - Win32 - - - Release_CUDA - x64 - - - Release - Win32 - - - Release - x64 - - - - astra_mex_data2d - {E4092269-B19C-46F7-A84E-4F146CC70E44} - astraMatlab - - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.60610.1 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/matlab/mex/astra_mex_data3d_vc09.vcproj b/matlab/mex/astra_mex_data3d_vc09.vcproj deleted file mode 100644 index fd861a3..0000000 --- a/matlab/mex/astra_mex_data3d_vc09.vcproj +++ /dev/null @@ -1,628 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/matlab/mex/astra_mex_data3d_vc11.vcxproj b/matlab/mex/astra_mex_data3d_vc11.vcxproj deleted file mode 100644 index 1c3c620..0000000 --- a/matlab/mex/astra_mex_data3d_vc11.vcxproj +++ /dev/null @@ -1,310 +0,0 @@ - - - - - Debug_CUDA - Win32 - - - Debug_CUDA - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_CUDA - Win32 - - - Release_CUDA - x64 - - - Release - Win32 - - - Release - x64 - - - - astra_mex_data3d - {0BEC029B-0929-4BF9-BD8B-9C9806A52065} - astraMatlab - - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.60610.1 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/matlab/mex/astra_mex_direct_vc09.vcproj b/matlab/mex/astra_mex_direct_vc09.vcproj deleted file mode 100644 index 5d27c65..0000000 --- a/matlab/mex/astra_mex_direct_vc09.vcproj +++ /dev/null @@ -1,628 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/matlab/mex/astra_mex_direct_vc11.vcxproj b/matlab/mex/astra_mex_direct_vc11.vcxproj deleted file mode 100644 index bc2db62..0000000 --- a/matlab/mex/astra_mex_direct_vc11.vcxproj +++ /dev/null @@ -1,310 +0,0 @@ - - - - - Debug_CUDA - Win32 - - - Debug_CUDA - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_CUDA - Win32 - - - Release_CUDA - x64 - - - Release - Win32 - - - Release - x64 - - - - astra_mex_direct - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7} - astraMatlab - - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.60610.1 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/matlab/mex/astra_mex_file_vc11.vcxproj b/matlab/mex/astra_mex_file_vc11.vcxproj deleted file mode 100644 index 04925fe..0000000 --- a/matlab/mex/astra_mex_file_vc11.vcxproj +++ /dev/null @@ -1,289 +0,0 @@ - - - - - Debug_CUDA - Win32 - - - Debug_CUDA - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_CUDA - Win32 - - - Release_CUDA - x64 - - - Release - Win32 - - - Release - x64 - - - - astra_mex_file - {649115B5-795E-4FCB-BFFE-ED3F07288060} - astraMatlab - - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.60610.1 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - - - - MaxSpeed - $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - - - Astra32.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName)_c.mexw32 - ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - - - - - MaxSpeed - $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - - - Astra64.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName)_c.mexw64 - ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - - - - - MaxSpeed - $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - ASTRA_CUDA;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - AstraCuda32.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName)_c.mexw32 - ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - - - - - MaxSpeed - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\lib\include\cuda;..\..\include\;%(AdditionalIncludeDirectories) - ASTRA_CUDA;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - AstraCuda64.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName)_c.mexw64 - ..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - - - - - Disabled - $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - ASTRA_CUDA;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - true - EditAndContinue - - - AstraCuda32D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName)_c.mexw32 - ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - X64 - - - Disabled - $(CUDA_INC_PATH);$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - ASTRA_CUDA;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - true - true - EditAndContinue - - - AstraCuda64D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName)_c.mexw64 - ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - MachineX64 - - - - - Disabled - $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - MultiThreadedDebugDLL - true - EditAndContinue - - - Astra32D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName)_c.mexw32 - ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - X64 - - - Disabled - $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - MultiThreadedDebugDLL - true - - - Astra64D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName)_c.mexw64 - ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - MachineX64 - - - - - - - true - - - - - - - true - - - - - - - \ No newline at end of file diff --git a/matlab/mex/astra_mex_log_vc09.vcproj b/matlab/mex/astra_mex_log_vc09.vcproj deleted file mode 100644 index 0e0d469..0000000 --- a/matlab/mex/astra_mex_log_vc09.vcproj +++ /dev/null @@ -1,612 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/matlab/mex/astra_mex_log_vc11.vcxproj b/matlab/mex/astra_mex_log_vc11.vcxproj deleted file mode 100644 index 0a939cf..0000000 --- a/matlab/mex/astra_mex_log_vc11.vcxproj +++ /dev/null @@ -1,306 +0,0 @@ - - - - - Debug_CUDA - Win32 - - - Debug_CUDA - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_CUDA - Win32 - - - Release_CUDA - x64 - - - Release - Win32 - - - Release - x64 - - - - astra_mex_log - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E} - astraMatlab - - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.60610.1 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/matlab/mex/astra_mex_matrix_vc09.vcproj b/matlab/mex/astra_mex_matrix_vc09.vcproj deleted file mode 100644 index 3aa17a5..0000000 --- a/matlab/mex/astra_mex_matrix_vc09.vcproj +++ /dev/null @@ -1,612 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/matlab/mex/astra_mex_matrix_vc11.vcxproj b/matlab/mex/astra_mex_matrix_vc11.vcxproj deleted file mode 100644 index abf86a7..0000000 --- a/matlab/mex/astra_mex_matrix_vc11.vcxproj +++ /dev/null @@ -1,306 +0,0 @@ - - - - - Debug_CUDA - Win32 - - - Debug_CUDA - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_CUDA - Win32 - - - Release_CUDA - x64 - - - Release - Win32 - - - Release - x64 - - - - astra_mex_matrix - {9D041710-2119-4230-BCF2-5FBE753FDE49} - astraMatlab - - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.60610.1 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/matlab/mex/astra_mex_projector3d_vc09.vcproj b/matlab/mex/astra_mex_projector3d_vc09.vcproj deleted file mode 100644 index b9464a2..0000000 --- a/matlab/mex/astra_mex_projector3d_vc09.vcproj +++ /dev/null @@ -1,612 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/matlab/mex/astra_mex_projector3d_vc11.vcxproj b/matlab/mex/astra_mex_projector3d_vc11.vcxproj deleted file mode 100644 index 42eb0f1..0000000 --- a/matlab/mex/astra_mex_projector3d_vc11.vcxproj +++ /dev/null @@ -1,306 +0,0 @@ - - - - - Debug_CUDA - Win32 - - - Debug_CUDA - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_CUDA - Win32 - - - Release_CUDA - x64 - - - Release - Win32 - - - Release - x64 - - - - astra_mex_projector3d - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883} - astraMatlab - - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.60610.1 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/matlab/mex/astra_mex_projector_vc09.vcproj b/matlab/mex/astra_mex_projector_vc09.vcproj deleted file mode 100644 index 05c207f..0000000 --- a/matlab/mex/astra_mex_projector_vc09.vcproj +++ /dev/null @@ -1,612 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/matlab/mex/astra_mex_projector_vc11.vcxproj b/matlab/mex/astra_mex_projector_vc11.vcxproj deleted file mode 100644 index e944949..0000000 --- a/matlab/mex/astra_mex_projector_vc11.vcxproj +++ /dev/null @@ -1,306 +0,0 @@ - - - - - Debug_CUDA - Win32 - - - Debug_CUDA - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_CUDA - Win32 - - - Release_CUDA - x64 - - - Release - Win32 - - - Release - x64 - - - - astra_mex_projector - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97} - astraMatlab - - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.60610.1 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/matlab/mex/astra_mex_vc09.vcproj b/matlab/mex/astra_mex_vc09.vcproj deleted file mode 100644 index e4d7d07..0000000 --- a/matlab/mex/astra_mex_vc09.vcproj +++ /dev/null @@ -1,612 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/matlab/mex/astra_mex_vc11.vcxproj b/matlab/mex/astra_mex_vc11.vcxproj deleted file mode 100644 index f1324b4..0000000 --- a/matlab/mex/astra_mex_vc11.vcxproj +++ /dev/null @@ -1,306 +0,0 @@ - - - - - Debug_CUDA - Win32 - - - Debug_CUDA - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_CUDA - Win32 - - - Release_CUDA - x64 - - - Release - Win32 - - - Release - x64 - - - - astra_mex - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221} - astraMatlab - - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.60610.1 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - - - - - - - - - - - \ No newline at end of file -- cgit v1.2.3 From 09032e9dc99a7931f0d26f56322f8406d5462643 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Fri, 18 Nov 2016 12:14:33 +0100 Subject: Add VS2015 build files --- astra_vc14.sln | 245 ++++++++ astra_vc14.vcxproj | 849 ++++++++++++++++++++++++++ astra_vc14.vcxproj.filters | 766 +++++++++++++++++++++++ matlab/mex/astra_mex_algorithm_vc14.vcxproj | 306 ++++++++++ matlab/mex/astra_mex_data2d_vc14.vcxproj | 310 ++++++++++ matlab/mex/astra_mex_data3d_vc14.vcxproj | 310 ++++++++++ matlab/mex/astra_mex_direct_vc14.vcxproj | 310 ++++++++++ matlab/mex/astra_mex_log_vc14.vcxproj | 306 ++++++++++ matlab/mex/astra_mex_matrix_vc14.vcxproj | 306 ++++++++++ matlab/mex/astra_mex_projector3d_vc14.vcxproj | 306 ++++++++++ matlab/mex/astra_mex_projector_vc14.vcxproj | 306 ++++++++++ matlab/mex/astra_mex_vc14.vcxproj | 306 ++++++++++ 12 files changed, 4626 insertions(+) create mode 100644 astra_vc14.sln create mode 100644 astra_vc14.vcxproj create mode 100644 astra_vc14.vcxproj.filters create mode 100644 matlab/mex/astra_mex_algorithm_vc14.vcxproj create mode 100644 matlab/mex/astra_mex_data2d_vc14.vcxproj create mode 100644 matlab/mex/astra_mex_data3d_vc14.vcxproj create mode 100644 matlab/mex/astra_mex_direct_vc14.vcxproj create mode 100644 matlab/mex/astra_mex_log_vc14.vcxproj create mode 100644 matlab/mex/astra_mex_matrix_vc14.vcxproj create mode 100644 matlab/mex/astra_mex_projector3d_vc14.vcxproj create mode 100644 matlab/mex/astra_mex_projector_vc14.vcxproj create mode 100644 matlab/mex/astra_mex_vc14.vcxproj (limited to 'matlab') diff --git a/astra_vc14.sln b/astra_vc14.sln new file mode 100644 index 0000000..767366b --- /dev/null +++ b/astra_vc14.sln @@ -0,0 +1,245 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_vc14", "astra_vc14.vcxproj", "{DABD9D82-609E-4C71-B1CA-A41B07495290}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "astra_mex", "astra_mex", "{2076FB73-ECFE-4B1B-9A8C-E351C500FAAB}" + ProjectSection(ProjectDependencies) = postProject + {DABD9D82-609E-4C71-B1CA-A41B07495290} = {DABD9D82-609E-4C71-B1CA-A41B07495290} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex", "matlab\mex\astra_mex_vc14.vcxproj", "{6FDF72C4-A855-4F1C-A401-6500040B5E28}" + ProjectSection(ProjectDependencies) = postProject + {DABD9D82-609E-4C71-B1CA-A41B07495290} = {DABD9D82-609E-4C71-B1CA-A41B07495290} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_algorithm", "matlab\mex\astra_mex_algorithm_vc14.vcxproj", "{CE5EF874-830C-4C10-8651-CCA2A34ED9E4}" + ProjectSection(ProjectDependencies) = postProject + {DABD9D82-609E-4C71-B1CA-A41B07495290} = {DABD9D82-609E-4C71-B1CA-A41B07495290} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_data2d", "matlab\mex\astra_mex_data2d_vc14.vcxproj", "{D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}" + ProjectSection(ProjectDependencies) = postProject + {DABD9D82-609E-4C71-B1CA-A41B07495290} = {DABD9D82-609E-4C71-B1CA-A41B07495290} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_data3d", "matlab\mex\astra_mex_data3d_vc14.vcxproj", "{2A7084C6-62ED-4235-85F4-094C17689DEB}" + ProjectSection(ProjectDependencies) = postProject + {DABD9D82-609E-4C71-B1CA-A41B07495290} = {DABD9D82-609E-4C71-B1CA-A41B07495290} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_matrix", "matlab\mex\astra_mex_matrix_vc14.vcxproj", "{6BFA8857-37EB-4E43-A97C-B860E21599F5}" + ProjectSection(ProjectDependencies) = postProject + {DABD9D82-609E-4C71-B1CA-A41B07495290} = {DABD9D82-609E-4C71-B1CA-A41B07495290} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_projector", "matlab\mex\astra_mex_projector_vc14.vcxproj", "{85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}" + ProjectSection(ProjectDependencies) = postProject + {DABD9D82-609E-4C71-B1CA-A41B07495290} = {DABD9D82-609E-4C71-B1CA-A41B07495290} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_projector3d", "matlab\mex\astra_mex_projector3d_vc14.vcxproj", "{CA85BDA0-9BDD-495E-B200-BFE863EB6318}" + ProjectSection(ProjectDependencies) = postProject + {DABD9D82-609E-4C71-B1CA-A41B07495290} = {DABD9D82-609E-4C71-B1CA-A41B07495290} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_log", "matlab\mex\astra_mex_log_vc14.vcxproj", "{88539382-66DB-4BBC-A48E-8B6B3CA6064F}" + ProjectSection(ProjectDependencies) = postProject + {DABD9D82-609E-4C71-B1CA-A41B07495290} = {DABD9D82-609E-4C71-B1CA-A41B07495290} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_direct", "matlab\mex\astra_mex_direct_vc14.vcxproj", "{47460476-912B-4313-8B10-BDF1D60A84C4}" + ProjectSection(ProjectDependencies) = postProject + {DABD9D82-609E-4C71-B1CA-A41B07495290} = {DABD9D82-609E-4C71-B1CA-A41B07495290} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_CUDA|Win32 = Debug_CUDA|Win32 + Debug_CUDA|x64 = Debug_CUDA|x64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release_CUDA|Win32 = Release_CUDA|Win32 + Release_CUDA|x64 = Release_CUDA|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Debug|Win32.ActiveCfg = Debug|Win32 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Debug|Win32.Build.0 = Debug|Win32 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Debug|x64.ActiveCfg = Debug|x64 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Debug|x64.Build.0 = Debug|x64 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Release|Win32.ActiveCfg = Release|Win32 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Release|Win32.Build.0 = Release|Win32 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Release|x64.ActiveCfg = Release|x64 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Release|x64.Build.0 = Release|x64 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Debug|Win32.ActiveCfg = Debug|Win32 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Debug|Win32.Build.0 = Debug|Win32 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Debug|x64.ActiveCfg = Debug|x64 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Debug|x64.Build.0 = Debug|x64 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Release|Win32.ActiveCfg = Release|Win32 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Release|Win32.Build.0 = Release|Win32 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Release|x64.ActiveCfg = Release|x64 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Release|x64.Build.0 = Release|x64 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Debug|Win32.ActiveCfg = Debug|Win32 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Debug|Win32.Build.0 = Debug|Win32 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Debug|x64.ActiveCfg = Debug|x64 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Debug|x64.Build.0 = Debug|x64 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Release|Win32.ActiveCfg = Release|Win32 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Release|Win32.Build.0 = Release|Win32 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Release|x64.ActiveCfg = Release|x64 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Release|x64.Build.0 = Release|x64 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Debug|Win32.ActiveCfg = Debug|Win32 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Debug|Win32.Build.0 = Debug|Win32 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Debug|x64.ActiveCfg = Debug|x64 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Debug|x64.Build.0 = Debug|x64 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Release|Win32.ActiveCfg = Release|Win32 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Release|Win32.Build.0 = Release|Win32 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Release|x64.ActiveCfg = Release|x64 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Release|x64.Build.0 = Release|x64 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Debug|Win32.ActiveCfg = Debug|Win32 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Debug|Win32.Build.0 = Debug|Win32 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Debug|x64.ActiveCfg = Debug|x64 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Debug|x64.Build.0 = Debug|x64 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Release|Win32.ActiveCfg = Release|Win32 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Release|Win32.Build.0 = Release|Win32 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Release|x64.ActiveCfg = Release|x64 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Release|x64.Build.0 = Release|x64 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Debug|Win32.ActiveCfg = Debug|Win32 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Debug|Win32.Build.0 = Debug|Win32 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Debug|x64.ActiveCfg = Debug|x64 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Debug|x64.Build.0 = Debug|x64 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Release|Win32.ActiveCfg = Release|Win32 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Release|Win32.Build.0 = Release|Win32 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Release|x64.ActiveCfg = Release|x64 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Release|x64.Build.0 = Release|x64 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Debug|Win32.ActiveCfg = Debug|Win32 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Debug|Win32.Build.0 = Debug|Win32 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Debug|x64.ActiveCfg = Debug|x64 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Debug|x64.Build.0 = Debug|x64 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Release|Win32.ActiveCfg = Release|Win32 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Release|Win32.Build.0 = Release|Win32 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Release|x64.ActiveCfg = Release|x64 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Release|x64.Build.0 = Release|x64 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Debug|Win32.ActiveCfg = Debug|Win32 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Debug|Win32.Build.0 = Debug|Win32 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Debug|x64.ActiveCfg = Debug|x64 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Debug|x64.Build.0 = Debug|x64 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Release|Win32.ActiveCfg = Release|Win32 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Release|Win32.Build.0 = Release|Win32 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Release|x64.ActiveCfg = Release|x64 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Release|x64.Build.0 = Release|x64 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Debug|Win32.ActiveCfg = Debug|Win32 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Debug|Win32.Build.0 = Debug|Win32 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Debug|x64.ActiveCfg = Debug|x64 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Debug|x64.Build.0 = Debug|x64 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Release|Win32.ActiveCfg = Release|Win32 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Release|Win32.Build.0 = Release|Win32 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Release|x64.ActiveCfg = Release|x64 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Release|x64.Build.0 = Release|x64 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Debug|Win32.ActiveCfg = Debug|Win32 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Debug|Win32.Build.0 = Debug|Win32 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Debug|x64.ActiveCfg = Debug|x64 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Debug|x64.Build.0 = Debug|x64 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Release|Win32.ActiveCfg = Release|Win32 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Release|Win32.Build.0 = Release|Win32 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Release|x64.ActiveCfg = Release|x64 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {6FDF72C4-A855-4F1C-A401-6500040B5E28} = {2076FB73-ECFE-4B1B-9A8C-E351C500FAAB} + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4} = {2076FB73-ECFE-4B1B-9A8C-E351C500FAAB} + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1} = {2076FB73-ECFE-4B1B-9A8C-E351C500FAAB} + {2A7084C6-62ED-4235-85F4-094C17689DEB} = {2076FB73-ECFE-4B1B-9A8C-E351C500FAAB} + {6BFA8857-37EB-4E43-A97C-B860E21599F5} = {2076FB73-ECFE-4B1B-9A8C-E351C500FAAB} + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2} = {2076FB73-ECFE-4B1B-9A8C-E351C500FAAB} + {CA85BDA0-9BDD-495E-B200-BFE863EB6318} = {2076FB73-ECFE-4B1B-9A8C-E351C500FAAB} + {88539382-66DB-4BBC-A48E-8B6B3CA6064F} = {2076FB73-ECFE-4B1B-9A8C-E351C500FAAB} + {47460476-912B-4313-8B10-BDF1D60A84C4} = {2076FB73-ECFE-4B1B-9A8C-E351C500FAAB} + EndGlobalSection +EndGlobal diff --git a/astra_vc14.vcxproj b/astra_vc14.vcxproj new file mode 100644 index 0000000..a28bbfa --- /dev/null +++ b/astra_vc14.vcxproj @@ -0,0 +1,849 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + {DABD9D82-609E-4C71-B1CA-A41B07495290} + astra_vc14 + + + + DynamicLibrary + true + v140 + MultiByte + + + DynamicLibrary + true + v140 + MultiByte + + + DynamicLibrary + true + v140 + MultiByte + + + DynamicLibrary + true + v140 + MultiByte + + + DynamicLibrary + false + v140 + true + MultiByte + + + DynamicLibrary + false + v140 + true + MultiByte + + + DynamicLibrary + false + v140 + true + MultiByte + + + DynamicLibrary + false + v140 + true + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(SolutionDir)bin\$(Platform)\Debug_CUDA\ + $(OutDir)obj\ + .dll + AstraCuda32D + true + + + $(SolutionDir)bin\$(Platform)\Debug_CUDA\ + $(OutDir)obj\ + .dll + AstraCuda64D + true + + + $(SolutionDir)bin\$(Platform)\Debug\ + $(OutDir)obj\ + .dll + Astra32D + true + + + $(SolutionDir)bin\$(Platform)\Debug\ + $(OutDir)obj\ + .dll + Astra64D + true + + + $(SolutionDir)bin\$(Platform)\Release_CUDA\ + $(OutDir)obj\ + .dll + AstraCuda32 + true + + + $(SolutionDir)bin\$(Platform)\Release_CUDA\ + $(OutDir)obj\ + .dll + AstraCuda64 + true + + + $(SolutionDir)bin\$(Platform)\Release\ + $(OutDir)obj\ + .dll + Astra32 + true + + + $(SolutionDir)bin\$(Platform)\Release\ + $(OutDir)obj\ + .dll + Astra64 + true + + + + MultiThreadedDebugDLL + Level3 + lib\include;include\;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + ASTRA_CUDA;__SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + true + + + true + bin\Win32\Debug_CUDA\AstraCuda32D.dll + cudart.lib;cufft.lib;%(AdditionalDependencies) + lib\win32;%(AdditionalLibraryDirectories);$(CudaToolkitLibDir) + + + 32 + true + compute_20,sm_20;compute_30,sm_30;compute_35,sm_35;compute_50,sm_50;compute_60,sm_60;compute_60,compute_60 + + + + + MultiThreadedDebugDLL + Level3 + lib\include;include\;%(AdditionalIncludeDirectories) + true + Disabled + ASTRA_CUDA;__SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + true + + + true + bin\x64\Debug_CUDA\AstraCuda64D.dll + cudart.lib;cufft.lib;%(AdditionalDependencies) + lib\x64;%(AdditionalLibraryDirectories);$(CudaToolkitLibDir) + + + 64 + true + compute_20,sm_20;compute_30,sm_30;compute_35,sm_35;compute_50,sm_50;compute_60,sm_60;compute_60,compute_60 + + + + + MultiThreadedDebugDLL + Level3 + lib\include;include\;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + __SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + true + + + true + bin\Win32\Debug\Astra32D.dll + lib\win32;%(AdditionalLibraryDirectories) + + + + + MultiThreadedDebugDLL + Level3 + lib\include;include\;%(AdditionalIncludeDirectories) + true + Disabled + __SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + true + + + true + bin\x64\Debug\Astra64D.dll + lib\x64;%(AdditionalLibraryDirectories) + + + + + MultiThreadedDLL + Level3 + lib\include;include\;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + true + true + AnySuitable + Speed + ASTRA_CUDA;__SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + true + + + true + true + true + bin\Win32\Release_CUDA\AstraCuda32.dll + cudart.lib;cufft.lib;%(AdditionalDependencies) + lib\win32;%(AdditionalLibraryDirectories);$(CudaToolkitLibDir) + + + 32 + true + compute_20,sm_20;compute_30,sm_30;compute_35,sm_35;compute_50,sm_50;compute_60,sm_60;compute_60,compute_60 + + + + + MultiThreadedDLL + Level3 + lib\include;include\;%(AdditionalIncludeDirectories) + true + MaxSpeed + true + true + AnySuitable + Speed + ASTRA_CUDA;__SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + true + + + true + true + true + bin\x64\Release_CUDA\AstraCuda64.dll + cudart.lib;cufft.lib;%(AdditionalDependencies) + lib\x64;%(AdditionalLibraryDirectories);$(CudaToolkitLibDir) + + + 64 + true + compute_20,sm_20;compute_30,sm_30;compute_35,sm_35;compute_50,sm_50;compute_60,sm_60;compute_60,compute_60 + + + + + MultiThreadedDLL + Level3 + lib\include;include\;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + true + true + AnySuitable + Speed + __SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + true + + + true + true + true + bin\Win32\Release\Astra32.dll + lib\win32;%(AdditionalLibraryDirectories) + + + + + MultiThreadedDLL + Level3 + lib\include;include\;%(AdditionalIncludeDirectories) + true + MaxSpeed + true + true + AnySuitable + Speed + __SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + true + + + true + true + true + bin\x64\Release\Astra64.dll + lib\x64;%(AdditionalLibraryDirectories) + + + + + + + + + + + + + + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/astra_vc14.vcxproj.filters b/astra_vc14.vcxproj.filters new file mode 100644 index 0000000..dd7f574 --- /dev/null +++ b/astra_vc14.vcxproj.filters @@ -0,0 +1,766 @@ + + + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Data Structures\source + + + Data Structures\source + + + Data Structures\source + + + Data Structures\source + + + Data Structures\source + + + Data Structures\source + + + Data Structures\source + + + Data Structures\source + + + Data Structures\source + + + Data Structures\source + + + Data Structures\source + + + Global & Other\source + + + Global & Other\source + + + Global & Other\source + + + Global & Other\source + + + Global & Other\source + + + Global & Other\source + + + Global & Other\source + + + Global & Other\source + + + Global & Other\source + + + Global & Other\source + + + Global & Other\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Projectors\source + + + Projectors\source + + + Projectors\source + + + Projectors\source + + + Projectors\source + + + Projectors\source + + + Projectors\source + + + Projectors\source + + + Projectors\source + + + Projectors\source + + + Projectors\source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Data Structures\headers + + + Data Structures\headers + + + Data Structures\headers + + + Data Structures\headers + + + Data Structures\headers + + + Data Structures\headers + + + Data Structures\headers + + + Data Structures\headers + + + Data Structures\headers + + + Data Structures\headers + + + Data Structures\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + + + Projectors\inline + + + Projectors\inline + + + Projectors\inline + + + Projectors\inline + + + Projectors\inline + + + Projectors\inline + + + Projectors\inline + + + Projectors\inline + + + + + {262b0d17-774a-4cb1-b51a-b358d2d02791} + + + {76d6d672-670b-4454-b3ab-10dc8f9b8710} + + + {77a581a9-60da-4265-97c0-80cdf97408c0} + + + {c1af0e56-5fcc-4e75-b5db-88eeb4148185} + + + {72fbe846-10ef-4c52-88df-13bd66c4cbfc} + + + {7ef37c12-c98c-4dd6-938d-12f49279eae0} + + + {a76ffd6d-3895-4365-b27e-fc9a72f2ed75} + + + {9df653ab-26c3-4bec-92a2-3dda22fda761} + + + {444c44b0-6454-483a-be26-7cb9c8ab0b98} + + + {95346487-8185-487b-a794-3e7fb5fcbd4c} + + + {1c52efc8-a77e-4c72-b9be-f6429a87e6d7} + + + {1546cb47-7e5b-42c2-b695-ef172024c14b} + + + {eddb31ba-0db7-4ab1-a490-36623aaf8901} + + + {dc27bff7-4256-4311-a131-47612a44af20} + + + {91ae2cfd-6b45-46eb-ad99-2f16e5ce4b1e} + + + {0daffd63-ba49-4a5f-8d7a-5322e0e74f22} + + + {2d60e3c8-7874-4cee-b139-991ac15e811d} + + + {bd4e1f94-2f56-4db6-b946-20c29d65a351} + + + {bbef012e-598a-456f-90d8-416bdcb4221c} + + + {4e17872e-db7d-41bc-9760-fad1c253b583} + + + {04a878ed-77b4-4525-9bc2-38ccd65282c5} + + + \ No newline at end of file diff --git a/matlab/mex/astra_mex_algorithm_vc14.vcxproj b/matlab/mex/astra_mex_algorithm_vc14.vcxproj new file mode 100644 index 0000000..05b120f --- /dev/null +++ b/matlab/mex/astra_mex_algorithm_vc14.vcxproj @@ -0,0 +1,306 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + astra_mex_algorithm + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4} + astraMatlab + + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/matlab/mex/astra_mex_data2d_vc14.vcxproj b/matlab/mex/astra_mex_data2d_vc14.vcxproj new file mode 100644 index 0000000..6c5dccc --- /dev/null +++ b/matlab/mex/astra_mex_data2d_vc14.vcxproj @@ -0,0 +1,310 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + astra_mex_data2d + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1} + astraMatlab + + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/matlab/mex/astra_mex_data3d_vc14.vcxproj b/matlab/mex/astra_mex_data3d_vc14.vcxproj new file mode 100644 index 0000000..8a10af7 --- /dev/null +++ b/matlab/mex/astra_mex_data3d_vc14.vcxproj @@ -0,0 +1,310 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + astra_mex_data3d + {2A7084C6-62ED-4235-85F4-094C17689DEB} + astraMatlab + + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/matlab/mex/astra_mex_direct_vc14.vcxproj b/matlab/mex/astra_mex_direct_vc14.vcxproj new file mode 100644 index 0000000..c17d49b --- /dev/null +++ b/matlab/mex/astra_mex_direct_vc14.vcxproj @@ -0,0 +1,310 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + astra_mex_direct + {47460476-912B-4313-8B10-BDF1D60A84C4} + astraMatlab + + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/matlab/mex/astra_mex_log_vc14.vcxproj b/matlab/mex/astra_mex_log_vc14.vcxproj new file mode 100644 index 0000000..bb7ccb6 --- /dev/null +++ b/matlab/mex/astra_mex_log_vc14.vcxproj @@ -0,0 +1,306 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + astra_mex_log + {88539382-66DB-4BBC-A48E-8B6B3CA6064F} + astraMatlab + + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/matlab/mex/astra_mex_matrix_vc14.vcxproj b/matlab/mex/astra_mex_matrix_vc14.vcxproj new file mode 100644 index 0000000..389e516 --- /dev/null +++ b/matlab/mex/astra_mex_matrix_vc14.vcxproj @@ -0,0 +1,306 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + astra_mex_matrix + {6BFA8857-37EB-4E43-A97C-B860E21599F5} + astraMatlab + + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/matlab/mex/astra_mex_projector3d_vc14.vcxproj b/matlab/mex/astra_mex_projector3d_vc14.vcxproj new file mode 100644 index 0000000..5c56221 --- /dev/null +++ b/matlab/mex/astra_mex_projector3d_vc14.vcxproj @@ -0,0 +1,306 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + astra_mex_projector3d + {CA85BDA0-9BDD-495E-B200-BFE863EB6318} + astraMatlab + + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/matlab/mex/astra_mex_projector_vc14.vcxproj b/matlab/mex/astra_mex_projector_vc14.vcxproj new file mode 100644 index 0000000..332fb4c --- /dev/null +++ b/matlab/mex/astra_mex_projector_vc14.vcxproj @@ -0,0 +1,306 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + astra_mex_projector + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2} + astraMatlab + + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/matlab/mex/astra_mex_vc14.vcxproj b/matlab/mex/astra_mex_vc14.vcxproj new file mode 100644 index 0000000..7ca3dbb --- /dev/null +++ b/matlab/mex/astra_mex_vc14.vcxproj @@ -0,0 +1,306 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + astra_mex + {6FDF72C4-A855-4F1C-A401-6500040B5E28} + astraMatlab + + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3 From 71db6331f8dd0d5abbeee92977af01293be4f427 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Mon, 28 Nov 2016 15:54:07 +0100 Subject: Update headers (website+2016) --- NEWS.txt | 6 +- README.md | 8 +- README.txt | 8 +- build/linux/configure.ac | 7 +- cuda/2d/algo.cu | 7 +- cuda/2d/algo.h | 7 +- cuda/2d/arith.cu | 7 +- cuda/2d/arith.h | 7 +- cuda/2d/astra.cu | 7 +- cuda/2d/astra.h | 7 +- cuda/2d/cgls.cu | 7 +- cuda/2d/cgls.h | 7 +- cuda/2d/darthelper.cu | 7 +- cuda/2d/darthelper.h | 7 +- cuda/2d/dims.h | 7 +- cuda/2d/em.cu | 7 +- cuda/2d/em.h | 7 +- cuda/2d/fan_bp.cu | 7 +- cuda/2d/fan_bp.h | 7 +- cuda/2d/fan_fp.cu | 7 +- cuda/2d/fan_fp.h | 7 +- cuda/2d/fbp_filters.h | 7 +- cuda/2d/fft.cu | 7 +- cuda/2d/fft.h | 7 +- cuda/2d/par_bp.cu | 7 +- cuda/2d/par_bp.h | 7 +- cuda/2d/par_fp.cu | 7 +- cuda/2d/par_fp.h | 7 +- cuda/2d/sart.cu | 7 +- cuda/2d/sart.h | 7 +- cuda/2d/sirt.cu | 7 +- cuda/2d/sirt.h | 7 +- cuda/2d/util.cu | 7 +- cuda/2d/util.h | 7 +- cuda/3d/algo3d.cu | 7 +- cuda/3d/algo3d.h | 7 +- cuda/3d/arith3d.cu | 7 +- cuda/3d/arith3d.h | 7 +- cuda/3d/astra3d.cu | 7 +- cuda/3d/astra3d.h | 7 +- cuda/3d/cgls3d.cu | 7 +- cuda/3d/cgls3d.h | 7 +- cuda/3d/cone_bp.cu | 7 +- cuda/3d/cone_bp.h | 7 +- cuda/3d/cone_fp.cu | 7 +- cuda/3d/cone_fp.h | 7 +- cuda/3d/darthelper3d.cu | 7 +- cuda/3d/darthelper3d.h | 7 +- cuda/3d/dims3d.h | 7 +- cuda/3d/fdk.cu | 7 +- cuda/3d/fdk.h | 7 +- cuda/3d/mem3d.cu | 7 +- cuda/3d/mem3d.h | 6 +- cuda/3d/par3d_bp.cu | 7 +- cuda/3d/par3d_bp.h | 7 +- cuda/3d/par3d_fp.cu | 7 +- cuda/3d/par3d_fp.h | 7 +- cuda/3d/sirt3d.cu | 7 +- cuda/3d/sirt3d.h | 7 +- cuda/3d/util3d.cu | 7 +- cuda/3d/util3d.h | 7 +- include/astra/Algorithm.h | 7 +- include/astra/AlgorithmTypelist.h | 7 +- include/astra/ArtAlgorithm.h | 7 +- include/astra/AstraObjectFactory.h | 7 +- include/astra/AstraObjectManager.h | 7 +- include/astra/AsyncAlgorithm.h | 7 +- include/astra/BackProjectionAlgorithm.h | 7 +- include/astra/CglsAlgorithm.h | 7 +- include/astra/CompositeGeometryManager.h | 6 +- include/astra/ConeProjectionGeometry3D.h | 7 +- include/astra/ConeVecProjectionGeometry3D.h | 7 +- include/astra/Config.h | 7 +- include/astra/CudaBackProjectionAlgorithm.h | 7 +- include/astra/CudaBackProjectionAlgorithm3D.h | 7 +- include/astra/CudaCglsAlgorithm.h | 7 +- include/astra/CudaCglsAlgorithm3D.h | 7 +- include/astra/CudaDartMaskAlgorithm.h | 7 +- include/astra/CudaDartMaskAlgorithm3D.h | 7 +- include/astra/CudaDartSmoothingAlgorithm.h | 7 +- include/astra/CudaDartSmoothingAlgorithm3D.h | 7 +- include/astra/CudaDataOperationAlgorithm.h | 7 +- include/astra/CudaEMAlgorithm.h | 7 +- include/astra/CudaFDKAlgorithm3D.h | 7 +- .../astra/CudaFilteredBackProjectionAlgorithm.h | 7 +- include/astra/CudaForwardProjectionAlgorithm.h | 7 +- include/astra/CudaForwardProjectionAlgorithm3D.h | 7 +- include/astra/CudaProjector2D.h | 7 +- include/astra/CudaProjector3D.h | 7 +- include/astra/CudaReconstructionAlgorithm2D.h | 7 +- include/astra/CudaRoiSelectAlgorithm.h | 7 +- include/astra/CudaSartAlgorithm.h | 7 +- include/astra/CudaSirtAlgorithm.h | 7 +- include/astra/CudaSirtAlgorithm3D.h | 7 +- include/astra/DataProjector.h | 7 +- include/astra/DataProjectorPolicies.h | 7 +- include/astra/DataProjectorPolicies.inl | 7 +- include/astra/FanFlatBeamLineKernelProjector2D.h | 7 +- include/astra/FanFlatBeamLineKernelProjector2D.inl | 7 +- include/astra/FanFlatBeamStripKernelProjector2D.h | 7 +- .../astra/FanFlatBeamStripKernelProjector2D.inl | 7 +- include/astra/FanFlatProjectionGeometry2D.h | 7 +- include/astra/FanFlatVecProjectionGeometry2D.h | 7 +- include/astra/FilteredBackProjectionAlgorithm.h | 7 +- include/astra/Float32Data.h | 7 +- include/astra/Float32Data2D.h | 7 +- include/astra/Float32Data3D.h | 7 +- include/astra/Float32Data3DMemory.h | 7 +- include/astra/Float32ProjectionData2D.h | 7 +- include/astra/Float32ProjectionData3D.h | 7 +- include/astra/Float32ProjectionData3DMemory.h | 7 +- include/astra/Float32VolumeData2D.h | 7 +- include/astra/Float32VolumeData3D.h | 7 +- include/astra/Float32VolumeData3DMemory.h | 7 +- include/astra/ForwardProjectionAlgorithm.h | 7 +- include/astra/Fourier.h | 7 +- include/astra/GeometryUtil2D.h | 7 +- include/astra/GeometryUtil3D.h | 7 +- include/astra/Globals.h | 7 +- include/astra/Logging.h | 7 +- include/astra/ParallelBeamBlobKernelProjector2D.h | 7 +- .../astra/ParallelBeamBlobKernelProjector2D.inl | 7 +- include/astra/ParallelBeamLineKernelProjector2D.h | 7 +- .../astra/ParallelBeamLineKernelProjector2D.inl | 7 +- .../astra/ParallelBeamLinearKernelProjector2D.h | 7 +- .../astra/ParallelBeamLinearKernelProjector2D.inl | 7 +- include/astra/ParallelBeamStripKernelProjector2D.h | 7 +- .../astra/ParallelBeamStripKernelProjector2D.inl | 7 +- include/astra/ParallelProjectionGeometry2D.h | 7 +- include/astra/ParallelProjectionGeometry3D.h | 7 +- include/astra/ParallelVecProjectionGeometry3D.h | 7 +- include/astra/PlatformDepSystemCode.h | 7 +- include/astra/PluginAlgorithm.h | 7 +- include/astra/ProjectionGeometry2D.h | 7 +- include/astra/ProjectionGeometry3D.h | 7 +- include/astra/Projector2D.h | 7 +- include/astra/Projector2DImpl.inl | 7 +- include/astra/Projector3D.h | 7 +- include/astra/ProjectorTypelist.h | 7 +- include/astra/ReconstructionAlgorithm2D.h | 7 +- include/astra/ReconstructionAlgorithm3D.h | 7 +- include/astra/SartAlgorithm.h | 7 +- include/astra/Singleton.h | 7 +- include/astra/SirtAlgorithm.h | 7 +- include/astra/SparseMatrix.h | 7 +- include/astra/SparseMatrixProjectionGeometry2D.h | 7 +- include/astra/SparseMatrixProjector2D.h | 7 +- include/astra/SparseMatrixProjector2D.inl | 7 +- include/astra/TypeList.h | 7 +- include/astra/Utilities.h | 7 +- include/astra/Vector3D.h | 7 +- include/astra/VolumeGeometry2D.h | 7 +- include/astra/VolumeGeometry3D.h | 7 +- include/astra/XMLDocument.h | 7 +- include/astra/XMLNode.h | 7 +- include/astra/swrap.h | 7 +- matlab/algorithms/DART/DARTalgorithm.m | 6 +- matlab/algorithms/DART/IterativeTomography.m | 10 + matlab/algorithms/DART/IterativeTomography3D.m | 10 + matlab/algorithms/DART/Kernels.m | 6 +- matlab/algorithms/DART/MaskingDefault.m | 6 +- matlab/algorithms/DART/MaskingGPU.m | 6 +- matlab/algorithms/DART/OutputDefault.m | 6 +- matlab/algorithms/DART/SegmentationDefault.m | 6 +- matlab/algorithms/DART/SmoothingDefault.m | 6 +- matlab/algorithms/DART/SmoothingGPU.m | 6 +- matlab/algorithms/DART/StatisticsDefault.m | 6 +- matlab/algorithms/DART/examples/example1.m | 6 +- matlab/algorithms/DART/examples/example2.m | 6 +- matlab/algorithms/DART/examples/example3.m | 6 +- matlab/algorithms/DART/tools/DARToptimizer.m | 6 +- .../algorithms/DART/tools/DARToptimizerBoneStudy.m | 6 +- matlab/algorithms/DART/tools/ProjDiffOptimFunc.m | 6 +- .../DART/tools/dart_create_base_phantom.m | 6 +- matlab/algorithms/DART/tools/dart_scheduler.m | 6 +- matlab/algorithms/DART/tools/rNMPOptimFunc.m | 6 +- matlab/mex/astra_mex_algorithm_c.cpp | 7 +- matlab/mex/astra_mex_c.cpp | 7 +- matlab/mex/astra_mex_data2d_c.cpp | 7 +- matlab/mex/astra_mex_data3d_c.cpp | 7 +- matlab/mex/astra_mex_direct_c.cpp | 7 +- matlab/mex/astra_mex_log_c.cpp | 7 +- matlab/mex/astra_mex_matrix_c.cpp | 7 +- matlab/mex/astra_mex_plugin_c.cpp | 7 +- matlab/mex/astra_mex_projector3d_c.cpp | 7 +- matlab/mex/astra_mex_projector_c.cpp | 7 +- matlab/mex/mexCopyDataHelpFunctions.cpp | 7 +- matlab/mex/mexCopyDataHelpFunctions.h | 7 +- matlab/mex/mexDataManagerHelpFunctions.cpp | 7 +- matlab/mex/mexDataManagerHelpFunctions.h | 7 +- matlab/mex/mexHelpFunctions.cpp | 7 +- matlab/mex/mexHelpFunctions.h | 7 +- matlab/mex/mexInitFunctions.h | 2 +- matlab/mex/octave_support.cpp | 2 +- matlab/tools/ROIselectfull.m | 2 +- matlab/tools/astra_add_noise_to_sino.m | 7 +- matlab/tools/astra_clear.m | 7 +- matlab/tools/astra_create_backprojection.m | 7 +- matlab/tools/astra_create_backprojection3d_cuda.m | 7 +- matlab/tools/astra_create_backprojection_cuda.m | 7 +- matlab/tools/astra_create_proj_geom.m | 7 +- matlab/tools/astra_create_projector.m | 7 +- matlab/tools/astra_create_reconstruction.m | 7 +- matlab/tools/astra_create_reconstruction_cuda.m | 7 +- matlab/tools/astra_create_sino.m | 7 +- matlab/tools/astra_create_sino3d_cuda.m | 7 +- matlab/tools/astra_create_sino_cuda.m | 7 +- matlab/tools/astra_create_sino_gpu.m | 7 +- matlab/tools/astra_create_sino_sampling.m | 7 +- matlab/tools/astra_create_vol_geom.m | 7 +- matlab/tools/astra_data_op.m | 2 +- matlab/tools/astra_data_op_mask.m | 2 +- matlab/tools/astra_downsample_sinogram.m | 7 +- matlab/tools/astra_imshow.m | 2 +- matlab/tools/astra_mex.m | 7 +- matlab/tools/astra_mex_algorithm.m | 7 +- matlab/tools/astra_mex_data2d.m | 7 +- matlab/tools/astra_mex_data3d.m | 7 +- matlab/tools/astra_mex_direct.m | 7 +- matlab/tools/astra_mex_log.m | 9 +- matlab/tools/astra_mex_matrix.m | 7 +- matlab/tools/astra_mex_plugin.m | 9 +- matlab/tools/astra_mex_projector.m | 7 +- matlab/tools/astra_mex_projector3d.m | 7 +- matlab/tools/astra_projector_handle.m | 6 +- matlab/tools/astra_set_directory.m | 7 +- matlab/tools/astra_set_gpu_index.m | 7 +- matlab/tools/astra_struct.m | 7 +- matlab/tools/createOrderART.m | 7 +- matlab/tools/downsample_sinogram.m | 2 +- matlab/tools/imreadgs.m | 7 +- matlab/tools/imresize3D.m | 7 +- matlab/tools/imscale.m | 7 +- matlab/tools/imwritesc.m | 7 +- matlab/tools/kaiserBessel.m | 7 +- matlab/tools/linspace2.m | 7 +- matlab/tools/opTomo.m | 5 +- matlab/tools/overlayImage.m | 7 +- matlab/tools/rebin_fan2par.m | 7 +- matlab/tools/sliceExtractor.m | 7 +- samples/matlab/s001_sinogram_par2d.m | 6 +- samples/matlab/s002_data2d.m | 6 +- samples/matlab/s003_gpu_reconstruction.m | 6 +- samples/matlab/s004_cpu_reconstruction.m | 6 +- samples/matlab/s005_3d_geometry.m | 6 +- samples/matlab/s006_3d_data.m | 6 +- samples/matlab/s007_3d_reconstruction.m | 6 +- samples/matlab/s008_gpu_selection.m | 6 +- samples/matlab/s009_projection_matrix.m | 6 +- samples/matlab/s010_supersampling.m | 6 +- samples/matlab/s011_object_info.m | 6 +- samples/matlab/s012_masks.m | 6 +- samples/matlab/s013_constraints.m | 6 +- samples/matlab/s014_FBP.m | 6 +- samples/matlab/s015_fp_bp.m | 6 +- samples/matlab/s016_plots.m | 6 +- samples/matlab/s017_opTomo.m | 6 +- samples/matlab/s020_3d_multiGPU.m | 6 +- src/Algorithm.cpp | 7 +- src/ArtAlgorithm.cpp | 7 +- src/AstraObjectFactory.cpp | 7 +- src/AstraObjectManager.cpp | 7 +- src/AsyncAlgorithm.cpp | 7 +- src/BackProjectionAlgorithm.cpp | 7 +- src/CglsAlgorithm.cpp | 7 +- src/CompositeGeometryManager.cpp | 6 +- src/ConeProjectionGeometry3D.cpp | 7 +- src/ConeVecProjectionGeometry3D.cpp | 7 +- src/Config.cpp | 7 +- src/CudaBackProjectionAlgorithm.cpp | 7 +- src/CudaBackProjectionAlgorithm3D.cpp | 7 +- src/CudaCglsAlgorithm.cpp | 7 +- src/CudaCglsAlgorithm3D.cpp | 7 +- src/CudaDartMaskAlgorithm.cpp | 7 +- src/CudaDartMaskAlgorithm3D.cpp | 7 +- src/CudaDartSmoothingAlgorithm.cpp | 7 +- src/CudaDartSmoothingAlgorithm3D.cpp | 7 +- src/CudaDataOperationAlgorithm.cpp | 7 +- src/CudaEMAlgorithm.cpp | 7 +- src/CudaFDKAlgorithm3D.cpp | 7 +- src/CudaFilteredBackProjectionAlgorithm.cpp | 7 +- src/CudaForwardProjectionAlgorithm.cpp | 7 +- src/CudaForwardProjectionAlgorithm3D.cpp | 7 +- src/CudaProjector2D.cpp | 7 +- src/CudaProjector3D.cpp | 7 +- src/CudaReconstructionAlgorithm2D.cpp | 7 +- src/CudaRoiSelectAlgorithm.cpp | 7 +- src/CudaSartAlgorithm.cpp | 7 +- src/CudaSirtAlgorithm.cpp | 7 +- src/CudaSirtAlgorithm3D.cpp | 7 +- src/DataProjector.cpp | 7 +- src/DataProjectorPolicies.cpp | 7 +- src/FanFlatBeamLineKernelProjector2D.cpp | 7 +- src/FanFlatBeamStripKernelProjector2D.cpp | 7 +- src/FanFlatProjectionGeometry2D.cpp | 7 +- src/FanFlatVecProjectionGeometry2D.cpp | 7 +- src/FilteredBackProjectionAlgorithm.cpp | 7 +- src/Float32Data.cpp | 7 +- src/Float32Data2D.cpp | 7 +- src/Float32Data3D.cpp | 7 +- src/Float32Data3DMemory.cpp | 7 +- src/Float32ProjectionData2D.cpp | 7 +- src/Float32ProjectionData3D.cpp | 7 +- src/Float32ProjectionData3DMemory.cpp | 7 +- src/Float32VolumeData2D.cpp | 7 +- src/Float32VolumeData3D.cpp | 7 +- src/Float32VolumeData3DMemory.cpp | 7 +- src/ForwardProjectionAlgorithm.cpp | 7 +- src/Fourier.cpp | 7 +- src/GeometryUtil3D.cpp | 7 +- src/Globals.cpp | 7 +- src/Logging.cpp | 7 +- src/ParallelBeamBlobKernelProjector2D.cpp | 7 +- src/ParallelBeamLineKernelProjector2D.cpp | 7 +- src/ParallelBeamLinearKernelProjector2D.cpp | 7 +- src/ParallelBeamStripKernelProjector2D.cpp | 7 +- src/ParallelProjectionGeometry2D.cpp | 7 +- src/ParallelProjectionGeometry3D.cpp | 7 +- src/ParallelVecProjectionGeometry3D.cpp | 7 +- src/PlatformDepSystemCode.cpp | 7 +- src/PluginAlgorithm.cpp | 7 +- src/ProjectionGeometry2D.cpp | 7 +- src/ProjectionGeometry3D.cpp | 7 +- src/Projector2D.cpp | 7 +- src/Projector3D.cpp | 7 +- src/ReconstructionAlgorithm2D.cpp | 7 +- src/ReconstructionAlgorithm3D.cpp | 7 +- src/ReconstructionAlgorithmMultiSlice2D.cpp | 7 +- src/SartAlgorithm.cpp | 7 +- src/SirtAlgorithm.cpp | 7 +- src/SparseMatrix.cpp | 7 +- src/SparseMatrixProjectionGeometry2D.cpp | 7 +- src/SparseMatrixProjector2D.cpp | 7 +- src/Utilities.cpp | 7 +- src/Vector3D.cpp | 7 +- src/VolumeGeometry2D.cpp | 7 +- src/VolumeGeometry3D.cpp | 7 +- src/XMLDocument.cpp | 7 +- src/XMLNode.cpp | 7 +- src/swrap.cpp | 7 +- tests/main.cpp | 12 +- tests/test_AstraObjectManager.cpp | 12 +- tests/test_FanFlatProjectionGeometry2D.cpp | 11 +- tests/test_Float32Data2D.cpp | 11 +- tests/test_Float32ProjectionData2D.cpp | 11 +- tests/test_Float32VolumeData2D.cpp | 11 +- tests/test_Fourier.cpp | 11 +- tests/test_ParallelBeamLineKernelProjector2D.cpp | 12 +- tests/test_ParallelBeamLinearKernelProjector2D.cpp | 12 +- tests/test_ParallelProjectionGeometry2D.cpp | 11 +- tests/test_VolumeGeometry2D.cpp | 11 +- tests/test_XMLDocument.cpp | 11 +- tests/tests_vc08.vcproj | 699 --------------------- 353 files changed, 1083 insertions(+), 2066 deletions(-) delete mode 100644 tests/tests_vc08.vcproj (limited to 'matlab') diff --git a/NEWS.txt b/NEWS.txt index 1efed4e..1f9c54a 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -1,12 +1,12 @@ ----------------------------------------------------------------------- This file is part of the ASTRA Toolbox -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 http://visielab.uantwerpen.be/ and http://www.cwi.nl/ License: Open Source under GPLv3 Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/ ----------------------------------------------------------------------- 1.7.1beta (2015-12-23) diff --git a/README.md b/README.md index 43d92b4..2cf7081 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ The basic forward and backward projection operations are GPU-accelerated, and di ## Documentation / samples -See the MATLAB and Python code samples in samples/ and on http://sf.net/projects/astra-toolbox . +See the MATLAB and Python code samples in samples/ and on http://www.astra-toolbox.com/ . ## Installation instructions @@ -117,8 +117,8 @@ The ASTRA Toolbox is open source under the GPLv3 license. ## Contact email: astra@uantwerpen.be -website: http://sf.net/projects/astra-toolbox +website: http://www.astra-toolbox.com/ -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 http://visielab.uantwerpen.be/ and http://www.cwi.nl/ diff --git a/README.txt b/README.txt index 1aa69e3..c1ca3a5 100644 --- a/README.txt +++ b/README.txt @@ -1,12 +1,12 @@ ----------------------------------------------------------------------- This file is part of the ASTRA Toolbox -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 http://visielab.uantwerpen.be/ and http://www.cwi.nl/ License: Open Source under GPLv3 Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/ ----------------------------------------------------------------------- @@ -29,7 +29,7 @@ Documentation / samples: ------------------------- See the MATLAB and Python code samples in samples/ and on -http://sf.net/projects/astra-toolbox . +http://www.astra-toolbox.com/ . diff --git a/build/linux/configure.ac b/build/linux/configure.ac index 3a2a92b..2f992ad 100644 --- a/build/linux/configure.ac +++ b/build/linux/configure.ac @@ -1,9 +1,9 @@ dnl ----------------------------------------------------------------------- -dnl Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp -dnl 2014-2015, CWI, Amsterdam +dnl Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +dnl 2014-2016, CWI, Amsterdam dnl dnl Contact: astra@uantwerpen.be -dnl Website: http://sf.net/projects/astra-toolbox +dnl Website: http://www.astra-toolbox.com/ dnl dnl This file is part of the ASTRA Toolbox. dnl @@ -22,7 +22,6 @@ dnl You should have received a copy of the GNU General Public License dnl along with the ASTRA Toolbox. If not, see . dnl dnl ----------------------------------------------------------------------- -dnl $Id$ AC_INIT(astra, 1.7.1) AC_CONFIG_SRCDIR([Makefile.in]) diff --git a/cuda/2d/algo.cu b/cuda/2d/algo.cu index dc74e51..0e5209f 100644 --- a/cuda/2d/algo.cu +++ b/cuda/2d/algo.cu @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include diff --git a/cuda/2d/algo.h b/cuda/2d/algo.h index 99959c8..dc3bb05 100644 --- a/cuda/2d/algo.h +++ b/cuda/2d/algo.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _CUDA_ALGO_H diff --git a/cuda/2d/arith.cu b/cuda/2d/arith.cu index 110ed51..9805093 100644 --- a/cuda/2d/arith.cu +++ b/cuda/2d/arith.cu @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "util.h" diff --git a/cuda/2d/arith.h b/cuda/2d/arith.h index 2c648a1..5b1c270 100644 --- a/cuda/2d/arith.h +++ b/cuda/2d/arith.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _CUDA_ARITH_H diff --git a/cuda/2d/astra.cu b/cuda/2d/astra.cu index b56ddf9..2ff9230 100644 --- a/cuda/2d/astra.cu +++ b/cuda/2d/astra.cu @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include diff --git a/cuda/2d/astra.h b/cuda/2d/astra.h index 617883b..78d00e3 100644 --- a/cuda/2d/astra.h +++ b/cuda/2d/astra.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _CUDA_ASTRA_H diff --git a/cuda/2d/cgls.cu b/cuda/2d/cgls.cu index f402914..6962d81 100644 --- a/cuda/2d/cgls.cu +++ b/cuda/2d/cgls.cu @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include diff --git a/cuda/2d/cgls.h b/cuda/2d/cgls.h index c55dd42..804f943 100644 --- a/cuda/2d/cgls.h +++ b/cuda/2d/cgls.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _CUDA_CGLS_H diff --git a/cuda/2d/darthelper.cu b/cuda/2d/darthelper.cu index 1d10d49..744184e 100644 --- a/cuda/2d/darthelper.cu +++ b/cuda/2d/darthelper.cu @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "util.h" diff --git a/cuda/2d/darthelper.h b/cuda/2d/darthelper.h index acd14e3..a2f1f45 100644 --- a/cuda/2d/darthelper.h +++ b/cuda/2d/darthelper.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _CUDA_ARITH2_H diff --git a/cuda/2d/dims.h b/cuda/2d/dims.h index e870da5..afb997a 100644 --- a/cuda/2d/dims.h +++ b/cuda/2d/dims.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _CUDA_DIMS_H diff --git a/cuda/2d/em.cu b/cuda/2d/em.cu index 8593b08..11ed45b 100644 --- a/cuda/2d/em.cu +++ b/cuda/2d/em.cu @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include diff --git a/cuda/2d/em.h b/cuda/2d/em.h index 9b62fa5..f99e798 100644 --- a/cuda/2d/em.h +++ b/cuda/2d/em.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _CUDA_EM_H diff --git a/cuda/2d/fan_bp.cu b/cuda/2d/fan_bp.cu index b4321ba..2025528 100644 --- a/cuda/2d/fan_bp.cu +++ b/cuda/2d/fan_bp.cu @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include diff --git a/cuda/2d/fan_bp.h b/cuda/2d/fan_bp.h index 3ebe1e8..4e466fc 100644 --- a/cuda/2d/fan_bp.h +++ b/cuda/2d/fan_bp.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _CUDA_FAN_BP_H diff --git a/cuda/2d/fan_fp.cu b/cuda/2d/fan_fp.cu index 7c9d8cc..494e89b 100644 --- a/cuda/2d/fan_fp.cu +++ b/cuda/2d/fan_fp.cu @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include diff --git a/cuda/2d/fan_fp.h b/cuda/2d/fan_fp.h index 3962ee3..4bc07eb 100644 --- a/cuda/2d/fan_fp.h +++ b/cuda/2d/fan_fp.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _CUDA_FAN_FP_H diff --git a/cuda/2d/fbp_filters.h b/cuda/2d/fbp_filters.h index b206a5d..f1223c5 100644 --- a/cuda/2d/fbp_filters.h +++ b/cuda/2d/fbp_filters.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef FBP_FILTERS_H diff --git a/cuda/2d/fft.cu b/cuda/2d/fft.cu index 3dd1c22..654bbae 100644 --- a/cuda/2d/fft.cu +++ b/cuda/2d/fft.cu @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "fft.h" diff --git a/cuda/2d/fft.h b/cuda/2d/fft.h index e985fc6..91f05f2 100644 --- a/cuda/2d/fft.h +++ b/cuda/2d/fft.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef FFT_H diff --git a/cuda/2d/par_bp.cu b/cuda/2d/par_bp.cu index d9f7325..dfdd193 100644 --- a/cuda/2d/par_bp.cu +++ b/cuda/2d/par_bp.cu @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include diff --git a/cuda/2d/par_bp.h b/cuda/2d/par_bp.h index 64bcd34..0720030 100644 --- a/cuda/2d/par_bp.h +++ b/cuda/2d/par_bp.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _CUDA_PAR_BP_H diff --git a/cuda/2d/par_fp.cu b/cuda/2d/par_fp.cu index bb8b909..f58a643 100644 --- a/cuda/2d/par_fp.cu +++ b/cuda/2d/par_fp.cu @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include diff --git a/cuda/2d/par_fp.h b/cuda/2d/par_fp.h index 010d064..4830c1e 100644 --- a/cuda/2d/par_fp.h +++ b/cuda/2d/par_fp.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _CUDA_PAR_FP_H diff --git a/cuda/2d/sart.cu b/cuda/2d/sart.cu index c8608a3..f444b63 100644 --- a/cuda/2d/sart.cu +++ b/cuda/2d/sart.cu @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include diff --git a/cuda/2d/sart.h b/cuda/2d/sart.h index eff9ecf..ab99e66 100644 --- a/cuda/2d/sart.h +++ b/cuda/2d/sart.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _CUDA_SART_H diff --git a/cuda/2d/sirt.cu b/cuda/2d/sirt.cu index 4baaccb..0079717 100644 --- a/cuda/2d/sirt.cu +++ b/cuda/2d/sirt.cu @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include diff --git a/cuda/2d/sirt.h b/cuda/2d/sirt.h index bc913f4..488ab0a 100644 --- a/cuda/2d/sirt.h +++ b/cuda/2d/sirt.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _CUDA_SIRT_H diff --git a/cuda/2d/util.cu b/cuda/2d/util.cu index a4f8f3e..09d1a2b 100644 --- a/cuda/2d/util.cu +++ b/cuda/2d/util.cu @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include diff --git a/cuda/2d/util.h b/cuda/2d/util.h index ff438c3..875aae3 100644 --- a/cuda/2d/util.h +++ b/cuda/2d/util.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _CUDA_UTIL_H diff --git a/cuda/3d/algo3d.cu b/cuda/3d/algo3d.cu index e2c1e43..437c493 100644 --- a/cuda/3d/algo3d.cu +++ b/cuda/3d/algo3d.cu @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include diff --git a/cuda/3d/algo3d.h b/cuda/3d/algo3d.h index ce331ad..6ba8b6f 100644 --- a/cuda/3d/algo3d.h +++ b/cuda/3d/algo3d.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _CUDA_ALGO_H diff --git a/cuda/3d/arith3d.cu b/cuda/3d/arith3d.cu index 471b5cd..fd41812 100644 --- a/cuda/3d/arith3d.cu +++ b/cuda/3d/arith3d.cu @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "util3d.h" diff --git a/cuda/3d/arith3d.h b/cuda/3d/arith3d.h index 85d3d3b..c42603e 100644 --- a/cuda/3d/arith3d.h +++ b/cuda/3d/arith3d.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _CUDA_ARITH3D_H diff --git a/cuda/3d/astra3d.cu b/cuda/3d/astra3d.cu index 3bd56ea..8e0946e 100644 --- a/cuda/3d/astra3d.cu +++ b/cuda/3d/astra3d.cu @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include diff --git a/cuda/3d/astra3d.h b/cuda/3d/astra3d.h index 93bf576..5267899 100644 --- a/cuda/3d/astra3d.h +++ b/cuda/3d/astra3d.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _CUDA_ASTRA3D_H diff --git a/cuda/3d/cgls3d.cu b/cuda/3d/cgls3d.cu index 0b0331e..7200144 100644 --- a/cuda/3d/cgls3d.cu +++ b/cuda/3d/cgls3d.cu @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include diff --git a/cuda/3d/cgls3d.h b/cuda/3d/cgls3d.h index bfb4af8..e09fcfb 100644 --- a/cuda/3d/cgls3d.h +++ b/cuda/3d/cgls3d.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _CUDA_CGLS3D_H diff --git a/cuda/3d/cone_bp.cu b/cuda/3d/cone_bp.cu index 6bd9d16..c3405b8 100644 --- a/cuda/3d/cone_bp.cu +++ b/cuda/3d/cone_bp.cu @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include diff --git a/cuda/3d/cone_bp.h b/cuda/3d/cone_bp.h index a6e2c23..3952ab9 100644 --- a/cuda/3d/cone_bp.h +++ b/cuda/3d/cone_bp.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _CUDA_CONE_BP_H diff --git a/cuda/3d/cone_fp.cu b/cuda/3d/cone_fp.cu index fefcdc1..e6f01e9 100644 --- a/cuda/3d/cone_fp.cu +++ b/cuda/3d/cone_fp.cu @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include diff --git a/cuda/3d/cone_fp.h b/cuda/3d/cone_fp.h index 62c9caa..d46990b 100644 --- a/cuda/3d/cone_fp.h +++ b/cuda/3d/cone_fp.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _CUDA_CONE_FP_H diff --git a/cuda/3d/darthelper3d.cu b/cuda/3d/darthelper3d.cu index d9bd636..1457017 100644 --- a/cuda/3d/darthelper3d.cu +++ b/cuda/3d/darthelper3d.cu @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "util3d.h" diff --git a/cuda/3d/darthelper3d.h b/cuda/3d/darthelper3d.h index fdf43b9..71ea5b0 100644 --- a/cuda/3d/darthelper3d.h +++ b/cuda/3d/darthelper3d.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _CUDA_DARTHELPER3_H diff --git a/cuda/3d/dims3d.h b/cuda/3d/dims3d.h index eb7045f..24c334a 100644 --- a/cuda/3d/dims3d.h +++ b/cuda/3d/dims3d.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _CUDA_CONE_DIMS_H diff --git a/cuda/3d/fdk.cu b/cuda/3d/fdk.cu index bbac0be..bf41b62 100644 --- a/cuda/3d/fdk.cu +++ b/cuda/3d/fdk.cu @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include diff --git a/cuda/3d/fdk.h b/cuda/3d/fdk.h index fc0df20..0165af9 100644 --- a/cuda/3d/fdk.h +++ b/cuda/3d/fdk.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _CUDA_FDK_H diff --git a/cuda/3d/mem3d.cu b/cuda/3d/mem3d.cu index cb15ab9..eae9676 100644 --- a/cuda/3d/mem3d.cu +++ b/cuda/3d/mem3d.cu @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include diff --git a/cuda/3d/mem3d.h b/cuda/3d/mem3d.h index bb8b091..0e29774 100644 --- a/cuda/3d/mem3d.h +++ b/cuda/3d/mem3d.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. diff --git a/cuda/3d/par3d_bp.cu b/cuda/3d/par3d_bp.cu index 491ee2f..e43479a 100644 --- a/cuda/3d/par3d_bp.cu +++ b/cuda/3d/par3d_bp.cu @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include diff --git a/cuda/3d/par3d_bp.h b/cuda/3d/par3d_bp.h index 3efad19..4454395 100644 --- a/cuda/3d/par3d_bp.h +++ b/cuda/3d/par3d_bp.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _CUDA_PAR3D_BP_H diff --git a/cuda/3d/par3d_fp.cu b/cuda/3d/par3d_fp.cu index 6f9ce40..a99308f 100644 --- a/cuda/3d/par3d_fp.cu +++ b/cuda/3d/par3d_fp.cu @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include diff --git a/cuda/3d/par3d_fp.h b/cuda/3d/par3d_fp.h index 5f65cd9..c69ab51 100644 --- a/cuda/3d/par3d_fp.h +++ b/cuda/3d/par3d_fp.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _CUDA_PAR3D_FP_H diff --git a/cuda/3d/sirt3d.cu b/cuda/3d/sirt3d.cu index ba6a159..4d1ed81 100644 --- a/cuda/3d/sirt3d.cu +++ b/cuda/3d/sirt3d.cu @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include diff --git a/cuda/3d/sirt3d.h b/cuda/3d/sirt3d.h index 5e93deb..69031b8 100644 --- a/cuda/3d/sirt3d.h +++ b/cuda/3d/sirt3d.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _CUDA_SIRT3D_H diff --git a/cuda/3d/util3d.cu b/cuda/3d/util3d.cu index 537ed69..e7b8fbb 100644 --- a/cuda/3d/util3d.cu +++ b/cuda/3d/util3d.cu @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include diff --git a/cuda/3d/util3d.h b/cuda/3d/util3d.h index fa0a03f..7dca762 100644 --- a/cuda/3d/util3d.h +++ b/cuda/3d/util3d.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _CUDA_UTIL3D_H diff --git a/include/astra/Algorithm.h b/include/astra/Algorithm.h index 18c465f..2273a83 100644 --- a/include/astra/Algorithm.h +++ b/include/astra/Algorithm.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_ALGORITHM diff --git a/include/astra/AlgorithmTypelist.h b/include/astra/AlgorithmTypelist.h index 8886a07..7779eaa 100644 --- a/include/astra/AlgorithmTypelist.h +++ b/include/astra/AlgorithmTypelist.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_ALGORITHMTYPELIST diff --git a/include/astra/ArtAlgorithm.h b/include/astra/ArtAlgorithm.h index 1ad9f3f..697456a 100644 --- a/include/astra/ArtAlgorithm.h +++ b/include/astra/ArtAlgorithm.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_ARTALGORITHM diff --git a/include/astra/AstraObjectFactory.h b/include/astra/AstraObjectFactory.h index 6af9cd8..eb22862 100644 --- a/include/astra/AstraObjectFactory.h +++ b/include/astra/AstraObjectFactory.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_ASTRAOBJECTFACTORY diff --git a/include/astra/AstraObjectManager.h b/include/astra/AstraObjectManager.h index 9faecbe..97fde40 100644 --- a/include/astra/AstraObjectManager.h +++ b/include/astra/AstraObjectManager.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_ASTRAOBJECTMANAGER diff --git a/include/astra/AsyncAlgorithm.h b/include/astra/AsyncAlgorithm.h index a3157fc..d82ec69 100644 --- a/include/astra/AsyncAlgorithm.h +++ b/include/astra/AsyncAlgorithm.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_ASYNCALGORITHM diff --git a/include/astra/BackProjectionAlgorithm.h b/include/astra/BackProjectionAlgorithm.h index 6c55fd5..0d53567 100644 --- a/include/astra/BackProjectionAlgorithm.h +++ b/include/astra/BackProjectionAlgorithm.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_BACKPROJECTIONALGORITHM diff --git a/include/astra/CglsAlgorithm.h b/include/astra/CglsAlgorithm.h index 411f1f9..c7eac73 100644 --- a/include/astra/CglsAlgorithm.h +++ b/include/astra/CglsAlgorithm.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_CGLSALGORITHM diff --git a/include/astra/CompositeGeometryManager.h b/include/astra/CompositeGeometryManager.h index d30ffd1..c0acf4f 100644 --- a/include/astra/CompositeGeometryManager.h +++ b/include/astra/CompositeGeometryManager.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. diff --git a/include/astra/ConeProjectionGeometry3D.h b/include/astra/ConeProjectionGeometry3D.h index dede6e1..ee9d0f8 100644 --- a/include/astra/ConeProjectionGeometry3D.h +++ b/include/astra/ConeProjectionGeometry3D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_CONEPROJECTIONGEOMETRY3D diff --git a/include/astra/ConeVecProjectionGeometry3D.h b/include/astra/ConeVecProjectionGeometry3D.h index f76f9dd..f10ebac 100644 --- a/include/astra/ConeVecProjectionGeometry3D.h +++ b/include/astra/ConeVecProjectionGeometry3D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_CONEVECPROJECTIONGEOMETRY3D diff --git a/include/astra/Config.h b/include/astra/Config.h index c10a16e..fb12995 100644 --- a/include/astra/Config.h +++ b/include/astra/Config.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_CONFIG diff --git a/include/astra/CudaBackProjectionAlgorithm.h b/include/astra/CudaBackProjectionAlgorithm.h index 2450376..629cb56 100644 --- a/include/astra/CudaBackProjectionAlgorithm.h +++ b/include/astra/CudaBackProjectionAlgorithm.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_CUDABACKPROJECTIONALGORITHM diff --git a/include/astra/CudaBackProjectionAlgorithm3D.h b/include/astra/CudaBackProjectionAlgorithm3D.h index 74aeec8..6738988 100644 --- a/include/astra/CudaBackProjectionAlgorithm3D.h +++ b/include/astra/CudaBackProjectionAlgorithm3D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_CUDABACKPROJECTIONALGORITHM3D diff --git a/include/astra/CudaCglsAlgorithm.h b/include/astra/CudaCglsAlgorithm.h index 6aa0343..26babdf 100644 --- a/include/astra/CudaCglsAlgorithm.h +++ b/include/astra/CudaCglsAlgorithm.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_CUDACGLSALGORITHM diff --git a/include/astra/CudaCglsAlgorithm3D.h b/include/astra/CudaCglsAlgorithm3D.h index 3e4084b..650aa27 100644 --- a/include/astra/CudaCglsAlgorithm3D.h +++ b/include/astra/CudaCglsAlgorithm3D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_CUDACGLSALGORITHM3D diff --git a/include/astra/CudaDartMaskAlgorithm.h b/include/astra/CudaDartMaskAlgorithm.h index b3a5c99..2759add 100644 --- a/include/astra/CudaDartMaskAlgorithm.h +++ b/include/astra/CudaDartMaskAlgorithm.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_CUDADARTMASKALGORITHM diff --git a/include/astra/CudaDartMaskAlgorithm3D.h b/include/astra/CudaDartMaskAlgorithm3D.h index 6a71bf3..6dcd365 100644 --- a/include/astra/CudaDartMaskAlgorithm3D.h +++ b/include/astra/CudaDartMaskAlgorithm3D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_CUDADARTMASKALGORITHM3D diff --git a/include/astra/CudaDartSmoothingAlgorithm.h b/include/astra/CudaDartSmoothingAlgorithm.h index 1beac56..dec8b6e 100644 --- a/include/astra/CudaDartSmoothingAlgorithm.h +++ b/include/astra/CudaDartSmoothingAlgorithm.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_CUDADARTSMOOTHINGALGORITHM diff --git a/include/astra/CudaDartSmoothingAlgorithm3D.h b/include/astra/CudaDartSmoothingAlgorithm3D.h index ad69c5a..13bc7fc 100644 --- a/include/astra/CudaDartSmoothingAlgorithm3D.h +++ b/include/astra/CudaDartSmoothingAlgorithm3D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_CUDADARTSMOOTHINGALGORITHM3D diff --git a/include/astra/CudaDataOperationAlgorithm.h b/include/astra/CudaDataOperationAlgorithm.h index 31f0ff5..37391fb 100644 --- a/include/astra/CudaDataOperationAlgorithm.h +++ b/include/astra/CudaDataOperationAlgorithm.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_CUDADATAOPERATIONALGORITHM diff --git a/include/astra/CudaEMAlgorithm.h b/include/astra/CudaEMAlgorithm.h index a9d2711..16948bf 100644 --- a/include/astra/CudaEMAlgorithm.h +++ b/include/astra/CudaEMAlgorithm.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_CUDAEMALGORITHM diff --git a/include/astra/CudaFDKAlgorithm3D.h b/include/astra/CudaFDKAlgorithm3D.h index 477bf34..386129e 100644 --- a/include/astra/CudaFDKAlgorithm3D.h +++ b/include/astra/CudaFDKAlgorithm3D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_CUDAFDKALGORITHM3D diff --git a/include/astra/CudaFilteredBackProjectionAlgorithm.h b/include/astra/CudaFilteredBackProjectionAlgorithm.h index cf1f19f..0c66b19 100644 --- a/include/astra/CudaFilteredBackProjectionAlgorithm.h +++ b/include/astra/CudaFilteredBackProjectionAlgorithm.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef CUDAFILTEREDBACKPROJECTIONALGORITHM2_H diff --git a/include/astra/CudaForwardProjectionAlgorithm.h b/include/astra/CudaForwardProjectionAlgorithm.h index 449a610..01661b1 100644 --- a/include/astra/CudaForwardProjectionAlgorithm.h +++ b/include/astra/CudaForwardProjectionAlgorithm.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_CUDAFORWARDPROJECTIONALGORITHM2 diff --git a/include/astra/CudaForwardProjectionAlgorithm3D.h b/include/astra/CudaForwardProjectionAlgorithm3D.h index 4198d56..95af73a 100644 --- a/include/astra/CudaForwardProjectionAlgorithm3D.h +++ b/include/astra/CudaForwardProjectionAlgorithm3D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_CUDAFORWARDPROJECTIONALGORITHM3D diff --git a/include/astra/CudaProjector2D.h b/include/astra/CudaProjector2D.h index 2b4bacb..d43de33 100644 --- a/include/astra/CudaProjector2D.h +++ b/include/astra/CudaProjector2D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_CUDAPROJECTOR2D diff --git a/include/astra/CudaProjector3D.h b/include/astra/CudaProjector3D.h index da88d6d..4c27b78 100644 --- a/include/astra/CudaProjector3D.h +++ b/include/astra/CudaProjector3D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef INC_ASTRA_CUDAPROJECTOR3D diff --git a/include/astra/CudaReconstructionAlgorithm2D.h b/include/astra/CudaReconstructionAlgorithm2D.h index bb5f2a7..6852bb8 100644 --- a/include/astra/CudaReconstructionAlgorithm2D.h +++ b/include/astra/CudaReconstructionAlgorithm2D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_CUDARECONSTRUCTIONALGORITHM2D diff --git a/include/astra/CudaRoiSelectAlgorithm.h b/include/astra/CudaRoiSelectAlgorithm.h index 8d25fb8..1b3f17f 100644 --- a/include/astra/CudaRoiSelectAlgorithm.h +++ b/include/astra/CudaRoiSelectAlgorithm.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_CUDAROISELECTALGORITHM diff --git a/include/astra/CudaSartAlgorithm.h b/include/astra/CudaSartAlgorithm.h index e5e18f0..207fbb1 100644 --- a/include/astra/CudaSartAlgorithm.h +++ b/include/astra/CudaSartAlgorithm.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_CUDASARTALGORITHM diff --git a/include/astra/CudaSirtAlgorithm.h b/include/astra/CudaSirtAlgorithm.h index 3cd8acc..bad6262 100644 --- a/include/astra/CudaSirtAlgorithm.h +++ b/include/astra/CudaSirtAlgorithm.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_CUDASIRTALGORITHM2 diff --git a/include/astra/CudaSirtAlgorithm3D.h b/include/astra/CudaSirtAlgorithm3D.h index 60191cd..a0b8794 100644 --- a/include/astra/CudaSirtAlgorithm3D.h +++ b/include/astra/CudaSirtAlgorithm3D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_CUDASIRTALGORITHM3D diff --git a/include/astra/DataProjector.h b/include/astra/DataProjector.h index e486075..d321b54 100644 --- a/include/astra/DataProjector.h +++ b/include/astra/DataProjector.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_DATAPROJECTOR diff --git a/include/astra/DataProjectorPolicies.h b/include/astra/DataProjectorPolicies.h index acfb36f..c67bb1e 100644 --- a/include/astra/DataProjectorPolicies.h +++ b/include/astra/DataProjectorPolicies.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_DATAPROJECTORPOLICIES diff --git a/include/astra/DataProjectorPolicies.inl b/include/astra/DataProjectorPolicies.inl index f300761..6a4a2a6 100644 --- a/include/astra/DataProjectorPolicies.inl +++ b/include/astra/DataProjectorPolicies.inl @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_DATAPROJECTORPOLICIES_INLINE diff --git a/include/astra/FanFlatBeamLineKernelProjector2D.h b/include/astra/FanFlatBeamLineKernelProjector2D.h index f1a80ed..3b86a18 100644 --- a/include/astra/FanFlatBeamLineKernelProjector2D.h +++ b/include/astra/FanFlatBeamLineKernelProjector2D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_FANFLATBEAMLINEKERNELPROJECTOR diff --git a/include/astra/FanFlatBeamLineKernelProjector2D.inl b/include/astra/FanFlatBeamLineKernelProjector2D.inl index 2f87659..b95f030 100644 --- a/include/astra/FanFlatBeamLineKernelProjector2D.inl +++ b/include/astra/FanFlatBeamLineKernelProjector2D.inl @@ -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 . ----------------------------------------------------------------------- -$Id$ */ diff --git a/include/astra/FanFlatBeamStripKernelProjector2D.h b/include/astra/FanFlatBeamStripKernelProjector2D.h index 08e29e7..4a3db6e 100644 --- a/include/astra/FanFlatBeamStripKernelProjector2D.h +++ b/include/astra/FanFlatBeamStripKernelProjector2D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_FANFLATBEAMSTRIPKERNELPROJECTOR diff --git a/include/astra/FanFlatBeamStripKernelProjector2D.inl b/include/astra/FanFlatBeamStripKernelProjector2D.inl index 38cf003..eaf50e6 100644 --- a/include/astra/FanFlatBeamStripKernelProjector2D.inl +++ b/include/astra/FanFlatBeamStripKernelProjector2D.inl @@ -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 . ----------------------------------------------------------------------- -$Id$ */ diff --git a/include/astra/FanFlatProjectionGeometry2D.h b/include/astra/FanFlatProjectionGeometry2D.h index 180fe68..e9a0535 100644 --- a/include/astra/FanFlatProjectionGeometry2D.h +++ b/include/astra/FanFlatProjectionGeometry2D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_FANFLATPROJECTIONGEOMETRY2D diff --git a/include/astra/FanFlatVecProjectionGeometry2D.h b/include/astra/FanFlatVecProjectionGeometry2D.h index d93de79..7130f24 100644 --- a/include/astra/FanFlatVecProjectionGeometry2D.h +++ b/include/astra/FanFlatVecProjectionGeometry2D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_FANFLATVECPROJECTIONGEOMETRY2D diff --git a/include/astra/FilteredBackProjectionAlgorithm.h b/include/astra/FilteredBackProjectionAlgorithm.h index 0ae0f25..020c341 100644 --- a/include/astra/FilteredBackProjectionAlgorithm.h +++ b/include/astra/FilteredBackProjectionAlgorithm.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_FILTEREDBACKPROJECTION diff --git a/include/astra/Float32Data.h b/include/astra/Float32Data.h index 6d36ff8..7925c8c 100644 --- a/include/astra/Float32Data.h +++ b/include/astra/Float32Data.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_FLOAT32DATA diff --git a/include/astra/Float32Data2D.h b/include/astra/Float32Data2D.h index 57cb82b..b33bcd0 100644 --- a/include/astra/Float32Data2D.h +++ b/include/astra/Float32Data2D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_FLOAT32DATA2D diff --git a/include/astra/Float32Data3D.h b/include/astra/Float32Data3D.h index a5add3a..1cd9c20 100644 --- a/include/astra/Float32Data3D.h +++ b/include/astra/Float32Data3D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_FLOAT32DATA3D diff --git a/include/astra/Float32Data3DMemory.h b/include/astra/Float32Data3DMemory.h index ab2c82e..d885101 100644 --- a/include/astra/Float32Data3DMemory.h +++ b/include/astra/Float32Data3DMemory.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_FLOAT32DATA3DMEMORY diff --git a/include/astra/Float32ProjectionData2D.h b/include/astra/Float32ProjectionData2D.h index bb99f4b..4cfca03 100644 --- a/include/astra/Float32ProjectionData2D.h +++ b/include/astra/Float32ProjectionData2D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_FLOAT32PROJECTIONDATA2D diff --git a/include/astra/Float32ProjectionData3D.h b/include/astra/Float32ProjectionData3D.h index 329c9a4..ae0664b 100644 --- a/include/astra/Float32ProjectionData3D.h +++ b/include/astra/Float32ProjectionData3D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_FLOAT32PROJECTIONDATA3D diff --git a/include/astra/Float32ProjectionData3DMemory.h b/include/astra/Float32ProjectionData3DMemory.h index f7882b7..14bae36 100644 --- a/include/astra/Float32ProjectionData3DMemory.h +++ b/include/astra/Float32ProjectionData3DMemory.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_FLOAT32PROJECTIONDATA3DMEMORY diff --git a/include/astra/Float32VolumeData2D.h b/include/astra/Float32VolumeData2D.h index abecebf..bae9a52 100644 --- a/include/astra/Float32VolumeData2D.h +++ b/include/astra/Float32VolumeData2D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_FLOAT32VOLUMEDATA2D diff --git a/include/astra/Float32VolumeData3D.h b/include/astra/Float32VolumeData3D.h index 07df78f..7a32efe 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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_FLOAT32VOLUMEDATA3D diff --git a/include/astra/Float32VolumeData3DMemory.h b/include/astra/Float32VolumeData3DMemory.h index 619d83b..870c6e2 100644 --- a/include/astra/Float32VolumeData3DMemory.h +++ b/include/astra/Float32VolumeData3DMemory.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_FLOAT32VOLUMEDATA3DMEMORY diff --git a/include/astra/ForwardProjectionAlgorithm.h b/include/astra/ForwardProjectionAlgorithm.h index 4188010..cd7a879 100644 --- a/include/astra/ForwardProjectionAlgorithm.h +++ b/include/astra/ForwardProjectionAlgorithm.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_FORWARDPROJECTIONALGORITHM diff --git a/include/astra/Fourier.h b/include/astra/Fourier.h index 68f9f38..4111c99 100644 --- a/include/astra/Fourier.h +++ b/include/astra/Fourier.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_FOURIER diff --git a/include/astra/GeometryUtil2D.h b/include/astra/GeometryUtil2D.h index d4ee92e..6434d3c 100644 --- a/include/astra/GeometryUtil2D.h +++ b/include/astra/GeometryUtil2D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_GEOMETRYUTIL2D diff --git a/include/astra/GeometryUtil3D.h b/include/astra/GeometryUtil3D.h index e051240..0a75fab 100644 --- a/include/astra/GeometryUtil3D.h +++ b/include/astra/GeometryUtil3D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_GEOMETRYUTIL3D diff --git a/include/astra/Globals.h b/include/astra/Globals.h index 5dbac83..3cb466c 100644 --- a/include/astra/Globals.h +++ b/include/astra/Globals.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_GLOBALS diff --git a/include/astra/Logging.h b/include/astra/Logging.h index 8e19ea4..78343a1 100644 --- a/include/astra/Logging.h +++ b/include/astra/Logging.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_LOGGING diff --git a/include/astra/ParallelBeamBlobKernelProjector2D.h b/include/astra/ParallelBeamBlobKernelProjector2D.h index ecf71ef..529cc10 100644 --- a/include/astra/ParallelBeamBlobKernelProjector2D.h +++ b/include/astra/ParallelBeamBlobKernelProjector2D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_PARALLELBEAMBLOBPROJECTOR diff --git a/include/astra/ParallelBeamBlobKernelProjector2D.inl b/include/astra/ParallelBeamBlobKernelProjector2D.inl index 467e066..c5040b7 100644 --- a/include/astra/ParallelBeamBlobKernelProjector2D.inl +++ b/include/astra/ParallelBeamBlobKernelProjector2D.inl @@ -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 . ----------------------------------------------------------------------- -$Id$ */ diff --git a/include/astra/ParallelBeamLineKernelProjector2D.h b/include/astra/ParallelBeamLineKernelProjector2D.h index 24f43d5..0f25d83 100644 --- a/include/astra/ParallelBeamLineKernelProjector2D.h +++ b/include/astra/ParallelBeamLineKernelProjector2D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_PARALLELBEAMLINEKERNELPROJECTOR diff --git a/include/astra/ParallelBeamLineKernelProjector2D.inl b/include/astra/ParallelBeamLineKernelProjector2D.inl index c11f243..dcd11bd 100644 --- a/include/astra/ParallelBeamLineKernelProjector2D.inl +++ b/include/astra/ParallelBeamLineKernelProjector2D.inl @@ -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 . ----------------------------------------------------------------------- -$Id$ */ template diff --git a/include/astra/ParallelBeamLinearKernelProjector2D.h b/include/astra/ParallelBeamLinearKernelProjector2D.h index 855093a..7b40628 100644 --- a/include/astra/ParallelBeamLinearKernelProjector2D.h +++ b/include/astra/ParallelBeamLinearKernelProjector2D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_PARALLELLINEARKERNELPROJECTOR diff --git a/include/astra/ParallelBeamLinearKernelProjector2D.inl b/include/astra/ParallelBeamLinearKernelProjector2D.inl index 67e0d58..30040fa 100644 --- a/include/astra/ParallelBeamLinearKernelProjector2D.inl +++ b/include/astra/ParallelBeamLinearKernelProjector2D.inl @@ -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 . ----------------------------------------------------------------------- -$Id$ */ diff --git a/include/astra/ParallelBeamStripKernelProjector2D.h b/include/astra/ParallelBeamStripKernelProjector2D.h index 624bd3c..373c7fa 100644 --- a/include/astra/ParallelBeamStripKernelProjector2D.h +++ b/include/astra/ParallelBeamStripKernelProjector2D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_PARALLELBEAMSTROKEKERNELPROJECTOR diff --git a/include/astra/ParallelBeamStripKernelProjector2D.inl b/include/astra/ParallelBeamStripKernelProjector2D.inl index 7d73888..e8e3739 100644 --- a/include/astra/ParallelBeamStripKernelProjector2D.inl +++ b/include/astra/ParallelBeamStripKernelProjector2D.inl @@ -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 . ----------------------------------------------------------------------- -$Id$ */ template diff --git a/include/astra/ParallelProjectionGeometry2D.h b/include/astra/ParallelProjectionGeometry2D.h index 2f7d36f..963bb06 100644 --- a/include/astra/ParallelProjectionGeometry2D.h +++ b/include/astra/ParallelProjectionGeometry2D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_PARALLELPROJECTIONGEOMETRY2D diff --git a/include/astra/ParallelProjectionGeometry3D.h b/include/astra/ParallelProjectionGeometry3D.h index d95c050..aa86836 100644 --- a/include/astra/ParallelProjectionGeometry3D.h +++ b/include/astra/ParallelProjectionGeometry3D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_PARALLELPROJECTIONGEOMETRY3D diff --git a/include/astra/ParallelVecProjectionGeometry3D.h b/include/astra/ParallelVecProjectionGeometry3D.h index ec91086..3d5ce23 100644 --- a/include/astra/ParallelVecProjectionGeometry3D.h +++ b/include/astra/ParallelVecProjectionGeometry3D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_PARALLELVECPROJECTIONGEOMETRY3D diff --git a/include/astra/PlatformDepSystemCode.h b/include/astra/PlatformDepSystemCode.h index 580c393..4a37568 100644 --- a/include/astra/PlatformDepSystemCode.h +++ b/include/astra/PlatformDepSystemCode.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef PLATFORMDEPSYSTEMCODE_H diff --git a/include/astra/PluginAlgorithm.h b/include/astra/PluginAlgorithm.h index cbd80fc..c114921 100644 --- a/include/astra/PluginAlgorithm.h +++ b/include/astra/PluginAlgorithm.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_PLUGINALGORITHM diff --git a/include/astra/ProjectionGeometry2D.h b/include/astra/ProjectionGeometry2D.h index b8324e2..393db77 100644 --- a/include/astra/ProjectionGeometry2D.h +++ b/include/astra/ProjectionGeometry2D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_PROJECTIONGEOMETRY2D diff --git a/include/astra/ProjectionGeometry3D.h b/include/astra/ProjectionGeometry3D.h index 0b60287..545abd1 100644 --- a/include/astra/ProjectionGeometry3D.h +++ b/include/astra/ProjectionGeometry3D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_PROJECTIONGEOMETRY3D diff --git a/include/astra/Projector2D.h b/include/astra/Projector2D.h index c7a899d..8a5182a 100644 --- a/include/astra/Projector2D.h +++ b/include/astra/Projector2D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef INC_ASTRA_PROJECTOR2D diff --git a/include/astra/Projector2DImpl.inl b/include/astra/Projector2DImpl.inl index 75b12d0..ffebb55 100644 --- a/include/astra/Projector2DImpl.inl +++ b/include/astra/Projector2DImpl.inl @@ -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 . ----------------------------------------------------------------------- -$Id$ */ diff --git a/include/astra/Projector3D.h b/include/astra/Projector3D.h index 88ca2be..ef9ca63 100644 --- a/include/astra/Projector3D.h +++ b/include/astra/Projector3D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef INC_ASTRA_PROJECTOR3D diff --git a/include/astra/ProjectorTypelist.h b/include/astra/ProjectorTypelist.h index 4ab7e98..2c6eaa2 100644 --- a/include/astra/ProjectorTypelist.h +++ b/include/astra/ProjectorTypelist.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_PROJECTORTYPELIST diff --git a/include/astra/ReconstructionAlgorithm2D.h b/include/astra/ReconstructionAlgorithm2D.h index ac87c4f..6ee7234 100644 --- a/include/astra/ReconstructionAlgorithm2D.h +++ b/include/astra/ReconstructionAlgorithm2D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_RECONSTRUCTIONALGORITHM2D diff --git a/include/astra/ReconstructionAlgorithm3D.h b/include/astra/ReconstructionAlgorithm3D.h index 42b2ab4..010443f 100644 --- a/include/astra/ReconstructionAlgorithm3D.h +++ b/include/astra/ReconstructionAlgorithm3D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_RECONSTRUCTIONALGORITHM3D diff --git a/include/astra/SartAlgorithm.h b/include/astra/SartAlgorithm.h index cdae029..5f39c3a 100644 --- a/include/astra/SartAlgorithm.h +++ b/include/astra/SartAlgorithm.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_SARTALGORITHM diff --git a/include/astra/Singleton.h b/include/astra/Singleton.h index 7271691..b823c0f 100644 --- a/include/astra/Singleton.h +++ b/include/astra/Singleton.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_SINGLETON diff --git a/include/astra/SirtAlgorithm.h b/include/astra/SirtAlgorithm.h index 8044d09..70bc3cf 100644 --- a/include/astra/SirtAlgorithm.h +++ b/include/astra/SirtAlgorithm.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_SIRTALGORITHM diff --git a/include/astra/SparseMatrix.h b/include/astra/SparseMatrix.h index 585981c..1eb329f 100644 --- a/include/astra/SparseMatrix.h +++ b/include/astra/SparseMatrix.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_SPARSEMATRIX diff --git a/include/astra/SparseMatrixProjectionGeometry2D.h b/include/astra/SparseMatrixProjectionGeometry2D.h index d56f95e..26a43ca 100644 --- a/include/astra/SparseMatrixProjectionGeometry2D.h +++ b/include/astra/SparseMatrixProjectionGeometry2D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_SPARSEMATRIXPROJECTIONGEOMETRY2D diff --git a/include/astra/SparseMatrixProjector2D.h b/include/astra/SparseMatrixProjector2D.h index 839fd2a..d871212 100644 --- a/include/astra/SparseMatrixProjector2D.h +++ b/include/astra/SparseMatrixProjector2D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_SPARSEMATRIXPROJECTOR2D diff --git a/include/astra/SparseMatrixProjector2D.inl b/include/astra/SparseMatrixProjector2D.inl index 8246e42..af5aa15 100644 --- a/include/astra/SparseMatrixProjector2D.inl +++ b/include/astra/SparseMatrixProjector2D.inl @@ -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 . ----------------------------------------------------------------------- -$Id$ */ diff --git a/include/astra/TypeList.h b/include/astra/TypeList.h index 442bb25..7460969 100644 --- a/include/astra/TypeList.h +++ b/include/astra/TypeList.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_TYPELIST diff --git a/include/astra/Utilities.h b/include/astra/Utilities.h index 22adfe2..097fb11 100644 --- a/include/astra/Utilities.h +++ b/include/astra/Utilities.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_UTILIES diff --git a/include/astra/Vector3D.h b/include/astra/Vector3D.h index 2dfc31d..8e7bebf 100644 --- a/include/astra/Vector3D.h +++ b/include/astra/Vector3D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_VECTOR3D diff --git a/include/astra/VolumeGeometry2D.h b/include/astra/VolumeGeometry2D.h index 28703d5..2b0a5ac 100644 --- a/include/astra/VolumeGeometry2D.h +++ b/include/astra/VolumeGeometry2D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_VOLUMEGEOMETRY2D diff --git a/include/astra/VolumeGeometry3D.h b/include/astra/VolumeGeometry3D.h index ff94844..ff7fa88 100644 --- a/include/astra/VolumeGeometry3D.h +++ b/include/astra/VolumeGeometry3D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_VOLUMEGEOMETRY3D diff --git a/include/astra/XMLDocument.h b/include/astra/XMLDocument.h index eddd908..e25d398 100644 --- a/include/astra/XMLDocument.h +++ b/include/astra/XMLDocument.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_XMLDOCUMENT diff --git a/include/astra/XMLNode.h b/include/astra/XMLNode.h index 7d1edf5..5e1908a 100644 --- a/include/astra/XMLNode.h +++ b/include/astra/XMLNode.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_XMLNODE diff --git a/include/astra/swrap.h b/include/astra/swrap.h index 612d1b6..cd479f3 100644 --- a/include/astra/swrap.h +++ b/include/astra/swrap.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_SWRAP_H diff --git a/matlab/algorithms/DART/DARTalgorithm.m b/matlab/algorithms/DART/DARTalgorithm.m index fc707dd..34beeee 100644 --- a/matlab/algorithms/DART/DARTalgorithm.m +++ b/matlab/algorithms/DART/DARTalgorithm.m @@ -1,11 +1,11 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +% 2014-2016, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- classdef DARTalgorithm < matlab.mixin.Copyable diff --git a/matlab/algorithms/DART/IterativeTomography.m b/matlab/algorithms/DART/IterativeTomography.m index 3875e6b..e94dd36 100644 --- a/matlab/algorithms/DART/IterativeTomography.m +++ b/matlab/algorithms/DART/IterativeTomography.m @@ -1,3 +1,13 @@ +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +% 2014-2016, CWI, Amsterdam +% License: Open Source under GPLv3 +% Contact: astra@uantwerpen.be +% Website: http://www.astra-toolbox.com/ +%-------------------------------------------------------------------------- + classdef IterativeTomography < matlab.mixin.Copyable % Algorithm class for 2D Iterative Tomography. diff --git a/matlab/algorithms/DART/IterativeTomography3D.m b/matlab/algorithms/DART/IterativeTomography3D.m index 29b963f..4a0b33a 100644 --- a/matlab/algorithms/DART/IterativeTomography3D.m +++ b/matlab/algorithms/DART/IterativeTomography3D.m @@ -1,3 +1,13 @@ +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +% 2014-2016, CWI, Amsterdam +% License: Open Source under GPLv3 +% Contact: astra@uantwerpen.be +% Website: http://www.astra-toolbox.com/ +%-------------------------------------------------------------------------- + classdef IterativeTomography3D < matlab.mixin.Copyable % Algorithm class for 3D Iterative Tomography. diff --git a/matlab/algorithms/DART/Kernels.m b/matlab/algorithms/DART/Kernels.m index 558f611..02200f7 100644 --- a/matlab/algorithms/DART/Kernels.m +++ b/matlab/algorithms/DART/Kernels.m @@ -1,11 +1,11 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +% 2014-2016, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- classdef Kernels diff --git a/matlab/algorithms/DART/MaskingDefault.m b/matlab/algorithms/DART/MaskingDefault.m index f91a6f5..cca143e 100644 --- a/matlab/algorithms/DART/MaskingDefault.m +++ b/matlab/algorithms/DART/MaskingDefault.m @@ -1,11 +1,11 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +% 2014-2016, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- classdef MaskingDefault < matlab.mixin.Copyable diff --git a/matlab/algorithms/DART/MaskingGPU.m b/matlab/algorithms/DART/MaskingGPU.m index 7d31aa8..32859a2 100644 --- a/matlab/algorithms/DART/MaskingGPU.m +++ b/matlab/algorithms/DART/MaskingGPU.m @@ -1,11 +1,11 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +% 2014-2016, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- classdef MaskingGPU < matlab.mixin.Copyable diff --git a/matlab/algorithms/DART/OutputDefault.m b/matlab/algorithms/DART/OutputDefault.m index 33e908b..cb9979c 100644 --- a/matlab/algorithms/DART/OutputDefault.m +++ b/matlab/algorithms/DART/OutputDefault.m @@ -1,11 +1,11 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +% 2014-2016, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- classdef OutputDefault < matlab.mixin.Copyable diff --git a/matlab/algorithms/DART/SegmentationDefault.m b/matlab/algorithms/DART/SegmentationDefault.m index 98265c0..4c808d3 100644 --- a/matlab/algorithms/DART/SegmentationDefault.m +++ b/matlab/algorithms/DART/SegmentationDefault.m @@ -1,11 +1,11 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +% 2014-2016, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- classdef SegmentationDefault < matlab.mixin.Copyable diff --git a/matlab/algorithms/DART/SmoothingDefault.m b/matlab/algorithms/DART/SmoothingDefault.m index 1974fa1..9d1ea9e 100644 --- a/matlab/algorithms/DART/SmoothingDefault.m +++ b/matlab/algorithms/DART/SmoothingDefault.m @@ -1,11 +1,11 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +% 2014-2016, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- classdef SmoothingDefault < matlab.mixin.Copyable diff --git a/matlab/algorithms/DART/SmoothingGPU.m b/matlab/algorithms/DART/SmoothingGPU.m index 1249e19..7041f19 100644 --- a/matlab/algorithms/DART/SmoothingGPU.m +++ b/matlab/algorithms/DART/SmoothingGPU.m @@ -1,11 +1,11 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +% 2014-2016, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- classdef SmoothingGPU < matlab.mixin.Copyable diff --git a/matlab/algorithms/DART/StatisticsDefault.m b/matlab/algorithms/DART/StatisticsDefault.m index 9d33256..02e877b 100644 --- a/matlab/algorithms/DART/StatisticsDefault.m +++ b/matlab/algorithms/DART/StatisticsDefault.m @@ -1,11 +1,11 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +% 2014-2016, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- classdef StatisticsDefault < matlab.mixin.Copyable diff --git a/matlab/algorithms/DART/examples/example1.m b/matlab/algorithms/DART/examples/example1.m index cb02e0f..6c86473 100644 --- a/matlab/algorithms/DART/examples/example1.m +++ b/matlab/algorithms/DART/examples/example1.m @@ -1,11 +1,11 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +% 2014-2016, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- addpath('../'); diff --git a/matlab/algorithms/DART/examples/example2.m b/matlab/algorithms/DART/examples/example2.m index 89660a5..85774e5 100644 --- a/matlab/algorithms/DART/examples/example2.m +++ b/matlab/algorithms/DART/examples/example2.m @@ -1,11 +1,11 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +% 2014-2016, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- addpath('../'); diff --git a/matlab/algorithms/DART/examples/example3.m b/matlab/algorithms/DART/examples/example3.m index cc80b0f..647ad2d 100644 --- a/matlab/algorithms/DART/examples/example3.m +++ b/matlab/algorithms/DART/examples/example3.m @@ -1,11 +1,11 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +% 2014-2016, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- addpath('../'); diff --git a/matlab/algorithms/DART/tools/DARToptimizer.m b/matlab/algorithms/DART/tools/DARToptimizer.m index 7aeabbe..424ff22 100644 --- a/matlab/algorithms/DART/tools/DARToptimizer.m +++ b/matlab/algorithms/DART/tools/DARToptimizer.m @@ -1,11 +1,11 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +% 2014-2016, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- classdef DARToptimizer < handle diff --git a/matlab/algorithms/DART/tools/DARToptimizerBoneStudy.m b/matlab/algorithms/DART/tools/DARToptimizerBoneStudy.m index 5bcf6e9..c641f87 100644 --- a/matlab/algorithms/DART/tools/DARToptimizerBoneStudy.m +++ b/matlab/algorithms/DART/tools/DARToptimizerBoneStudy.m @@ -1,11 +1,11 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +% 2014-2016, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- classdef DARToptimizerBoneStudy < handle diff --git a/matlab/algorithms/DART/tools/ProjDiffOptimFunc.m b/matlab/algorithms/DART/tools/ProjDiffOptimFunc.m index 64f3091..72b328f 100644 --- a/matlab/algorithms/DART/tools/ProjDiffOptimFunc.m +++ b/matlab/algorithms/DART/tools/ProjDiffOptimFunc.m @@ -1,11 +1,11 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +% 2014-2016, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- classdef ProjDiffOptimFunc < handle diff --git a/matlab/algorithms/DART/tools/dart_create_base_phantom.m b/matlab/algorithms/DART/tools/dart_create_base_phantom.m index 4c7061e..acd4048 100644 --- a/matlab/algorithms/DART/tools/dart_create_base_phantom.m +++ b/matlab/algorithms/DART/tools/dart_create_base_phantom.m @@ -1,11 +1,11 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +% 2014-2016, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- function base = dart_create_base_phantom(Im, angle_count, angle_range, gpu_core) diff --git a/matlab/algorithms/DART/tools/dart_scheduler.m b/matlab/algorithms/DART/tools/dart_scheduler.m index 007fcaa..4749fb1 100644 --- a/matlab/algorithms/DART/tools/dart_scheduler.m +++ b/matlab/algorithms/DART/tools/dart_scheduler.m @@ -1,11 +1,11 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +% 2014-2016, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- function dart_scheduler(D_tmpl, iterations, settings) diff --git a/matlab/algorithms/DART/tools/rNMPOptimFunc.m b/matlab/algorithms/DART/tools/rNMPOptimFunc.m index 7649d7f..5eb92bf 100644 --- a/matlab/algorithms/DART/tools/rNMPOptimFunc.m +++ b/matlab/algorithms/DART/tools/rNMPOptimFunc.m @@ -1,11 +1,11 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +% 2014-2016, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- classdef rNMPOptimFunc < handle diff --git a/matlab/mex/astra_mex_algorithm_c.cpp b/matlab/mex/astra_mex_algorithm_c.cpp index ec7aa72..a9cd14b 100644 --- a/matlab/mex/astra_mex_algorithm_c.cpp +++ b/matlab/mex/astra_mex_algorithm_c.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ /** \file astra_mex_algorithm_c.cpp diff --git a/matlab/mex/astra_mex_c.cpp b/matlab/mex/astra_mex_c.cpp index f499528..d9ff8f3 100644 --- a/matlab/mex/astra_mex_c.cpp +++ b/matlab/mex/astra_mex_c.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ /** \file astra_mex_c.cpp diff --git a/matlab/mex/astra_mex_data2d_c.cpp b/matlab/mex/astra_mex_data2d_c.cpp index 935e476..ee558e0 100644 --- a/matlab/mex/astra_mex_data2d_c.cpp +++ b/matlab/mex/astra_mex_data2d_c.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ /** \file astra_mex_data2d_c.cpp diff --git a/matlab/mex/astra_mex_data3d_c.cpp b/matlab/mex/astra_mex_data3d_c.cpp index fe4ce37..7909a79 100644 --- a/matlab/mex/astra_mex_data3d_c.cpp +++ b/matlab/mex/astra_mex_data3d_c.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ /** \file astra_mex_data3d_c.cpp diff --git a/matlab/mex/astra_mex_direct_c.cpp b/matlab/mex/astra_mex_direct_c.cpp index 38b3f59..d92a10c 100644 --- a/matlab/mex/astra_mex_direct_c.cpp +++ b/matlab/mex/astra_mex_direct_c.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ /** \file astra_mex_direct_c.cpp diff --git a/matlab/mex/astra_mex_log_c.cpp b/matlab/mex/astra_mex_log_c.cpp index 905612c..18dc1d4 100644 --- a/matlab/mex/astra_mex_log_c.cpp +++ b/matlab/mex/astra_mex_log_c.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ /** \file astra_mex_log_c.cpp diff --git a/matlab/mex/astra_mex_matrix_c.cpp b/matlab/mex/astra_mex_matrix_c.cpp index e07ddb6..99a7d0e 100644 --- a/matlab/mex/astra_mex_matrix_c.cpp +++ b/matlab/mex/astra_mex_matrix_c.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ /** \file astra_mex_matrix_c.cpp diff --git a/matlab/mex/astra_mex_plugin_c.cpp b/matlab/mex/astra_mex_plugin_c.cpp index 4ed534e..570e495 100644 --- a/matlab/mex/astra_mex_plugin_c.cpp +++ b/matlab/mex/astra_mex_plugin_c.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ /** \file astra_mex_plugin_c.cpp diff --git a/matlab/mex/astra_mex_projector3d_c.cpp b/matlab/mex/astra_mex_projector3d_c.cpp index e25802c..3135939 100644 --- a/matlab/mex/astra_mex_projector3d_c.cpp +++ b/matlab/mex/astra_mex_projector3d_c.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ /** \file astra_mex_projector3d_c.cpp diff --git a/matlab/mex/astra_mex_projector_c.cpp b/matlab/mex/astra_mex_projector_c.cpp index bf701af..36a5704 100644 --- a/matlab/mex/astra_mex_projector_c.cpp +++ b/matlab/mex/astra_mex_projector_c.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ /** \file astra_mex_projector_c.cpp diff --git a/matlab/mex/mexCopyDataHelpFunctions.cpp b/matlab/mex/mexCopyDataHelpFunctions.cpp index 4db6abd..a172a03 100644 --- a/matlab/mex/mexCopyDataHelpFunctions.cpp +++ b/matlab/mex/mexCopyDataHelpFunctions.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "mexCopyDataHelpFunctions.h" diff --git a/matlab/mex/mexCopyDataHelpFunctions.h b/matlab/mex/mexCopyDataHelpFunctions.h index 0853879..3ba4cb2 100644 --- a/matlab/mex/mexCopyDataHelpFunctions.h +++ b/matlab/mex/mexCopyDataHelpFunctions.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef MEXCOPYDATAHELPFUNCTIONS_H_ diff --git a/matlab/mex/mexDataManagerHelpFunctions.cpp b/matlab/mex/mexDataManagerHelpFunctions.cpp index a514565..ebf6f8f 100644 --- a/matlab/mex/mexDataManagerHelpFunctions.cpp +++ b/matlab/mex/mexDataManagerHelpFunctions.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "mexDataManagerHelpFunctions.h" diff --git a/matlab/mex/mexDataManagerHelpFunctions.h b/matlab/mex/mexDataManagerHelpFunctions.h index 0614e05..fff83a0 100644 --- a/matlab/mex/mexDataManagerHelpFunctions.h +++ b/matlab/mex/mexDataManagerHelpFunctions.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef MEXDATAMANAGERHELPFUNCTIONS_H_ diff --git a/matlab/mex/mexHelpFunctions.cpp b/matlab/mex/mexHelpFunctions.cpp index d957aea..8d8f484 100644 --- a/matlab/mex/mexHelpFunctions.cpp +++ b/matlab/mex/mexHelpFunctions.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ /** \file mexHelpFunctions.cpp diff --git a/matlab/mex/mexHelpFunctions.h b/matlab/mex/mexHelpFunctions.h index 07edc64..9b564c5 100644 --- a/matlab/mex/mexHelpFunctions.h +++ b/matlab/mex/mexHelpFunctions.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_MEX_HELPFUNCTIONS diff --git a/matlab/mex/mexInitFunctions.h b/matlab/mex/mexInitFunctions.h index f16e9c9..0415fb1 100644 --- a/matlab/mex/mexInitFunctions.h +++ b/matlab/mex/mexInitFunctions.h @@ -3,4 +3,4 @@ void initASTRAMex(); -#endif \ No newline at end of file +#endif diff --git a/matlab/mex/octave_support.cpp b/matlab/mex/octave_support.cpp index ed04bf0..79556ee 100644 --- a/matlab/mex/octave_support.cpp +++ b/matlab/mex/octave_support.cpp @@ -4,7 +4,7 @@ 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. diff --git a/matlab/tools/ROIselectfull.m b/matlab/tools/ROIselectfull.m index a50c979..cc1eaa0 100644 --- a/matlab/tools/ROIselectfull.m +++ b/matlab/tools/ROIselectfull.m @@ -15,4 +15,4 @@ end function A = Afstand(x1,y1,x2,y2) A = sqrt((x1-x2).^2+(y1-y2).^2); -end \ No newline at end of file +end diff --git a/matlab/tools/astra_add_noise_to_sino.m b/matlab/tools/astra_add_noise_to_sino.m index 6ad9b50..c938507 100644 --- a/matlab/tools/astra_add_noise_to_sino.m +++ b/matlab/tools/astra_add_noise_to_sino.m @@ -15,13 +15,12 @@ function sinogram_out = astra_add_noise_to_sino(sinogram_in,I0) %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- -% $Id$ if numel(sinogram_in) == 1 sinogramRaw = astra_mex_data2d('get', sinogram_in); diff --git a/matlab/tools/astra_clear.m b/matlab/tools/astra_clear.m index 0dd180b..14f8e77 100644 --- a/matlab/tools/astra_clear.m +++ b/matlab/tools/astra_clear.m @@ -5,13 +5,12 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- -% $Id$ astra_mex_data2d('clear'); astra_mex_data3d('clear'); diff --git a/matlab/tools/astra_create_backprojection.m b/matlab/tools/astra_create_backprojection.m index dff51c6..263a684 100644 --- a/matlab/tools/astra_create_backprojection.m +++ b/matlab/tools/astra_create_backprojection.m @@ -13,13 +13,12 @@ function [vol_id, vol] = astra_create_backprojection(data, proj_id) %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- -% $Id$ % get projection geometry diff --git a/matlab/tools/astra_create_backprojection3d_cuda.m b/matlab/tools/astra_create_backprojection3d_cuda.m index 88b4b4a..b060b39 100644 --- a/matlab/tools/astra_create_backprojection3d_cuda.m +++ b/matlab/tools/astra_create_backprojection3d_cuda.m @@ -15,13 +15,12 @@ function [vol_id, vol] = astra_create_backprojection3d_cuda(data, proj_geom, vol %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- -% $Id$ % store projection data diff --git a/matlab/tools/astra_create_backprojection_cuda.m b/matlab/tools/astra_create_backprojection_cuda.m index 7f8a6a6..04ea61b 100644 --- a/matlab/tools/astra_create_backprojection_cuda.m +++ b/matlab/tools/astra_create_backprojection_cuda.m @@ -14,13 +14,12 @@ function backProj = astra_create_backprojection_cuda(sinogramData, proj_geom, vo %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % - % 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be - % Website: http://sf.net/projects/astra-toolbox + % Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- - % $Id$ recon_id = astra_mex_data2d('create', '-vol', vol_geom, 0); sinogram_id = astra_mex_data2d('create', '-sino', proj_geom, sinogramData); diff --git a/matlab/tools/astra_create_proj_geom.m b/matlab/tools/astra_create_proj_geom.m index 862e410..0a30f23 100644 --- a/matlab/tools/astra_create_proj_geom.m +++ b/matlab/tools/astra_create_proj_geom.m @@ -87,13 +87,12 @@ function proj_geom = astra_create_proj_geom(type, varargin) %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- -% $Id$ if strcmp(type,'parallel') diff --git a/matlab/tools/astra_create_projector.m b/matlab/tools/astra_create_projector.m index 9bbef9e..e0adac7 100644 --- a/matlab/tools/astra_create_projector.m +++ b/matlab/tools/astra_create_projector.m @@ -15,13 +15,12 @@ function proj_id = astra_create_projector(type, proj_geom, vol_geom, options) %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ % ------------------------------------------------------------------------- -% $Id$ cfg_proj = astra_struct(type); diff --git a/matlab/tools/astra_create_reconstruction.m b/matlab/tools/astra_create_reconstruction.m index 76dba94..3362768 100644 --- a/matlab/tools/astra_create_reconstruction.m +++ b/matlab/tools/astra_create_reconstruction.m @@ -21,13 +21,12 @@ function [recon_id, recon] = astra_create_reconstruction(rec_type, proj_id, sino %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- -% $Id$ if nargin <= 4 diff --git a/matlab/tools/astra_create_reconstruction_cuda.m b/matlab/tools/astra_create_reconstruction_cuda.m index 7d0421c..ddcc5ee 100644 --- a/matlab/tools/astra_create_reconstruction_cuda.m +++ b/matlab/tools/astra_create_reconstruction_cuda.m @@ -22,13 +22,12 @@ function [recon_id, recon] = astra_create_reconstruction_cuda(rec_type, proj_geo %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- -% $Id$ if numel(sinogram) == 1 diff --git a/matlab/tools/astra_create_sino.m b/matlab/tools/astra_create_sino.m index d27e452..977664b 100644 --- a/matlab/tools/astra_create_sino.m +++ b/matlab/tools/astra_create_sino.m @@ -13,13 +13,12 @@ function [sino_id, sino] = astra_create_sino(data, proj_id) %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- -% $Id$ % get projection geometry diff --git a/matlab/tools/astra_create_sino3d_cuda.m b/matlab/tools/astra_create_sino3d_cuda.m index 3a90084..34c82b4 100644 --- a/matlab/tools/astra_create_sino3d_cuda.m +++ b/matlab/tools/astra_create_sino3d_cuda.m @@ -15,13 +15,12 @@ function [sino_id, sino] = astra_create_sino3d_cuda(data, proj_geom, vol_geom) %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- -% $Id$ % store volume diff --git a/matlab/tools/astra_create_sino_cuda.m b/matlab/tools/astra_create_sino_cuda.m index 64ebe54..2dfb82f 100644 --- a/matlab/tools/astra_create_sino_cuda.m +++ b/matlab/tools/astra_create_sino_cuda.m @@ -16,13 +16,12 @@ function [sino_id, sino] = astra_create_sino_cuda(data, proj_geom, vol_geom, gpu %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- -% $Id$ % store volume diff --git a/matlab/tools/astra_create_sino_gpu.m b/matlab/tools/astra_create_sino_gpu.m index 80be857..ca651ee 100644 --- a/matlab/tools/astra_create_sino_gpu.m +++ b/matlab/tools/astra_create_sino_gpu.m @@ -16,13 +16,12 @@ function [sino_id, sino] = astra_create_sino_gpu(data, proj_geom, vol_geom, gpu_ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- -% $Id$ % store volume diff --git a/matlab/tools/astra_create_sino_sampling.m b/matlab/tools/astra_create_sino_sampling.m index fad9e85..27c6d46 100644 --- a/matlab/tools/astra_create_sino_sampling.m +++ b/matlab/tools/astra_create_sino_sampling.m @@ -16,13 +16,12 @@ function [sino_id, sino] = astra_create_sino_sampling(data, proj_geom, vol_geom, %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- -% $Id$ % store volume diff --git a/matlab/tools/astra_create_vol_geom.m b/matlab/tools/astra_create_vol_geom.m index a3ba7de..bf24609 100644 --- a/matlab/tools/astra_create_vol_geom.m +++ b/matlab/tools/astra_create_vol_geom.m @@ -26,13 +26,12 @@ function vol_geom = astra_create_vol_geom(varargin) %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- -% $Id$ % astra_create_vol_geom([row_and_col_count ]) if numel(varargin) == 1 && numel(varargin{1}) == 1 diff --git a/matlab/tools/astra_data_op.m b/matlab/tools/astra_data_op.m index b6ef0e2..5025ac5 100644 --- a/matlab/tools/astra_data_op.m +++ b/matlab/tools/astra_data_op.m @@ -8,4 +8,4 @@ cfg.option.GPUindex = gpu_core; alg_id = astra_mex_algorithm('create',cfg); astra_mex_algorithm('run',alg_id); -astra_mex_algorithm('delete',alg_id); \ No newline at end of file +astra_mex_algorithm('delete',alg_id); diff --git a/matlab/tools/astra_data_op_mask.m b/matlab/tools/astra_data_op_mask.m index d46c925..4e4e326 100644 --- a/matlab/tools/astra_data_op_mask.m +++ b/matlab/tools/astra_data_op_mask.m @@ -9,4 +9,4 @@ cfg.option.MaskId = mask; alg_id = astra_mex_algorithm('create',cfg); astra_mex_algorithm('run',alg_id); -astra_mex_algorithm('delete',alg_id); \ No newline at end of file +astra_mex_algorithm('delete',alg_id); diff --git a/matlab/tools/astra_downsample_sinogram.m b/matlab/tools/astra_downsample_sinogram.m index 1232a93..ac50abd 100644 --- a/matlab/tools/astra_downsample_sinogram.m +++ b/matlab/tools/astra_downsample_sinogram.m @@ -15,13 +15,12 @@ function [sinogram_new, proj_geom_new] = astra_downsample_sinogram(sinogram, pro %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %------------------------------------------------------------------------ -% $Id$ if mod(size(sinogram,2),factor) ~= 0 disp('size of the sinogram must be a divisor of the factor'); diff --git a/matlab/tools/astra_imshow.m b/matlab/tools/astra_imshow.m index 6069674..dbaac10 100644 --- a/matlab/tools/astra_imshow.m +++ b/matlab/tools/astra_imshow.m @@ -7,4 +7,4 @@ imshow(data,range); if nargout >= 1 V = data; -end \ No newline at end of file +end diff --git a/matlab/tools/astra_mex.m b/matlab/tools/astra_mex.m index 9d6b2c7..aa6c3ea 100644 --- a/matlab/tools/astra_mex.m +++ b/matlab/tools/astra_mex.m @@ -6,13 +6,12 @@ function [varargout] = astra_mex(varargin) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %------------------------------------------------------------------------ -% $Id$ if nargout == 0 astra_mex_c(varargin{:}); if exist('ans','var') diff --git a/matlab/tools/astra_mex_algorithm.m b/matlab/tools/astra_mex_algorithm.m index 0a42c8e..69e9c31 100644 --- a/matlab/tools/astra_mex_algorithm.m +++ b/matlab/tools/astra_mex_algorithm.m @@ -6,13 +6,12 @@ function [varargout] = astra_mex_algorithm(varargin) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %------------------------------------------------------------------------ -% $Id$ if nargout == 0 astra_mex_algorithm_c(varargin{:}); if exist('ans','var') diff --git a/matlab/tools/astra_mex_data2d.m b/matlab/tools/astra_mex_data2d.m index fbc4c6b..6bdcb98 100644 --- a/matlab/tools/astra_mex_data2d.m +++ b/matlab/tools/astra_mex_data2d.m @@ -6,13 +6,12 @@ function [varargout] = astra_mex_data2d(varargin) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %------------------------------------------------------------------------ -% $Id$ if nargout == 0 astra_mex_data2d_c(varargin{:}); if exist('ans','var') diff --git a/matlab/tools/astra_mex_data3d.m b/matlab/tools/astra_mex_data3d.m index 1926774..44a02e9 100644 --- a/matlab/tools/astra_mex_data3d.m +++ b/matlab/tools/astra_mex_data3d.m @@ -6,13 +6,12 @@ function [varargout] = astra_mex_data3d(varargin) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %------------------------------------------------------------------------ -% $Id$ if nargout == 0 astra_mex_data3d_c(varargin{:}); if exist('ans','var') diff --git a/matlab/tools/astra_mex_direct.m b/matlab/tools/astra_mex_direct.m index 58c4fd2..ded3e9a 100644 --- a/matlab/tools/astra_mex_direct.m +++ b/matlab/tools/astra_mex_direct.m @@ -6,13 +6,12 @@ function [varargout] = astra_mex_direct(varargin) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %------------------------------------------------------------------------ -% $Id$ if nargout == 0 astra_mex_direct_c(varargin{:}); if exist('ans','var') diff --git a/matlab/tools/astra_mex_log.m b/matlab/tools/astra_mex_log.m index 28cfa18..7c88145 100644 --- a/matlab/tools/astra_mex_log.m +++ b/matlab/tools/astra_mex_log.m @@ -6,13 +6,12 @@ function [varargout] = astra_mex_log(varargin) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %------------------------------------------------------------------------ -% $Id$ if size(varargin,2)==2 && (strcmp(varargin{1},'debug') || strcmp(varargin{1},'info') || strcmp(varargin{1},'warn') || strcmp(varargin{1},'error')) d = dbstack(1); if size(d,1)==0 @@ -30,4 +29,4 @@ else varargout = cell(1,nargout); [varargout{:}] = astra_mex_log_c(varargin{:}); end -end \ No newline at end of file +end diff --git a/matlab/tools/astra_mex_matrix.m b/matlab/tools/astra_mex_matrix.m index 2bc8210..eabbd4f 100644 --- a/matlab/tools/astra_mex_matrix.m +++ b/matlab/tools/astra_mex_matrix.m @@ -6,13 +6,12 @@ function [varargout] = astra_mex_matrix(varargin) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %------------------------------------------------------------------------ -% $Id$ if nargout == 0 astra_mex_matrix_c(varargin{:}); if exist('ans','var') diff --git a/matlab/tools/astra_mex_plugin.m b/matlab/tools/astra_mex_plugin.m index 4159365..b5249dd 100644 --- a/matlab/tools/astra_mex_plugin.m +++ b/matlab/tools/astra_mex_plugin.m @@ -6,13 +6,12 @@ function [varargout] = astra_mex_plugin(varargin) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %------------------------------------------------------------------------ -% $Id$ if nargout == 0 astra_mex_plugin_c(varargin{:}); if exist('ans','var') @@ -21,4 +20,4 @@ if nargout == 0 else varargout = cell(1,nargout); [varargout{:}] = astra_mex_plugin_c(varargin{:}); -end \ No newline at end of file +end diff --git a/matlab/tools/astra_mex_projector.m b/matlab/tools/astra_mex_projector.m index 5eaffd3..0d6829e 100644 --- a/matlab/tools/astra_mex_projector.m +++ b/matlab/tools/astra_mex_projector.m @@ -6,13 +6,12 @@ function [varargout] = astra_mex_projector(varargin) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %------------------------------------------------------------------------ -% $Id$ if nargout == 0 astra_mex_projector_c(varargin{:}); if exist('ans','var') diff --git a/matlab/tools/astra_mex_projector3d.m b/matlab/tools/astra_mex_projector3d.m index eaec7f2..f0deffb 100644 --- a/matlab/tools/astra_mex_projector3d.m +++ b/matlab/tools/astra_mex_projector3d.m @@ -6,13 +6,12 @@ function [varargout] = astra_mex_projector3d(varargin) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %------------------------------------------------------------------------ -% $Id$ if nargout == 0 astra_mex_projector3d_c(varargin{:}); if exist('ans','var') diff --git a/matlab/tools/astra_projector_handle.m b/matlab/tools/astra_projector_handle.m index 6b56300..ae1254a 100644 --- a/matlab/tools/astra_projector_handle.m +++ b/matlab/tools/astra_projector_handle.m @@ -5,11 +5,11 @@ classdef astra_projector_handle < handle %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % - % 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be - % Website: http://sf.net/projects/astra-toolbox + % Website: http://www.astra-toolbox.com/ %------------------------------------------------------------------------ properties diff --git a/matlab/tools/astra_set_directory.m b/matlab/tools/astra_set_directory.m index ae21aab..3a85f54 100644 --- a/matlab/tools/astra_set_directory.m +++ b/matlab/tools/astra_set_directory.m @@ -11,13 +11,12 @@ function in = astra_set_directory(in) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %------------------------------------------------------------------------ -% $Id$ a = find(in == '/' | in == '\'); for i = 1:numel(a) diff --git a/matlab/tools/astra_set_gpu_index.m b/matlab/tools/astra_set_gpu_index.m index 1f5bfdc..e9c9c45 100644 --- a/matlab/tools/astra_set_gpu_index.m +++ b/matlab/tools/astra_set_gpu_index.m @@ -6,13 +6,12 @@ function astra_set_gpu_index(index) %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- -% $Id$ astra_mex('set_gpu_index', index); diff --git a/matlab/tools/astra_struct.m b/matlab/tools/astra_struct.m index b5bf48a..33f0a39 100644 --- a/matlab/tools/astra_struct.m +++ b/matlab/tools/astra_struct.m @@ -11,13 +11,12 @@ function res = astra_struct(type) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %------------------------------------------------------------------------ -% $Id$ res = struct(); res.options = struct(); diff --git a/matlab/tools/createOrderART.m b/matlab/tools/createOrderART.m index b058ba5..5f1d73b 100644 --- a/matlab/tools/createOrderART.m +++ b/matlab/tools/createOrderART.m @@ -16,13 +16,12 @@ function rayOrder = createOrderART(proj_geom, mode) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %------------------------------------------------------------------------ -% $Id$ angle_count = length(proj_geom.projection_angles); det_count = proj_geom.detector_count; diff --git a/matlab/tools/downsample_sinogram.m b/matlab/tools/downsample_sinogram.m index 1fb4ec8..a4122e8 100644 --- a/matlab/tools/downsample_sinogram.m +++ b/matlab/tools/downsample_sinogram.m @@ -9,4 +9,4 @@ function sinogram_out = downsample_sinogram(sinogram, ds) for i = 2:ds sinogram_out = sinogram_out + sinogram(:,i:ds:end,:); end - sinogram_out = sinogram_out / (ds*ds); \ No newline at end of file + sinogram_out = sinogram_out / (ds*ds); diff --git a/matlab/tools/imreadgs.m b/matlab/tools/imreadgs.m index 2920008..34ae9c9 100644 --- a/matlab/tools/imreadgs.m +++ b/matlab/tools/imreadgs.m @@ -12,13 +12,12 @@ function Im = imreadgs(filename) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %------------------------------------------------------------------------ -% $Id$ Im = double(imread(filename)); if size(Im,3) > 1 diff --git a/matlab/tools/imresize3D.m b/matlab/tools/imresize3D.m index af6a810..21dc8cd 100644 --- a/matlab/tools/imresize3D.m +++ b/matlab/tools/imresize3D.m @@ -12,13 +12,12 @@ function out = imresize3D(in, s_out, method) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %------------------------------------------------------------------------ -% $Id$ out = zeros(s_out); for i = 1:size(in,3) diff --git a/matlab/tools/imscale.m b/matlab/tools/imscale.m index 4a40e50..99b9f97 100644 --- a/matlab/tools/imscale.m +++ b/matlab/tools/imscale.m @@ -11,13 +11,12 @@ function out = imscale(in) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %------------------------------------------------------------------------ -% $Id$ mi = min(in(:)); ma = max(in(:)); diff --git a/matlab/tools/imwritesc.m b/matlab/tools/imwritesc.m index 4b28a09..3963e75 100644 --- a/matlab/tools/imwritesc.m +++ b/matlab/tools/imwritesc.m @@ -11,12 +11,11 @@ function imwritesc(in, filename) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %------------------------------------------------------------------------ -% $Id$ imwrite(imscale(in),filename); diff --git a/matlab/tools/kaiserBessel.m b/matlab/tools/kaiserBessel.m index 14b9097..9eb892a 100644 --- a/matlab/tools/kaiserBessel.m +++ b/matlab/tools/kaiserBessel.m @@ -14,13 +14,12 @@ function res = kaiserBessel(m,alpha,a,r) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %------------------------------------------------------------------------ -% $Id$ sq = sqrt(1 - (r./a).^2); diff --git a/matlab/tools/linspace2.m b/matlab/tools/linspace2.m index 027e4f4..755c918 100644 --- a/matlab/tools/linspace2.m +++ b/matlab/tools/linspace2.m @@ -13,13 +13,12 @@ function out = linspace2(a,b,c) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %------------------------------------------------------------------------ -% $Id$ out = linspace(a,b,c+1); out = out(1:end-1); diff --git a/matlab/tools/opTomo.m b/matlab/tools/opTomo.m index 04b3634..81de534 100644 --- a/matlab/tools/opTomo.m +++ b/matlab/tools/opTomo.m @@ -23,13 +23,12 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2014-2015, CWI, Amsterdam +% Copyright: 2014-2016, CWI, Amsterdam % License: Open Source under GPLv3 % Author: Folkert Bleichrodt % Contact: F.Bleichrodt@cwi.nl -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %-------------------------------------------------------------------------- -% $Id$ classdef opTomo < opSpot diff --git a/matlab/tools/overlayImage.m b/matlab/tools/overlayImage.m index 6b6361e..0ba2c63 100644 --- a/matlab/tools/overlayImage.m +++ b/matlab/tools/overlayImage.m @@ -11,13 +11,12 @@ function im = overlayImage(reconstruction, ground_truth) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %------------------------------------------------------------------------ -% $Id$ im(:,:,1) = reconstruction ./ max(reconstruction(:)); im(:,:,2) = ground_truth ./ max(ground_truth(:)); diff --git a/matlab/tools/rebin_fan2par.m b/matlab/tools/rebin_fan2par.m index f30c8d5..b05ab82 100644 --- a/matlab/tools/rebin_fan2par.m +++ b/matlab/tools/rebin_fan2par.m @@ -19,13 +19,12 @@ function F = rebin_fan2par(RadonData, BetaDeg, D, thetaDeg) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %------------------------------------------------------------------------ -% $Id$ NpixPProj = size(RadonData,1); % aantal pixels per projectie %if mod(size(Radondata,1),2)==0 diff --git a/matlab/tools/sliceExtractor.m b/matlab/tools/sliceExtractor.m index c73f313..c4e0459 100644 --- a/matlab/tools/sliceExtractor.m +++ b/matlab/tools/sliceExtractor.m @@ -13,13 +13,12 @@ function slice = sliceExtractor(data, dir, slicenr) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ %------------------------------------------------------------------------ -% $Id$ slicenr = round(slicenr); diff --git a/samples/matlab/s001_sinogram_par2d.m b/samples/matlab/s001_sinogram_par2d.m index 4494e7b..0295cdf 100644 --- a/samples/matlab/s001_sinogram_par2d.m +++ b/samples/matlab/s001_sinogram_par2d.m @@ -1,11 +1,11 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- % Create a basic 256x256 square volume geometry diff --git a/samples/matlab/s002_data2d.m b/samples/matlab/s002_data2d.m index a91071f..b082cb3 100644 --- a/samples/matlab/s002_data2d.m +++ b/samples/matlab/s002_data2d.m @@ -1,11 +1,11 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- vol_geom = astra_create_vol_geom(256, 256); diff --git a/samples/matlab/s003_gpu_reconstruction.m b/samples/matlab/s003_gpu_reconstruction.m index efb5c68..d98f720 100644 --- a/samples/matlab/s003_gpu_reconstruction.m +++ b/samples/matlab/s003_gpu_reconstruction.m @@ -1,11 +1,11 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- vol_geom = astra_create_vol_geom(256, 256); diff --git a/samples/matlab/s004_cpu_reconstruction.m b/samples/matlab/s004_cpu_reconstruction.m index f25cd2b..96f892a 100644 --- a/samples/matlab/s004_cpu_reconstruction.m +++ b/samples/matlab/s004_cpu_reconstruction.m @@ -1,11 +1,11 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- vol_geom = astra_create_vol_geom(256, 256); diff --git a/samples/matlab/s005_3d_geometry.m b/samples/matlab/s005_3d_geometry.m index 4b7360b..227dccd 100644 --- a/samples/matlab/s005_3d_geometry.m +++ b/samples/matlab/s005_3d_geometry.m @@ -1,11 +1,11 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- vol_geom = astra_create_vol_geom(64, 64, 64); diff --git a/samples/matlab/s006_3d_data.m b/samples/matlab/s006_3d_data.m index 32d88cc..dd45550 100644 --- a/samples/matlab/s006_3d_data.m +++ b/samples/matlab/s006_3d_data.m @@ -1,11 +1,11 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- % Create a 3D volume geometry. diff --git a/samples/matlab/s007_3d_reconstruction.m b/samples/matlab/s007_3d_reconstruction.m index fc9aca6..17c5d8c 100644 --- a/samples/matlab/s007_3d_reconstruction.m +++ b/samples/matlab/s007_3d_reconstruction.m @@ -1,11 +1,11 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- vol_geom = astra_create_vol_geom(128, 128, 128); diff --git a/samples/matlab/s008_gpu_selection.m b/samples/matlab/s008_gpu_selection.m index a9e152d..7a24028 100644 --- a/samples/matlab/s008_gpu_selection.m +++ b/samples/matlab/s008_gpu_selection.m @@ -1,11 +1,11 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- vol_geom = astra_create_vol_geom(256, 256); diff --git a/samples/matlab/s009_projection_matrix.m b/samples/matlab/s009_projection_matrix.m index efda0d2..645986b 100644 --- a/samples/matlab/s009_projection_matrix.m +++ b/samples/matlab/s009_projection_matrix.m @@ -1,11 +1,11 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- vol_geom = astra_create_vol_geom(256, 256); diff --git a/samples/matlab/s010_supersampling.m b/samples/matlab/s010_supersampling.m index 148f6ad..86a973d 100644 --- a/samples/matlab/s010_supersampling.m +++ b/samples/matlab/s010_supersampling.m @@ -1,11 +1,11 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- vol_geom = astra_create_vol_geom(256, 256); diff --git a/samples/matlab/s011_object_info.m b/samples/matlab/s011_object_info.m index 61ecb83..85665fd 100644 --- a/samples/matlab/s011_object_info.m +++ b/samples/matlab/s011_object_info.m @@ -1,11 +1,11 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- % Create two volume geometries diff --git a/samples/matlab/s012_masks.m b/samples/matlab/s012_masks.m index d3611a6..26d48a2 100644 --- a/samples/matlab/s012_masks.m +++ b/samples/matlab/s012_masks.m @@ -1,11 +1,11 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- diff --git a/samples/matlab/s013_constraints.m b/samples/matlab/s013_constraints.m index d72195c..07bdb05 100644 --- a/samples/matlab/s013_constraints.m +++ b/samples/matlab/s013_constraints.m @@ -1,11 +1,11 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- % In this example we will create a reconstruction constrained to diff --git a/samples/matlab/s014_FBP.m b/samples/matlab/s014_FBP.m index b73149c..4d1de13 100644 --- a/samples/matlab/s014_FBP.m +++ b/samples/matlab/s014_FBP.m @@ -1,11 +1,11 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- vol_geom = astra_create_vol_geom(256, 256); diff --git a/samples/matlab/s015_fp_bp.m b/samples/matlab/s015_fp_bp.m index 8cc417e..56c5ed4 100644 --- a/samples/matlab/s015_fp_bp.m +++ b/samples/matlab/s015_fp_bp.m @@ -1,11 +1,11 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- diff --git a/samples/matlab/s016_plots.m b/samples/matlab/s016_plots.m index 1455c6d..56f47d8 100644 --- a/samples/matlab/s016_plots.m +++ b/samples/matlab/s016_plots.m @@ -1,11 +1,11 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- vol_geom = astra_create_vol_geom(256, 256); diff --git a/samples/matlab/s017_opTomo.m b/samples/matlab/s017_opTomo.m index 891a93d..71f8d55 100644 --- a/samples/matlab/s017_opTomo.m +++ b/samples/matlab/s017_opTomo.m @@ -1,11 +1,11 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- % This sample illustrates the use of opTomo. diff --git a/samples/matlab/s020_3d_multiGPU.m b/samples/matlab/s020_3d_multiGPU.m index bade325..46b984e 100644 --- a/samples/matlab/s020_3d_multiGPU.m +++ b/samples/matlab/s020_3d_multiGPU.m @@ -1,11 +1,11 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% 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 % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be -% Website: http://sf.net/projects/astra-toolbox +% Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- diff --git a/src/Algorithm.cpp b/src/Algorithm.cpp index 7b61b8c..5b53d1a 100644 --- a/src/Algorithm.cpp +++ b/src/Algorithm.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/Algorithm.h" diff --git a/src/ArtAlgorithm.cpp b/src/ArtAlgorithm.cpp index 526c263..adec638 100644 --- a/src/ArtAlgorithm.cpp +++ b/src/ArtAlgorithm.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/ArtAlgorithm.h" diff --git a/src/AstraObjectFactory.cpp b/src/AstraObjectFactory.cpp index 1dda3b2..0e09d05 100644 --- a/src/AstraObjectFactory.cpp +++ b/src/AstraObjectFactory.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/AstraObjectFactory.h" diff --git a/src/AstraObjectManager.cpp b/src/AstraObjectManager.cpp index 3b818d3..274601d 100644 --- a/src/AstraObjectManager.cpp +++ b/src/AstraObjectManager.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/AstraObjectManager.h" diff --git a/src/AsyncAlgorithm.cpp b/src/AsyncAlgorithm.cpp index b265f59..54083a3 100644 --- a/src/AsyncAlgorithm.cpp +++ b/src/AsyncAlgorithm.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/AsyncAlgorithm.h" diff --git a/src/BackProjectionAlgorithm.cpp b/src/BackProjectionAlgorithm.cpp index c9beee1..c510858 100644 --- a/src/BackProjectionAlgorithm.cpp +++ b/src/BackProjectionAlgorithm.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/BackProjectionAlgorithm.h" diff --git a/src/CglsAlgorithm.cpp b/src/CglsAlgorithm.cpp index 1ca2549..621e004 100644 --- a/src/CglsAlgorithm.cpp +++ b/src/CglsAlgorithm.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/CglsAlgorithm.h" diff --git a/src/CompositeGeometryManager.cpp b/src/CompositeGeometryManager.cpp index 5879aec..f72f38a 100644 --- a/src/CompositeGeometryManager.cpp +++ b/src/CompositeGeometryManager.cpp @@ -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. diff --git a/src/ConeProjectionGeometry3D.cpp b/src/ConeProjectionGeometry3D.cpp index 96b04fb..217a916 100644 --- a/src/ConeProjectionGeometry3D.cpp +++ b/src/ConeProjectionGeometry3D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/ConeProjectionGeometry3D.h" diff --git a/src/ConeVecProjectionGeometry3D.cpp b/src/ConeVecProjectionGeometry3D.cpp index f4f900d..d73b8d1 100644 --- a/src/ConeVecProjectionGeometry3D.cpp +++ b/src/ConeVecProjectionGeometry3D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/ConeVecProjectionGeometry3D.h" diff --git a/src/Config.cpp b/src/Config.cpp index 395080b..ec074e9 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/Config.h" diff --git a/src/CudaBackProjectionAlgorithm.cpp b/src/CudaBackProjectionAlgorithm.cpp index a73f895..354d17d 100644 --- a/src/CudaBackProjectionAlgorithm.cpp +++ b/src/CudaBackProjectionAlgorithm.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #ifdef ASTRA_CUDA diff --git a/src/CudaBackProjectionAlgorithm3D.cpp b/src/CudaBackProjectionAlgorithm3D.cpp index 76d7b35..223a9a4 100644 --- a/src/CudaBackProjectionAlgorithm3D.cpp +++ b/src/CudaBackProjectionAlgorithm3D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/CudaBackProjectionAlgorithm3D.h" diff --git a/src/CudaCglsAlgorithm.cpp b/src/CudaCglsAlgorithm.cpp index 9dd4f78..8b5bec6 100644 --- a/src/CudaCglsAlgorithm.cpp +++ b/src/CudaCglsAlgorithm.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #ifdef ASTRA_CUDA diff --git a/src/CudaCglsAlgorithm3D.cpp b/src/CudaCglsAlgorithm3D.cpp index 930a71e..c00c47d 100644 --- a/src/CudaCglsAlgorithm3D.cpp +++ b/src/CudaCglsAlgorithm3D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/CudaCglsAlgorithm3D.h" diff --git a/src/CudaDartMaskAlgorithm.cpp b/src/CudaDartMaskAlgorithm.cpp index c2a4cca..375d565 100644 --- a/src/CudaDartMaskAlgorithm.cpp +++ b/src/CudaDartMaskAlgorithm.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #ifdef ASTRA_CUDA diff --git a/src/CudaDartMaskAlgorithm3D.cpp b/src/CudaDartMaskAlgorithm3D.cpp index dd12c58..0d7b27e 100644 --- a/src/CudaDartMaskAlgorithm3D.cpp +++ b/src/CudaDartMaskAlgorithm3D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #ifdef ASTRA_CUDA diff --git a/src/CudaDartSmoothingAlgorithm.cpp b/src/CudaDartSmoothingAlgorithm.cpp index 425f0a3..0759ea0 100644 --- a/src/CudaDartSmoothingAlgorithm.cpp +++ b/src/CudaDartSmoothingAlgorithm.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #ifdef ASTRA_CUDA diff --git a/src/CudaDartSmoothingAlgorithm3D.cpp b/src/CudaDartSmoothingAlgorithm3D.cpp index df7e0df..b381bc9 100644 --- a/src/CudaDartSmoothingAlgorithm3D.cpp +++ b/src/CudaDartSmoothingAlgorithm3D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #ifdef ASTRA_CUDA diff --git a/src/CudaDataOperationAlgorithm.cpp b/src/CudaDataOperationAlgorithm.cpp index 82b676b..f9466e2 100644 --- a/src/CudaDataOperationAlgorithm.cpp +++ b/src/CudaDataOperationAlgorithm.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #ifdef ASTRA_CUDA diff --git a/src/CudaEMAlgorithm.cpp b/src/CudaEMAlgorithm.cpp index d0afd80..040b29a 100644 --- a/src/CudaEMAlgorithm.cpp +++ b/src/CudaEMAlgorithm.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #ifdef ASTRA_CUDA diff --git a/src/CudaFDKAlgorithm3D.cpp b/src/CudaFDKAlgorithm3D.cpp index 15abed4..fef4f41 100644 --- a/src/CudaFDKAlgorithm3D.cpp +++ b/src/CudaFDKAlgorithm3D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/CudaFDKAlgorithm3D.h" diff --git a/src/CudaFilteredBackProjectionAlgorithm.cpp b/src/CudaFilteredBackProjectionAlgorithm.cpp index aa97eec..7e2df79 100644 --- a/src/CudaFilteredBackProjectionAlgorithm.cpp +++ b/src/CudaFilteredBackProjectionAlgorithm.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include diff --git a/src/CudaForwardProjectionAlgorithm.cpp b/src/CudaForwardProjectionAlgorithm.cpp index 80f2e02..bac1251 100644 --- a/src/CudaForwardProjectionAlgorithm.cpp +++ b/src/CudaForwardProjectionAlgorithm.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/CudaForwardProjectionAlgorithm.h" diff --git a/src/CudaForwardProjectionAlgorithm3D.cpp b/src/CudaForwardProjectionAlgorithm3D.cpp index f709e34..6783093 100644 --- a/src/CudaForwardProjectionAlgorithm3D.cpp +++ b/src/CudaForwardProjectionAlgorithm3D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/CudaForwardProjectionAlgorithm3D.h" diff --git a/src/CudaProjector2D.cpp b/src/CudaProjector2D.cpp index acf6000..b0a38b0 100644 --- a/src/CudaProjector2D.cpp +++ b/src/CudaProjector2D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/CudaProjector2D.h" diff --git a/src/CudaProjector3D.cpp b/src/CudaProjector3D.cpp index bbfbd34..29af0c6 100644 --- a/src/CudaProjector3D.cpp +++ b/src/CudaProjector3D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/CudaProjector3D.h" diff --git a/src/CudaReconstructionAlgorithm2D.cpp b/src/CudaReconstructionAlgorithm2D.cpp index 2798434..96f52f0 100644 --- a/src/CudaReconstructionAlgorithm2D.cpp +++ b/src/CudaReconstructionAlgorithm2D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #ifdef ASTRA_CUDA diff --git a/src/CudaRoiSelectAlgorithm.cpp b/src/CudaRoiSelectAlgorithm.cpp index dfb8056..baf8a6f 100644 --- a/src/CudaRoiSelectAlgorithm.cpp +++ b/src/CudaRoiSelectAlgorithm.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #ifdef ASTRA_CUDA diff --git a/src/CudaSartAlgorithm.cpp b/src/CudaSartAlgorithm.cpp index bf97224..645b40c 100644 --- a/src/CudaSartAlgorithm.cpp +++ b/src/CudaSartAlgorithm.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #ifdef ASTRA_CUDA diff --git a/src/CudaSirtAlgorithm.cpp b/src/CudaSirtAlgorithm.cpp index c8dc677..b6b427e 100644 --- a/src/CudaSirtAlgorithm.cpp +++ b/src/CudaSirtAlgorithm.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #ifdef ASTRA_CUDA diff --git a/src/CudaSirtAlgorithm3D.cpp b/src/CudaSirtAlgorithm3D.cpp index c819f8e..f2d8232 100644 --- a/src/CudaSirtAlgorithm3D.cpp +++ b/src/CudaSirtAlgorithm3D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/CudaSirtAlgorithm3D.h" diff --git a/src/DataProjector.cpp b/src/DataProjector.cpp index 83d88a2..4290958 100644 --- a/src/DataProjector.cpp +++ b/src/DataProjector.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/DataProjector.h" diff --git a/src/DataProjectorPolicies.cpp b/src/DataProjectorPolicies.cpp index 324ceeb..e719a5e 100644 --- a/src/DataProjectorPolicies.cpp +++ b/src/DataProjectorPolicies.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/DataProjectorPolicies.h" diff --git a/src/FanFlatBeamLineKernelProjector2D.cpp b/src/FanFlatBeamLineKernelProjector2D.cpp index 343144d..4bfff58 100644 --- a/src/FanFlatBeamLineKernelProjector2D.cpp +++ b/src/FanFlatBeamLineKernelProjector2D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/FanFlatBeamLineKernelProjector2D.h" diff --git a/src/FanFlatBeamStripKernelProjector2D.cpp b/src/FanFlatBeamStripKernelProjector2D.cpp index 6e2c518..198c0ea 100644 --- a/src/FanFlatBeamStripKernelProjector2D.cpp +++ b/src/FanFlatBeamStripKernelProjector2D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/FanFlatBeamStripKernelProjector2D.h" diff --git a/src/FanFlatProjectionGeometry2D.cpp b/src/FanFlatProjectionGeometry2D.cpp index 8bee0d6..28bc75e 100644 --- a/src/FanFlatProjectionGeometry2D.cpp +++ b/src/FanFlatProjectionGeometry2D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/FanFlatProjectionGeometry2D.h" diff --git a/src/FanFlatVecProjectionGeometry2D.cpp b/src/FanFlatVecProjectionGeometry2D.cpp index 0b76fc5..b213384 100644 --- a/src/FanFlatVecProjectionGeometry2D.cpp +++ b/src/FanFlatVecProjectionGeometry2D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/FanFlatVecProjectionGeometry2D.h" diff --git a/src/FilteredBackProjectionAlgorithm.cpp b/src/FilteredBackProjectionAlgorithm.cpp index 70462f7..2361379 100644 --- a/src/FilteredBackProjectionAlgorithm.cpp +++ b/src/FilteredBackProjectionAlgorithm.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/FilteredBackProjectionAlgorithm.h" diff --git a/src/Float32Data.cpp b/src/Float32Data.cpp index f668a9f..1bb45d8 100644 --- a/src/Float32Data.cpp +++ b/src/Float32Data.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/Float32Data.h" diff --git a/src/Float32Data2D.cpp b/src/Float32Data2D.cpp index c96e5eb..56ea7cc 100644 --- a/src/Float32Data2D.cpp +++ b/src/Float32Data2D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/Float32Data2D.h" diff --git a/src/Float32Data3D.cpp b/src/Float32Data3D.cpp index 9142215..cad1f18 100644 --- a/src/Float32Data3D.cpp +++ b/src/Float32Data3D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/Float32Data3D.h" diff --git a/src/Float32Data3DMemory.cpp b/src/Float32Data3DMemory.cpp index 4e851b7..95b1859 100644 --- a/src/Float32Data3DMemory.cpp +++ b/src/Float32Data3DMemory.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/Float32Data3DMemory.h" diff --git a/src/Float32ProjectionData2D.cpp b/src/Float32ProjectionData2D.cpp index f7f83e3..67571f4 100644 --- a/src/Float32ProjectionData2D.cpp +++ b/src/Float32ProjectionData2D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/Float32ProjectionData2D.h" diff --git a/src/Float32ProjectionData3D.cpp b/src/Float32ProjectionData3D.cpp index 680ad55..c751c58 100644 --- a/src/Float32ProjectionData3D.cpp +++ b/src/Float32ProjectionData3D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/Float32ProjectionData3D.h" diff --git a/src/Float32ProjectionData3DMemory.cpp b/src/Float32ProjectionData3DMemory.cpp index ee3fc83..f42e216 100644 --- a/src/Float32ProjectionData3DMemory.cpp +++ b/src/Float32ProjectionData3DMemory.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/Float32ProjectionData3DMemory.h" diff --git a/src/Float32VolumeData2D.cpp b/src/Float32VolumeData2D.cpp index c903c66..e0e14c3 100644 --- a/src/Float32VolumeData2D.cpp +++ b/src/Float32VolumeData2D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/Float32VolumeData2D.h" diff --git a/src/Float32VolumeData3D.cpp b/src/Float32VolumeData3D.cpp index bd78001..bf7eced 100644 --- a/src/Float32VolumeData3D.cpp +++ b/src/Float32VolumeData3D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/Float32VolumeData3D.h" diff --git a/src/Float32VolumeData3DMemory.cpp b/src/Float32VolumeData3DMemory.cpp index 14adb1a..ba39eaa 100644 --- a/src/Float32VolumeData3DMemory.cpp +++ b/src/Float32VolumeData3DMemory.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/Float32VolumeData3DMemory.h" diff --git a/src/ForwardProjectionAlgorithm.cpp b/src/ForwardProjectionAlgorithm.cpp index dcf5790..dccd838 100644 --- a/src/ForwardProjectionAlgorithm.cpp +++ b/src/ForwardProjectionAlgorithm.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/ForwardProjectionAlgorithm.h" diff --git a/src/Fourier.cpp b/src/Fourier.cpp index c33f7bd..36aa26b 100644 --- a/src/Fourier.cpp +++ b/src/Fourier.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/Fourier.h" diff --git a/src/GeometryUtil3D.cpp b/src/GeometryUtil3D.cpp index c6bfd8b..b12c211 100644 --- a/src/GeometryUtil3D.cpp +++ b/src/GeometryUtil3D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/GeometryUtil3D.h" diff --git a/src/Globals.cpp b/src/Globals.cpp index 904a459..0edb397 100644 --- a/src/Globals.cpp +++ b/src/Globals.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/Globals.h" diff --git a/src/Logging.cpp b/src/Logging.cpp index cd7e3f0..da7ea37 100644 --- a/src/Logging.cpp +++ b/src/Logging.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #define CLOG_MAIN diff --git a/src/ParallelBeamBlobKernelProjector2D.cpp b/src/ParallelBeamBlobKernelProjector2D.cpp index 9b7c05f..5cc9174 100644 --- a/src/ParallelBeamBlobKernelProjector2D.cpp +++ b/src/ParallelBeamBlobKernelProjector2D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/ParallelBeamBlobKernelProjector2D.h" diff --git a/src/ParallelBeamLineKernelProjector2D.cpp b/src/ParallelBeamLineKernelProjector2D.cpp index ccfb9f8..a5f46a7 100644 --- a/src/ParallelBeamLineKernelProjector2D.cpp +++ b/src/ParallelBeamLineKernelProjector2D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/ParallelBeamLineKernelProjector2D.h" diff --git a/src/ParallelBeamLinearKernelProjector2D.cpp b/src/ParallelBeamLinearKernelProjector2D.cpp index 2171e73..e9034bf 100644 --- a/src/ParallelBeamLinearKernelProjector2D.cpp +++ b/src/ParallelBeamLinearKernelProjector2D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/ParallelBeamLinearKernelProjector2D.h" diff --git a/src/ParallelBeamStripKernelProjector2D.cpp b/src/ParallelBeamStripKernelProjector2D.cpp index a2869e2..ab4e49e 100644 --- a/src/ParallelBeamStripKernelProjector2D.cpp +++ b/src/ParallelBeamStripKernelProjector2D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/ParallelBeamStripKernelProjector2D.h" diff --git a/src/ParallelProjectionGeometry2D.cpp b/src/ParallelProjectionGeometry2D.cpp index cc2a129..f73df50 100644 --- a/src/ParallelProjectionGeometry2D.cpp +++ b/src/ParallelProjectionGeometry2D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/ParallelProjectionGeometry2D.h" diff --git a/src/ParallelProjectionGeometry3D.cpp b/src/ParallelProjectionGeometry3D.cpp index 2f80883..4d3af25 100644 --- a/src/ParallelProjectionGeometry3D.cpp +++ b/src/ParallelProjectionGeometry3D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/ParallelProjectionGeometry3D.h" diff --git a/src/ParallelVecProjectionGeometry3D.cpp b/src/ParallelVecProjectionGeometry3D.cpp index 3172818..310f87b 100644 --- a/src/ParallelVecProjectionGeometry3D.cpp +++ b/src/ParallelVecProjectionGeometry3D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/ParallelVecProjectionGeometry3D.h" diff --git a/src/PlatformDepSystemCode.cpp b/src/PlatformDepSystemCode.cpp index 0a5d236..d519068 100644 --- a/src/PlatformDepSystemCode.cpp +++ b/src/PlatformDepSystemCode.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/PlatformDepSystemCode.h" diff --git a/src/PluginAlgorithm.cpp b/src/PluginAlgorithm.cpp index 1bcfbdb..28bf12e 100644 --- a/src/PluginAlgorithm.cpp +++ b/src/PluginAlgorithm.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/PluginAlgorithm.h" diff --git a/src/ProjectionGeometry2D.cpp b/src/ProjectionGeometry2D.cpp index 8ce06dc..e9f08ec 100644 --- a/src/ProjectionGeometry2D.cpp +++ b/src/ProjectionGeometry2D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/ProjectionGeometry2D.h" diff --git a/src/ProjectionGeometry3D.cpp b/src/ProjectionGeometry3D.cpp index 281db7c..d595570 100644 --- a/src/ProjectionGeometry3D.cpp +++ b/src/ProjectionGeometry3D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/ProjectionGeometry3D.h" diff --git a/src/Projector2D.cpp b/src/Projector2D.cpp index cf233a0..78412e6 100644 --- a/src/Projector2D.cpp +++ b/src/Projector2D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/Projector2D.h" diff --git a/src/Projector3D.cpp b/src/Projector3D.cpp index 5e22105..ecaaafc 100644 --- a/src/Projector3D.cpp +++ b/src/Projector3D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/Projector3D.h" diff --git a/src/ReconstructionAlgorithm2D.cpp b/src/ReconstructionAlgorithm2D.cpp index 1c6d855..4fb2b2b 100644 --- a/src/ReconstructionAlgorithm2D.cpp +++ b/src/ReconstructionAlgorithm2D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/ReconstructionAlgorithm2D.h" diff --git a/src/ReconstructionAlgorithm3D.cpp b/src/ReconstructionAlgorithm3D.cpp index 55f1031..4893e01 100644 --- a/src/ReconstructionAlgorithm3D.cpp +++ b/src/ReconstructionAlgorithm3D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/ReconstructionAlgorithm3D.h" diff --git a/src/ReconstructionAlgorithmMultiSlice2D.cpp b/src/ReconstructionAlgorithmMultiSlice2D.cpp index 39c337f..eb13f46 100644 --- a/src/ReconstructionAlgorithmMultiSlice2D.cpp +++ b/src/ReconstructionAlgorithmMultiSlice2D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/ReconstructionAlgorithmMultiSlice2D.h" diff --git a/src/SartAlgorithm.cpp b/src/SartAlgorithm.cpp index 8df3342..5c8f59b 100644 --- a/src/SartAlgorithm.cpp +++ b/src/SartAlgorithm.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/SartAlgorithm.h" diff --git a/src/SirtAlgorithm.cpp b/src/SirtAlgorithm.cpp index ff25648..1fb4aad 100644 --- a/src/SirtAlgorithm.cpp +++ b/src/SirtAlgorithm.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/SirtAlgorithm.h" diff --git a/src/SparseMatrix.cpp b/src/SparseMatrix.cpp index ace978d..9f39aea 100644 --- a/src/SparseMatrix.cpp +++ b/src/SparseMatrix.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include diff --git a/src/SparseMatrixProjectionGeometry2D.cpp b/src/SparseMatrixProjectionGeometry2D.cpp index 358c992..4694df1 100644 --- a/src/SparseMatrixProjectionGeometry2D.cpp +++ b/src/SparseMatrixProjectionGeometry2D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/SparseMatrixProjectionGeometry2D.h" diff --git a/src/SparseMatrixProjector2D.cpp b/src/SparseMatrixProjector2D.cpp index be7e069..7059919 100644 --- a/src/SparseMatrixProjector2D.cpp +++ b/src/SparseMatrixProjector2D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/SparseMatrixProjector2D.h" diff --git a/src/Utilities.cpp b/src/Utilities.cpp index 9733c30..eb06d8b 100644 --- a/src/Utilities.cpp +++ b/src/Utilities.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/Utilities.h" diff --git a/src/Vector3D.cpp b/src/Vector3D.cpp index 6176d25..f2c28f2 100644 --- a/src/Vector3D.cpp +++ b/src/Vector3D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "../include/astra/Vector3D.h" diff --git a/src/VolumeGeometry2D.cpp b/src/VolumeGeometry2D.cpp index 9d74e47..b08fcb5 100644 --- a/src/VolumeGeometry2D.cpp +++ b/src/VolumeGeometry2D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/VolumeGeometry2D.h" diff --git a/src/VolumeGeometry3D.cpp b/src/VolumeGeometry3D.cpp index 5d72c24..f1f7cb3 100644 --- a/src/VolumeGeometry3D.cpp +++ b/src/VolumeGeometry3D.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/VolumeGeometry3D.h" diff --git a/src/XMLDocument.cpp b/src/XMLDocument.cpp index 716ed9e..97e9c9d 100644 --- a/src/XMLDocument.cpp +++ b/src/XMLDocument.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/XMLDocument.h" diff --git a/src/XMLNode.cpp b/src/XMLNode.cpp index cf268c2..35f8093 100644 --- a/src/XMLNode.cpp +++ b/src/XMLNode.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/XMLNode.h" diff --git a/src/swrap.cpp b/src/swrap.cpp index 51dcdb1..c970ab5 100644 --- a/src/swrap.cpp +++ b/src/swrap.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _MSC_VER diff --git a/tests/main.cpp b/tests/main.cpp index 6fc963e..cd2f717 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://www.astra-toolbox.com/ +This file is part of the ASTRA Toolbox. -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA Toolbox"). The ASTRA Toolbox is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,11 +23,9 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see . ----------------------------------------------------------------------- -$Id$ */ - #define BOOST_TEST_DYN_LINK // Generate main() diff --git a/tests/test_AstraObjectManager.cpp b/tests/test_AstraObjectManager.cpp index 893efb9..da641ba 100644 --- a/tests/test_AstraObjectManager.cpp +++ b/tests/test_AstraObjectManager.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://www.astra-toolbox.com/ +This file is part of the ASTRA Toolbox. -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA Toolbox"). The ASTRA Toolbox is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,10 +23,8 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see . ----------------------------------------------------------------------- -$Id$ */ - #define BOOST_TEST_DYN_LINK #include #include diff --git a/tests/test_FanFlatProjectionGeometry2D.cpp b/tests/test_FanFlatProjectionGeometry2D.cpp index a07fbf8..b7c5601 100644 --- a/tests/test_FanFlatProjectionGeometry2D.cpp +++ b/tests/test_FanFlatProjectionGeometry2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://www.astra-toolbox.com/ +This file is part of the ASTRA Toolbox. -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA Toolbox"). The ASTRA Toolbox is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see . ----------------------------------------------------------------------- -$Id$ */ diff --git a/tests/test_Float32Data2D.cpp b/tests/test_Float32Data2D.cpp index 54d642b..31e3d03 100644 --- a/tests/test_Float32Data2D.cpp +++ b/tests/test_Float32Data2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://www.astra-toolbox.com/ +This file is part of the ASTRA Toolbox. -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA Toolbox"). The ASTRA Toolbox is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see . ----------------------------------------------------------------------- -$Id$ */ diff --git a/tests/test_Float32ProjectionData2D.cpp b/tests/test_Float32ProjectionData2D.cpp index 1fddeec..75b276f 100644 --- a/tests/test_Float32ProjectionData2D.cpp +++ b/tests/test_Float32ProjectionData2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://www.astra-toolbox.com/ +This file is part of the ASTRA Toolbox. -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA Toolbox"). The ASTRA Toolbox is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see . ----------------------------------------------------------------------- -$Id$ */ diff --git a/tests/test_Float32VolumeData2D.cpp b/tests/test_Float32VolumeData2D.cpp index 29dde3a..c667f51 100644 --- a/tests/test_Float32VolumeData2D.cpp +++ b/tests/test_Float32VolumeData2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://www.astra-toolbox.com/ +This file is part of the ASTRA Toolbox. -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA Toolbox"). The ASTRA Toolbox is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see . ----------------------------------------------------------------------- -$Id$ */ diff --git a/tests/test_Fourier.cpp b/tests/test_Fourier.cpp index ef12747..611bd56 100644 --- a/tests/test_Fourier.cpp +++ b/tests/test_Fourier.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://www.astra-toolbox.com/ +This file is part of the ASTRA Toolbox. -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA Toolbox"). The ASTRA Toolbox is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see . ----------------------------------------------------------------------- -$Id$ */ diff --git a/tests/test_ParallelBeamLineKernelProjector2D.cpp b/tests/test_ParallelBeamLineKernelProjector2D.cpp index c56ff37..58d511e 100644 --- a/tests/test_ParallelBeamLineKernelProjector2D.cpp +++ b/tests/test_ParallelBeamLineKernelProjector2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://www.astra-toolbox.com/ +This file is part of the ASTRA Toolbox. -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA Toolbox"). The ASTRA Toolbox is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,11 +23,9 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see . ----------------------------------------------------------------------- -$Id$ */ - #define BOOST_TEST_DYN_LINK #include #include diff --git a/tests/test_ParallelBeamLinearKernelProjector2D.cpp b/tests/test_ParallelBeamLinearKernelProjector2D.cpp index 9100db4..f1fa311 100644 --- a/tests/test_ParallelBeamLinearKernelProjector2D.cpp +++ b/tests/test_ParallelBeamLinearKernelProjector2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://www.astra-toolbox.com/ +This file is part of the ASTRA Toolbox. -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA Toolbox"). The ASTRA Toolbox is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,11 +23,9 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see . ----------------------------------------------------------------------- -$Id$ */ - #define BOOST_TEST_DYN_LINK #include #include diff --git a/tests/test_ParallelProjectionGeometry2D.cpp b/tests/test_ParallelProjectionGeometry2D.cpp index 809c6fa..fe353f0 100644 --- a/tests/test_ParallelProjectionGeometry2D.cpp +++ b/tests/test_ParallelProjectionGeometry2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://www.astra-toolbox.com/ +This file is part of the ASTRA Toolbox. -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA Toolbox"). The ASTRA Toolbox is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see . ----------------------------------------------------------------------- -$Id$ */ diff --git a/tests/test_VolumeGeometry2D.cpp b/tests/test_VolumeGeometry2D.cpp index 4ae88d3..96e8e5e 100644 --- a/tests/test_VolumeGeometry2D.cpp +++ b/tests/test_VolumeGeometry2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://www.astra-toolbox.com/ +This file is part of the ASTRA Toolbox. -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA Toolbox"). The ASTRA Toolbox is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see . ----------------------------------------------------------------------- -$Id$ */ diff --git a/tests/test_XMLDocument.cpp b/tests/test_XMLDocument.cpp index 95429cb..f213006 100644 --- a/tests/test_XMLDocument.cpp +++ b/tests/test_XMLDocument.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://www.astra-toolbox.com/ +This file is part of the ASTRA Toolbox. -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA Toolbox"). The ASTRA Toolbox is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see . ----------------------------------------------------------------------- -$Id$ */ diff --git a/tests/tests_vc08.vcproj b/tests/tests_vc08.vcproj deleted file mode 100644 index 90c5d55..0000000 --- a/tests/tests_vc08.vcproj +++ /dev/null @@ -1,699 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3 From db5318f30c28d37f877325f587485d3122e784df Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Tue, 17 Jan 2017 12:18:56 +0100 Subject: Fix warnings --- matlab/mex/mexHelpFunctions.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'matlab') diff --git a/matlab/mex/mexHelpFunctions.cpp b/matlab/mex/mexHelpFunctions.cpp index 8d8f484..7cab248 100644 --- a/matlab/mex/mexHelpFunctions.cpp +++ b/matlab/mex/mexHelpFunctions.cpp @@ -360,18 +360,18 @@ mxArray* stringToMxArray(std::string input) StringUtil::splitString(col_strings, row_strings[0], ","); // get dimensions - int rows = row_strings.size(); - int cols = col_strings.size(); + size_t rows = row_strings.size(); + size_t cols = col_strings.size(); // init matrix mxArray* pMatrix = mxCreateDoubleMatrix(rows, cols, mxREAL); double* out = mxGetPr(pMatrix); // loop elements - for (unsigned int row = 0; row < rows; row++) { + for (size_t row = 0; row < rows; row++) { StringUtil::splitString(col_strings, row_strings[row], ","); // check size - for (unsigned int col = 0; col < col_strings.size(); col++) { + for (size_t col = 0; col < col_strings.size(); col++) { out[col*rows + row] = StringUtil::stringToFloat(col_strings[col]); } } @@ -390,7 +390,7 @@ mxArray* stringToMxArray(std::string input) double* out = mxGetPr(pVector); // loop elements - for (unsigned int i = 0; i < items.size(); i++) { + for (size_t i = 0; i < items.size(); i++) { out[i] = StringUtil::stringToFloat(items[i]); } return pVector; -- cgit v1.2.3 From 1d851f0a8fa093e044c7264569cc6f88df39a16e Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Thu, 26 Jan 2017 14:57:42 +0100 Subject: Remove unused 3d global min/max --- include/astra/Float32Data3D.h | 16 ------------ include/astra/Float32Data3DMemory.h | 42 ++---------------------------- matlab/mex/astra_mex_data3d_c.cpp | 4 --- matlab/mex/mexDataManagerHelpFunctions.cpp | 11 -------- matlab/mex/mexDataManagerHelpFunctions.h | 2 -- python/astra/data3d_c.pyx | 1 - src/Float32Data3DMemory.cpp | 38 --------------------------- 7 files changed, 2 insertions(+), 112 deletions(-) (limited to 'matlab') diff --git a/include/astra/Float32Data3D.h b/include/astra/Float32Data3D.h index 1cd9c20..2b3b88e 100644 --- a/include/astra/Float32Data3D.h +++ b/include/astra/Float32Data3D.h @@ -107,22 +107,6 @@ public: */ int getDimensionCount() const; - /** - * Clamp data to minimum value - * - * @param _fMin minimum value - * @return l-value - */ - virtual CFloat32Data3D& clampMin(float32& _fMin) = 0; - - /** - * Clamp data to maximum value - * - * @param _fMax maximum value - * @return l-value - */ - virtual CFloat32Data3D& clampMax(float32& _fMax) = 0; - /** get a description of the class * * @return description string diff --git a/include/astra/Float32Data3DMemory.h b/include/astra/Float32Data3DMemory.h index d885101..e0c04a0 100644 --- a/include/astra/Float32Data3DMemory.h +++ b/include/astra/Float32Data3DMemory.h @@ -237,35 +237,11 @@ public: * After the call p = getData3D(), use p[iy][ix] to access element (ix, iy, iz). * The data memory and pointer array are still "owned" by the CFloat32Data3DMemory * instance; this memory may NEVER be freed by the caller of this function. - * If changes are made to this data, the function updateStatistics() - * should be called after completion of all changes. * * @return pointer to the 3-dimensional 32-bit floating point data block */ const float32*** getData3DConst() const; - /** Update data statistics, such as minimum and maximum value, after the data has been modified. - */ - virtual void updateStatistics(); - - /** Get the minimum value in the data block. - * If the data has been changed after construction, the function - * updateStatistics() must be called at least once before - * a query can be made on this value. - * - * @return minimum value in the data block - */ - virtual float32 getGlobalMin() const; - - /** Get the maximum value in the data block - * If the data has been changed after construction, the function - * updateStatistics() must be called at least once before - * a query can be made on this value. - * - * @return maximum value in the data block - */ - virtual float32 getGlobalMax() const; - /** which type is this class? * * @return DataType: ASTRA_DATATYPE_FLOAT32_PROJECTION or @@ -305,27 +281,12 @@ inline CFloat32Data3DMemory::EDataType CFloat32Data3DMemory::getType() const return BASE; } -//---------------------------------------------------------------------------------------- -// Get the minimum value in the data block. -inline float32 CFloat32Data3DMemory::getGlobalMin() const -{ - ASTRA_ASSERT(m_bInitialized); - return m_fGlobalMin; -} - -//---------------------------------------------------------------------------------------- -// Get the maximum value in the data block -inline float32 CFloat32Data3DMemory::getGlobalMax() const -{ - ASTRA_ASSERT(m_bInitialized); - return m_fGlobalMax; -} - //---------------------------------------------------------------------------------------- // Get a pointer to the data block, represented as a 1-dimensional array of float32 values. inline float32* CFloat32Data3DMemory::getData() { ASTRA_ASSERT(m_bInitialized); + return m_pfData; } @@ -334,6 +295,7 @@ inline float32* CFloat32Data3DMemory::getData() inline const float32* CFloat32Data3DMemory::getDataConst() const { ASTRA_ASSERT(m_bInitialized); + return (const float32*)m_pfData; } 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 & 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 & 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 &); - void getDataPointers(const std::vector &, std::vector &); void getDataSizes(const std::vector &, diff --git a/python/astra/data3d_c.pyx b/python/astra/data3d_c.pyx index 915c60d..1b9293a 100644 --- a/python/astra/data3d_c.pyx +++ b/python/astra/data3d_c.pyx @@ -132,7 +132,6 @@ def create(datatype,geometry,data=None, link=False): if not link: fillDataObject(pDataObject3D, data) - pDataObject3D.updateStatistics() return man3d.store(pDataObject3D) diff --git a/src/Float32Data3DMemory.cpp b/src/Float32Data3DMemory.cpp index 8735585..7e60527 100644 --- a/src/Float32Data3DMemory.cpp +++ b/src/Float32Data3DMemory.cpp @@ -76,10 +76,6 @@ bool CFloat32Data3DMemory::_initialize(int _iWidth, int _iHeight, int _iDepth) m_pCustomMemory = 0; _allocateData(); - // set minmax to default values - m_fGlobalMin = 0.0; - m_fGlobalMax = 0.0; - // initialization complete return true; @@ -273,9 +269,6 @@ void CFloat32Data3DMemory::_clear() m_ppfDataRowInd = NULL; m_pppfDataSliceInd = NULL; m_pCustomMemory = NULL; - - //m_fGlobalMin = 0.0f; - //m_fGlobalMax = 0.0f; } //---------------------------------------------------------------------------------------- @@ -289,37 +282,6 @@ void CFloat32Data3DMemory::_unInit() m_bInitialized = false; } -//---------------------------------------------------------------------------------------- -// Update data statistics, such as minimum and maximum value, after the data has been modified. -void CFloat32Data3DMemory::updateStatistics() -{ - _computeGlobalMinMax(); -} - -//---------------------------------------------------------------------------------------- -// Find the minimum and maximum data value. -void CFloat32Data3DMemory::_computeGlobalMinMax() -{ - // basic checks - ASTRA_ASSERT(m_bInitialized); - ASTRA_ASSERT(m_pfData != NULL); - ASTRA_ASSERT(m_iSize > 0); - - // initial values - m_fGlobalMin = m_pfData[0]; - m_fGlobalMax = m_pfData[0]; - - // loop - size_t i; - float32 v; - for (i = 0; i < m_iSize; ++i) - { - v = m_pfData[i]; - if (v < m_fGlobalMin) m_fGlobalMin = v; - if (v > m_fGlobalMax) m_fGlobalMax = v; - } -} - //---------------------------------------------------------------------------------------- // Copy the data block pointed to by _pfData to the data block pointed to by m_pfData. void CFloat32Data3DMemory::copyData(const float32* _pfData, size_t _iSize) -- cgit v1.2.3 From ebd5fe932fd2d6c4a516bc1cdc69e37aa4f5cf55 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Wed, 8 Feb 2017 10:43:35 +0100 Subject: Make python -sinocone a synonym of -sino. The matlab interface already behaves like this. --- matlab/mex/astra_mex_data3d_c.cpp | 2 +- python/astra/data3d_c.pyx | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) (limited to 'matlab') diff --git a/matlab/mex/astra_mex_data3d_c.cpp b/matlab/mex/astra_mex_data3d_c.cpp index 2dca3b8..f0aa3c8 100644 --- a/matlab/mex/astra_mex_data3d_c.cpp +++ b/matlab/mex/astra_mex_data3d_c.cpp @@ -60,7 +60,7 @@ using namespace astra; //----------------------------------------------------------------------------------------- /** * id = astra_mex_io_data('create', datatype, geometry, data); - * datatype: ['-vol','-sino','-sinocone'] + * datatype: ['-vol','-sino'] */ void astra_mex_data3d_create(int& nlhs, mxArray* plhs[], int& nrhs, const mxArray* prhs[]) { diff --git a/python/astra/data3d_c.pyx b/python/astra/data3d_c.pyx index 1b9293a..3934f22 100644 --- a/python/astra/data3d_c.pyx +++ b/python/astra/data3d_c.pyx @@ -86,7 +86,7 @@ def create(datatype,geometry,data=None, link=False): pDataObject3D = new CFloat32VolumeData3DMemory(pGeometry) del cfg del pGeometry - elif datatype == '-sino' or datatype == '-proj3d': + elif datatype == '-sino' or datatype == '-proj3d' or datatype == '-sinocone': cfg = utils.dictToConfig(six.b('ProjectionGeometry'), geometry) tpe = wrap_from_bytes(cfg.self.getAttribute(six.b('type'))) if (tpe == "parallel3d"): @@ -111,18 +111,6 @@ def create(datatype,geometry,data=None, link=False): pDataObject3D = new CFloat32ProjectionData3DMemory(ppGeometry) del ppGeometry del cfg - elif datatype == "-sinocone": - cfg = utils.dictToConfig(six.b('ProjectionGeometry'), geometry) - pppGeometry = new CConeProjectionGeometry3D() - if not pppGeometry.initialize(cfg[0]): - del cfg - del pppGeometry - raise Exception('Geometry class not initialized.') - if link: - pCustom = new CFloat32CustomPython(data) - pDataObject3D = new CFloat32ProjectionData3DMemory(pppGeometry, pCustom) - else: - pDataObject3D = new CFloat32ProjectionData3DMemory(pppGeometry) else: raise Exception("Invalid datatype. Please specify '-vol' or '-proj3d'.") -- cgit v1.2.3 From 27e23f29f368e06315f2ea381ef38a3affa93c64 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Thu, 16 Feb 2017 14:37:44 +0100 Subject: Remove using namespace std; from headers --- include/astra/Algorithm.h | 2 +- include/astra/ArtAlgorithm.h | 2 +- include/astra/AstraObjectManager.h | 16 +++---- include/astra/BackProjectionAlgorithm.h | 2 +- include/astra/CglsAlgorithm.h | 2 +- include/astra/CudaBackProjectionAlgorithm3D.h | 2 +- include/astra/CudaCglsAlgorithm3D.h | 2 +- include/astra/CudaDartMaskAlgorithm.h | 2 +- include/astra/CudaDartMaskAlgorithm3D.h | 2 +- include/astra/CudaDartSmoothingAlgorithm.h | 2 +- include/astra/CudaDartSmoothingAlgorithm3D.h | 2 +- include/astra/CudaDataOperationAlgorithm.h | 8 ++-- include/astra/CudaFDKAlgorithm3D.h | 2 +- include/astra/CudaForwardProjectionAlgorithm.h | 2 +- include/astra/CudaForwardProjectionAlgorithm3D.h | 2 +- include/astra/CudaReconstructionAlgorithm2D.h | 2 +- include/astra/CudaRoiSelectAlgorithm.h | 2 +- include/astra/CudaSirtAlgorithm3D.h | 2 +- include/astra/FilteredBackProjectionAlgorithm.h | 2 +- include/astra/ForwardProjectionAlgorithm.h | 2 +- include/astra/Globals.h | 4 +- include/astra/ReconstructionAlgorithm2D.h | 2 +- include/astra/ReconstructionAlgorithm3D.h | 2 +- include/astra/SartAlgorithm.h | 2 +- include/astra/SirtAlgorithm.h | 2 +- include/astra/TypeList.h | 4 +- include/astra/XMLDocument.h | 8 ++-- include/astra/XMLNode.h | 56 ++++++++++++------------ matlab/mex/mexHelpFunctions.h | 4 +- 29 files changed, 70 insertions(+), 74 deletions(-) (limited to 'matlab') diff --git a/include/astra/Algorithm.h b/include/astra/Algorithm.h index 2273a83..b0d046f 100644 --- a/include/astra/Algorithm.h +++ b/include/astra/Algorithm.h @@ -61,7 +61,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/ArtAlgorithm.h b/include/astra/ArtAlgorithm.h index 697456a..73f63e3 100644 --- a/include/astra/ArtAlgorithm.h +++ b/include/astra/ArtAlgorithm.h @@ -149,7 +149,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/AstraObjectManager.h b/include/astra/AstraObjectManager.h index 97fde40..579ff27 100644 --- a/include/astra/AstraObjectManager.h +++ b/include/astra/AstraObjectManager.h @@ -194,7 +194,7 @@ int CAstraObjectManager::store(T* _pDataObject) template bool CAstraObjectManager::hasIndex(int _iIndex) const { - typename map::const_iterator it = m_mIndexToObject.find(_iIndex); + typename std::map::const_iterator it = m_mIndexToObject.find(_iIndex); return it != m_mIndexToObject.end(); } @@ -203,7 +203,7 @@ bool CAstraObjectManager::hasIndex(int _iIndex) const template T* CAstraObjectManager::get(int _iIndex) const { - typename map::const_iterator it = m_mIndexToObject.find(_iIndex); + typename std::map::const_iterator it = m_mIndexToObject.find(_iIndex); if (it != m_mIndexToObject.end()) return it->second; else @@ -216,7 +216,7 @@ template void CAstraObjectManager::remove(int _iIndex) { // find data - typename map::iterator it = m_mIndexToObject.find(_iIndex); + typename std::map::iterator it = m_mIndexToObject.find(_iIndex); if (it == m_mIndexToObject.end()) return; // delete data @@ -232,7 +232,7 @@ void CAstraObjectManager::remove(int _iIndex) template int CAstraObjectManager::getIndex(const T* _pObject) const { - for (typename map::const_iterator it = m_mIndexToObject.begin(); it != m_mIndexToObject.end(); it++) { + for (typename std::map::const_iterator it = m_mIndexToObject.begin(); it != m_mIndexToObject.end(); it++) { if ((*it).second == _pObject) return (*it).first; } return 0; @@ -244,7 +244,7 @@ int CAstraObjectManager::getIndex(const T* _pObject) const template void CAstraObjectManager::clear() { - for (typename map::iterator it = m_mIndexToObject.begin(); it != m_mIndexToObject.end(); it++) { + for (typename std::map::iterator it = m_mIndexToObject.begin(); it != m_mIndexToObject.end(); it++) { // delete data delete (*it).second; (*it).second = 0; @@ -257,7 +257,7 @@ void CAstraObjectManager::clear() // Print info to string template std::string CAstraObjectManager::getInfo(int index) const { - typename map::const_iterator it = m_mIndexToObject.find(index); + typename std::map::const_iterator it = m_mIndexToObject.find(index); if (it == m_mIndexToObject.end()) return ""; const T* pObject = it->second; @@ -277,8 +277,8 @@ std::string CAstraObjectManager::info() { std::stringstream res; res << "id init description" << std::endl; res << "-----------------------------------------" << std::endl; - for (typename map::const_iterator it = m_mIndexToObject.begin(); it != m_mIndexToObject.end(); it++) { - res << getInfo(it->first) << endl; + for (typename std::map::const_iterator it = m_mIndexToObject.begin(); it != m_mIndexToObject.end(); it++) { + res << getInfo(it->first) << std::endl; } res << "-----------------------------------------" << std::endl; return res.str(); diff --git a/include/astra/BackProjectionAlgorithm.h b/include/astra/BackProjectionAlgorithm.h index 0d53567..dd67359 100644 --- a/include/astra/BackProjectionAlgorithm.h +++ b/include/astra/BackProjectionAlgorithm.h @@ -122,7 +122,7 @@ public: * * @return Map with all available identifier strings and their values. */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/CglsAlgorithm.h b/include/astra/CglsAlgorithm.h index c7eac73..7ce68bc 100644 --- a/include/astra/CglsAlgorithm.h +++ b/include/astra/CglsAlgorithm.h @@ -149,7 +149,7 @@ public: * * @return Map with all available identifier strings and their values. */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/CudaBackProjectionAlgorithm3D.h b/include/astra/CudaBackProjectionAlgorithm3D.h index 114d6f3..4bf1870 100644 --- a/include/astra/CudaBackProjectionAlgorithm3D.h +++ b/include/astra/CudaBackProjectionAlgorithm3D.h @@ -106,7 +106,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/CudaCglsAlgorithm3D.h b/include/astra/CudaCglsAlgorithm3D.h index 650aa27..138e677 100644 --- a/include/astra/CudaCglsAlgorithm3D.h +++ b/include/astra/CudaCglsAlgorithm3D.h @@ -113,7 +113,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/CudaDartMaskAlgorithm.h b/include/astra/CudaDartMaskAlgorithm.h index 2759add..e364de7 100644 --- a/include/astra/CudaDartMaskAlgorithm.h +++ b/include/astra/CudaDartMaskAlgorithm.h @@ -76,7 +76,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/CudaDartMaskAlgorithm3D.h b/include/astra/CudaDartMaskAlgorithm3D.h index 6dcd365..30ee64f 100644 --- a/include/astra/CudaDartMaskAlgorithm3D.h +++ b/include/astra/CudaDartMaskAlgorithm3D.h @@ -72,7 +72,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/CudaDartSmoothingAlgorithm.h b/include/astra/CudaDartSmoothingAlgorithm.h index dec8b6e..019cbf9 100644 --- a/include/astra/CudaDartSmoothingAlgorithm.h +++ b/include/astra/CudaDartSmoothingAlgorithm.h @@ -76,7 +76,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/CudaDartSmoothingAlgorithm3D.h b/include/astra/CudaDartSmoothingAlgorithm3D.h index 13bc7fc..9aee8ef 100644 --- a/include/astra/CudaDartSmoothingAlgorithm3D.h +++ b/include/astra/CudaDartSmoothingAlgorithm3D.h @@ -72,7 +72,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/CudaDataOperationAlgorithm.h b/include/astra/CudaDataOperationAlgorithm.h index 37391fb..79c5bd6 100644 --- a/include/astra/CudaDataOperationAlgorithm.h +++ b/include/astra/CudaDataOperationAlgorithm.h @@ -75,7 +75,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * @@ -110,10 +110,10 @@ protected: CFloat32Data2D* m_pMask; - vector m_pData; - vector m_fScalar; + std::vector m_pData; + std::vector m_fScalar; - string m_sOperation; + std::string m_sOperation; }; diff --git a/include/astra/CudaFDKAlgorithm3D.h b/include/astra/CudaFDKAlgorithm3D.h index 1c4c622..1189651 100644 --- a/include/astra/CudaFDKAlgorithm3D.h +++ b/include/astra/CudaFDKAlgorithm3D.h @@ -118,7 +118,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/CudaForwardProjectionAlgorithm.h b/include/astra/CudaForwardProjectionAlgorithm.h index 01661b1..95b3312 100644 --- a/include/astra/CudaForwardProjectionAlgorithm.h +++ b/include/astra/CudaForwardProjectionAlgorithm.h @@ -103,7 +103,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/CudaForwardProjectionAlgorithm3D.h b/include/astra/CudaForwardProjectionAlgorithm3D.h index 9dc889e..366e1f6 100644 --- a/include/astra/CudaForwardProjectionAlgorithm3D.h +++ b/include/astra/CudaForwardProjectionAlgorithm3D.h @@ -80,7 +80,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/CudaReconstructionAlgorithm2D.h b/include/astra/CudaReconstructionAlgorithm2D.h index 6852bb8..f7a311a 100644 --- a/include/astra/CudaReconstructionAlgorithm2D.h +++ b/include/astra/CudaReconstructionAlgorithm2D.h @@ -86,7 +86,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information. * diff --git a/include/astra/CudaRoiSelectAlgorithm.h b/include/astra/CudaRoiSelectAlgorithm.h index 1b3f17f..bd46ddf 100644 --- a/include/astra/CudaRoiSelectAlgorithm.h +++ b/include/astra/CudaRoiSelectAlgorithm.h @@ -76,7 +76,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/CudaSirtAlgorithm3D.h b/include/astra/CudaSirtAlgorithm3D.h index a0b8794..cfc5db2 100644 --- a/include/astra/CudaSirtAlgorithm3D.h +++ b/include/astra/CudaSirtAlgorithm3D.h @@ -127,7 +127,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/FilteredBackProjectionAlgorithm.h b/include/astra/FilteredBackProjectionAlgorithm.h index 020c341..6545e7f 100644 --- a/include/astra/FilteredBackProjectionAlgorithm.h +++ b/include/astra/FilteredBackProjectionAlgorithm.h @@ -117,7 +117,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/ForwardProjectionAlgorithm.h b/include/astra/ForwardProjectionAlgorithm.h index cd7a879..02e8894 100644 --- a/include/astra/ForwardProjectionAlgorithm.h +++ b/include/astra/ForwardProjectionAlgorithm.h @@ -155,7 +155,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/Globals.h b/include/astra/Globals.h index 44a77b0..8375726 100644 --- a/include/astra/Globals.h +++ b/include/astra/Globals.h @@ -65,9 +65,9 @@ along with the ASTRA Toolbox. If not, see . #define ASTRA_ASSERT(a) assert(a) -#define ASTRA_CONFIG_CHECK(value, type, msg) if (!(value)) { cout << "Configuration Error in " << type << ": " << msg << endl; return false; } +#define ASTRA_CONFIG_CHECK(value, type, msg) if (!(value)) { std::cout << "Configuration Error in " << type << ": " << msg << std::endl; return false; } -#define ASTRA_CONFIG_WARNING(type, msg) { cout << "Warning in " << type << ": " << msg << endl; } +#define ASTRA_CONFIG_WARNING(type, msg) { std::cout << "Warning in " << type << ": " << msg << sdt::endl; } #define ASTRA_DELETE(a) if (a) { delete a; a = NULL; } diff --git a/include/astra/ReconstructionAlgorithm2D.h b/include/astra/ReconstructionAlgorithm2D.h index 6ee7234..e105a7c 100644 --- a/include/astra/ReconstructionAlgorithm2D.h +++ b/include/astra/ReconstructionAlgorithm2D.h @@ -116,7 +116,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information. * diff --git a/include/astra/ReconstructionAlgorithm3D.h b/include/astra/ReconstructionAlgorithm3D.h index 010443f..0bbae2d 100644 --- a/include/astra/ReconstructionAlgorithm3D.h +++ b/include/astra/ReconstructionAlgorithm3D.h @@ -117,7 +117,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information. * diff --git a/include/astra/SartAlgorithm.h b/include/astra/SartAlgorithm.h index 5f39c3a..f1bd47a 100644 --- a/include/astra/SartAlgorithm.h +++ b/include/astra/SartAlgorithm.h @@ -184,7 +184,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/SirtAlgorithm.h b/include/astra/SirtAlgorithm.h index 70bc3cf..a4b57f8 100644 --- a/include/astra/SirtAlgorithm.h +++ b/include/astra/SirtAlgorithm.h @@ -191,7 +191,7 @@ public: * * @return Map with all available identifier strings and their values. */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/TypeList.h b/include/astra/TypeList.h index 7460969..e7d7137 100644 --- a/include/astra/TypeList.h +++ b/include/astra/TypeList.h @@ -219,10 +219,10 @@ namespace typelist { template struct functor_find { functor_find() { res = NULL; } - bool operator() (string name) { + bool operator() (std::string name) { return strcmp(tofind.c_str(), name.c_str()) == 0; } - string tofind; + std::string tofind; Base* res; }; diff --git a/include/astra/XMLDocument.h b/include/astra/XMLDocument.h index e25d398..fc8b29f 100644 --- a/include/astra/XMLDocument.h +++ b/include/astra/XMLDocument.h @@ -41,8 +41,6 @@ namespace rapidxml { #include "Globals.h" #include "XMLNode.h" -using namespace std; - namespace astra { /** This class encapsulates an XML Document of the Xerces DOM Parser. @@ -64,14 +62,14 @@ public: * @param sFilename Location of the XML file. * @return XML Document containing the DOM tree */ - static XMLDocument* readFromFile(string sFilename); + static XMLDocument* readFromFile(std::string sFilename); /** Construct an empty XML DOM tree with a specific root tag. * * @param sRootName Element name of the root tag. * @return XML Document with an empty root node */ - static XMLDocument* createDocument(string sRootName); + static XMLDocument* createDocument(std::string sRootName); /** Get the rootnode of the XML document * @@ -83,7 +81,7 @@ public: * * @param sFilename Location of the XML file. */ - void saveToFile(string sFilename); + void saveToFile(std::string sFilename); /** convert and XML DOM tree to a string */ diff --git a/include/astra/XMLNode.h b/include/astra/XMLNode.h index 5e1908a..de5a052 100644 --- a/include/astra/XMLNode.h +++ b/include/astra/XMLNode.h @@ -43,8 +43,6 @@ namespace rapidxml { #include "Globals.h" #include "Utilities.h" -using namespace std; - namespace astra { /** @@ -73,14 +71,14 @@ public: * @param _sName tagname of the requested child node * @return first child node with the correct tagname, null pointer if it doesn't exist */ - XMLNode getSingleNode(string _sName) const; + XMLNode getSingleNode(std::string _sName) const; /** Get all child XML nodes that have the tagname name * * @param _sName tagname of the requested child nodes * @return list with all child nodes with the correct tagname */ - std::list getNodes(string _sName) const; + std::list getNodes(std::string _sName) const; /** Get all child XML nodes * @@ -98,7 +96,7 @@ public: * * @return node content */ - string getContent() const; + std::string getContent() const; /** Get the content of the XML node as an integer * @@ -122,15 +120,15 @@ public: * * @return node content */ - vector getContentArray() const; + std::vector getContentArray() const; /** Get the content of the XML node as a stl container of float32 data. * NB: A 2D matrix is returned as a linear list * * @return node content */ - vector getContentNumericalArray() const; - vector getContentNumericalArrayDouble() const; + std::vector getContentNumericalArray() const; + std::vector getContentNumericalArrayDouble() const; @@ -139,7 +137,7 @@ public: * @param _sName of the attribute. * @return attribute value, empty string if it doesn't exist. */ - bool hasAttribute(string _sName) const; + bool hasAttribute(std::string _sName) const; /** Get the value of an attribute. * @@ -147,7 +145,7 @@ public: * @param _sDefaultValue value to return if the attribute isn't found * @return attribute value, _sDefaultValue if it doesn't exist. */ - string getAttribute(string _sName, string _sDefaultValue = "") const; + std::string getAttribute(std::string _sName, std::string _sDefaultValue = "") const; /** Get the value of a numerical attribute. * @@ -155,9 +153,9 @@ public: * @param _fDefaultValue value to return if the attribute isn't found * @return attribute value, _fDefaultValue if it doesn't exist. */ - float32 getAttributeNumerical(string _sName, float32 _fDefaultValue = 0) const; - double getAttributeNumericalDouble(string _sName, double _fDefaultValue = 0) const; - int getAttributeInt(string _sName, int _fDefaultValue = 0) const; + float32 getAttributeNumerical(std::string _sName, float32 _fDefaultValue = 0) const; + double getAttributeNumericalDouble(std::string _sName, double _fDefaultValue = 0) const; + int getAttributeInt(std::string _sName, int _fDefaultValue = 0) const; /** Get the value of a boolean attribute. * @@ -165,7 +163,7 @@ public: * @param _bDefaultValue value to return if the attribute isn't found * @return attribute value, _bDefaultValue if it doesn't exist. */ - bool getAttributeBool(string _sName, bool _bDefaultValue = false) const; + bool getAttributeBool(std::string _sName, bool _bDefaultValue = false) const; @@ -175,7 +173,7 @@ public: * @param _sKey option key * @return true if option does exist */ - bool hasOption(string _sKey) const; + bool hasOption(std::string _sKey) const; /** Get the value of an option within this XML Node * @@ -183,7 +181,7 @@ public: * @param _sDefaultValue value to return if key isn't found * @return option value, _sDefaultValue if the option doesn't exist */ - string getOption(string _sKey, string _sDefaultValue = "") const; + std::string getOption(std::string _sKey, std::string _sDefaultValue = "") const; /** Get the value of an option within this XML Node * @@ -191,8 +189,8 @@ public: * @param _fDefaultValue value to return if key isn't found * @return option value, _fDefaultValue if the option doesn't exist */ - float32 getOptionNumerical(string _sKey, float32 _fDefaultValue = 0) const; - int getOptionInt(string _sKey, int _fDefaultValue = 0) const; + float32 getOptionNumerical(std::string _sKey, float32 _fDefaultValue = 0) const; + int getOptionInt(std::string _sKey, int _fDefaultValue = 0) const; /** Get the value of an option within this XML Node * @@ -200,14 +198,14 @@ public: * @param _bDefaultValue value to return if key isn't found * @return option value, _bDefaultValue if the option doesn't exist */ - bool getOptionBool(string _sKey, bool _bDefaultValue = false) const; + bool getOptionBool(std::string _sKey, bool _bDefaultValue = false) const; /** Get the value of an option within this XML Node * * @param _sKey option key * @return numerical array */ - vector getOptionNumericalArray(string _sKey) const; + std::vector getOptionNumericalArray(std::string _sKey) const; @@ -218,7 +216,7 @@ public: * @param _sNodeName the name of the new childnode * @return new child node */ - XMLNode addChildNode(string _sNodeName); + XMLNode addChildNode(std::string _sNodeName); /** Create a new XML node as a child to this one, also add some content: * <...><_sNodeName>_sValue</_sNodeName></...> @@ -227,7 +225,7 @@ public: * @param _sValue some node content * @return new child node */ - XMLNode addChildNode(string _sNodeName, string _sValue); + XMLNode addChildNode(std::string _sNodeName, std::string _sValue); /** Create a new XML node as a child to this one, also add some numerical content: * <...><_sNodeName>_sValue</_sNodeName></...> @@ -236,7 +234,7 @@ public: * @param _fValue some node content * @return new child node */ - XMLNode addChildNode(string _sNodeName, float32 _fValue); + XMLNode addChildNode(std::string _sNodeName, float32 _fValue); /** Create a new XML node as a child to this one, also add a list of numerical content: * <...><_sNodeName>_sValue</_sNodeName></...> @@ -246,13 +244,13 @@ public: * @param _iSize number of elements in _pfList * @return new child node */ - XMLNode addChildNode(string _sNodeName, float32* _pfList, int _iSize); + XMLNode addChildNode(std::string _sNodeName, float32* _pfList, int _iSize); /** Add some text to the node: <...>_sText</...> * * @param _sText text to insert */ - void setContent(string _sText); + void setContent(std::string _sText); /** Add a number to the node: <...>_sText</...> * @@ -297,28 +295,28 @@ public: * @param _sName name of the attribute * @param _sValue value of the attribute */ - void addAttribute(string _sName, string _sValue); + void addAttribute(std::string _sName, std::string _sValue); /** Add an attribute with numerical data to this node: <... _sName="_fValue"> * * @param _sName name of the attribute * @param _sValue value of the attribute */ - void addAttribute(string _sName, float32 _fValue); + void addAttribute(std::string _sName, float32 _fValue); /** Add an option node as a child: <Option key="<_sKey>" value="<_sValue>"/> * * @param _sKey option key * @param _sValue option value */ - void addOption(string _sKey, string _sValue); + void addOption(std::string _sKey, std::string _sValue); /** Add an option node as a child: <Option key="<_sKey>" value="<_sValue>"/> * * @param _sKey option key * @param _sValue option value */ - void addOption(string _sKey, float32 _fValue); + void addOption(std::string _sKey, float32 _fValue); /** Print to String diff --git a/matlab/mex/mexHelpFunctions.h b/matlab/mex/mexHelpFunctions.h index 9b564c5..37ca894 100644 --- a/matlab/mex/mexHelpFunctions.h +++ b/matlab/mex/mexHelpFunctions.h @@ -46,7 +46,7 @@ along with the ASTRA Toolbox. If not, see . #include "astra/XMLNode.h" // utility functions -string mexToString(const mxArray* pInput); +std::string mexToString(const mxArray* pInput); bool mexIsScalar(const mxArray* pInput); void get3DMatrixDims(const mxArray* x, mwSize *dims); @@ -55,7 +55,7 @@ mxArray* vectorToMxArray(std::vector mInput); mxArray* anyToMxArray(boost::any _any); // turn a MATLAB struct into a Config object -astra::Config* structToConfig(string rootname, const mxArray* pStruct); +astra::Config* structToConfig(std::string rootname, const mxArray* pStruct); bool structToXMLNode(astra::XMLNode node, const mxArray* pStruct); bool optionsToXMLNode(astra::XMLNode node, const mxArray* pOptionStruct); std::map parseStruct(const mxArray* pInput); -- cgit v1.2.3 From b51e404d3be18b9b1e39e6e3548eed9ddb586ea7 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Fri, 3 Feb 2017 16:55:32 +0100 Subject: Use standard _OPENMP directive for checking openmp --- matlab/mex/mexCopyDataHelpFunctions.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'matlab') diff --git a/matlab/mex/mexCopyDataHelpFunctions.cpp b/matlab/mex/mexCopyDataHelpFunctions.cpp index a172a03..74f0538 100644 --- a/matlab/mex/mexCopyDataHelpFunctions.cpp +++ b/matlab/mex/mexCopyDataHelpFunctions.cpp @@ -29,12 +29,10 @@ along with the ASTRA Toolbox. If not, see . #include "mexHelpFunctions.h" -#define HAVE_OMP - #define ROUND_DOWN(x, s) ((x) & ~((s)-1)) -#ifdef HAVE_OMP -# include +#ifdef _OPENMP +#include #endif #if defined(__SSE2__) -- cgit v1.2.3