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. --- matlab/mex/mexDataManagerHelpFunctions.cpp | 2 +- matlab/mex/octave_support.cpp | 44 ++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 matlab/mex/octave_support.cpp (limited to 'matlab') 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 --- 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 ------------- 19 files changed, 8611 deletions(-) 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/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 --- 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 +++++++++++++++++++++++++ 9 files changed, 2766 insertions(+) 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/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) --- 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 +++--- matlab/algorithms/DART/tools/DARToptimizerBoneStudy.m | 6 +++--- matlab/algorithms/DART/tools/ProjDiffOptimFunc.m | 6 +++--- matlab/algorithms/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 +++---- 84 files changed, 253 insertions(+), 289 deletions(-) (limited to 'matlab') 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); -- 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 --- matlab/mex/astra_mex_data3d_c.cpp | 4 ---- matlab/mex/mexDataManagerHelpFunctions.cpp | 11 ----------- matlab/mex/mexDataManagerHelpFunctions.h | 2 -- 3 files changed, 17 deletions(-) (limited to 'matlab') diff --git a/matlab/mex/astra_mex_data3d_c.cpp b/matlab/mex/astra_mex_data3d_c.cpp index 7909a79..2dca3b8 100644 --- a/matlab/mex/astra_mex_data3d_c.cpp +++ b/matlab/mex/astra_mex_data3d_c.cpp @@ -103,7 +103,6 @@ void astra_mex_data3d_create(int& nlhs, mxArray* plhs[], int& nrhs, const mxArra copyMexToCFloat32Array(data, pDataObject3D->getData(), pDataObject3D->getSize()); } - pDataObject3D->updateStatistics(); // step4: store data object int iIndex = CData3DManager::getSingleton().store(pDataObject3D); @@ -162,8 +161,6 @@ void astra_mex_data3d_link(int& nlhs, mxArray* plhs[], int& nrhs, const mxArray* return; } - //pDataObject3D->updateStatistics(); - // step4: store data object int iIndex = CData3DManager::getSingleton().store(pDataObject3D); @@ -234,7 +231,6 @@ void astra_mex_data3d_store(int nlhs, mxArray* plhs[], int nrhs, const mxArray* } copyMexToCFloat32Array(prhs[2], pDataObject->getData(), pDataObject->getSize()); - pDataObject->updateStatistics(); } void astra_mex_data3d_dimensions(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) diff --git a/matlab/mex/mexDataManagerHelpFunctions.cpp b/matlab/mex/mexDataManagerHelpFunctions.cpp index ebf6f8f..c47ee27 100644 --- a/matlab/mex/mexDataManagerHelpFunctions.cpp +++ b/matlab/mex/mexDataManagerHelpFunctions.cpp @@ -164,17 +164,6 @@ checkDataSize(const mxArray * const mArray, && (zOffset + geom->getGridSliceCount()) <= dims[2]); } -//----------------------------------------------------------------------------------------- -void -updateStatistics(const std::vector & 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 &, -- 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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[]) { -- 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 --- matlab/mex/mexHelpFunctions.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'matlab') 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