summaryrefslogtreecommitdiffstats
path: root/matlab/mex
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Remove (long) obsolete fileWillem Jan Palenstijn2016-01-051-124/+0
| |/
| * Merge pull request #73 from dmpelt/python-pluginsWillem Jan Palenstijn2015-12-042-0/+135
| |\ | | | | | | Add support for Python algorithm plugins
| | * Merge branch 'master' into python-pluginsWillem Jan Palenstijn2015-12-0111-16/+1293
| | |\ | | | | | | | | | | | | | | | | Conflicts: python/astra/utils.pyx
| | * | Allow registering plugins without explicit name, and fix exception handling ↵Daniel M. Pelt2015-07-231-15/+8
| | | | | | | | | | | | | | | | when running in Matlab
| | * | Fix numpy lapack loading when running in MatlabDaniel M. Pelt2015-07-231-0/+3
| | | |
| | * | Add support for Python algorithm pluginsDaniel M. Pelt2015-07-231-0/+139
| | | |
| * | | Fix Windows builds of astra_mex_directWillem Jan Palenstijn2015-12-022-0/+20
| | |/ | |/|
| * | astra_mex_direct: Don't initialize newly allocated mxArrayNicola Vigano2015-10-091-2/+18
| | | | | | | | | | | | | | | This avoids letting matlab initialize the memory we will overwrite shortly after.
| * | Build astra_mex_direct in MSVCWillem Jan Palenstijn2015-10-072-0/+918
| | |
| * | Add astra_mex_direct('FP3D'/'BP3D', ...)Willem Jan Palenstijn2015-10-071-0/+332
| | |
| * | Use mxLogical instead of bool.Willem Jan Palenstijn2015-09-172-3/+3
| | | | | | | | | | | | This should improve compatibility with Octave according to Christian Häggström.
| * | Fix formatting when passing strings to log from high-level codeDaniel M. Pelt2015-07-172-5/+5
| | |
| * | Fix memory leak in configuration codeDaniel M. Pelt2015-06-252-5/+12
| | |
| * | Fix config to struct/dict translation for array optionsDaniel M. Pelt2015-06-241-1/+5
| | |
| * | Fix matlab compilation without CUDADaniel M. Pelt2015-06-201-2/+2
| |/
* | Merge remote-tracking branch 'upstream/master' into parallel_vecWim van Aarle2015-05-2631-1720/+3387
|\| | | | | | | | | | | | | | | Conflicts: astra_vc11.vcxproj.filters python/astra/functions.py src/ParallelBeamBlobKernelProjector2D.cpp src/ProjectionGeometry2D.cpp
| * Make XML array handling consistentWillem Jan Palenstijn2015-05-061-20/+2
| | | | | | | | setContent and getContent were using different XML formats previously.
| * Change XMLNode* to XMLNodeWillem Jan Palenstijn2015-05-066-42/+36
| | | | | | | | An XMLNode object is already simply a pointer, so no need to dynamically allocate XMLNodes.
| * Fix bug in astra_mex_data3d('create') zero-initializationWillem Jan Palenstijn2015-04-151-1/+1
| |
| * Add astra_mex_data3d('change_geometry', ...)Willem Jan Palenstijn2015-04-101-1/+109
| |
| * Check input to mex_data3d/link is singleWillem Jan Palenstijn2015-04-101-2/+2
| |
| * Fix indentationWillem Jan Palenstijn2015-03-201-92/+92
| |
| * Fix commentWillem Jan Palenstijn2015-03-201-2/+2
| |
| * Add MSVC project filesWillem Jan Palenstijn2015-03-2016-0/+988
| |
| * Merge branch 'master' into loggingWillem Jan Palenstijn2015-03-2014-1660/+1896
| |\
| | * Generate MSVC 2008/2012 project files with a Python scriptWillem Jan Palenstijn2015-03-1914-1660/+1896
| | |
| * | Enable logging to Matlab window using callback functionDaniel M. Pelt2015-03-1311-0/+57
| | | | | | | | | | | | | | | Also introduces a mex initialize function that is called at the first invocation of any mex method.
| * | Add logging support to MatlabDaniel M. Pelt2015-03-131-0/+302
| |/
* / created parallel_vec geometry classWim van Aarle2015-03-031-0/+5
|/
* Merge pull request #20 from wvaarle/matlab-get-geometryWillem Jan Palenstijn2015-02-2711-623/+407
|\ | | | | 'get_geometry' functions in the matlab layer
| * code cleanupWim van Aarle2015-02-2611-518/+288
| |
| * get_geometry now uses XML config object (for projections)Wim van Aarle2015-02-266-266/+96
| |
| * get_geometry now uses XML config object (for volumes)Wim van Aarle2015-02-254-38/+80
| |
| * re-enabled get_geometry for 3d projectorsWim van Aarle2015-02-241-8/+8
| |
| * added get_geometry for 3d projection data objectsWim van Aarle2015-02-243-10/+123
| |
| * fixed get_geometry for fanflat_vecWim van Aarle2015-02-242-35/+41
| |
| * added get_geometry for 3d volume objectsWim van Aarle2015-02-243-53/+76
| |
* | Fix include orderWillem Jan Palenstijn2015-02-261-1/+1
| |
* | Moved pthreads defines to Globals.hDaan Pelt2015-02-251-1/+1
|/
* Added support for logical matrices in mex_data3dWim van Aarle2015-02-245-23/+53
| | | | | Did not accelerate using sse2, as no intrinsics exist to convert 8-bit to 32-bit.
* Update copyright to -2015Willem Jan Palenstijn2015-01-2610-20/+20
|
* Update copyright headersWillem Jan Palenstijn2015-01-1910-50/+50
|
* Implement loading geometries into Projector3DWillem Jan Palenstijn2014-12-081-1/+1
|
* Remove unused stubs from mex_data3dWillem Jan Palenstijn2014-12-051-430/+2
|
* Add VS2012 build filesWillem Jan Palenstijn2014-12-048-0/+2316
|
* Refactor astra_mex_data3dWillem Jan Palenstijn2014-12-045-492/+822
| | | | (Modified) patch by Nicola Viganò
* Avoid mxIsSharedArrayWillem Jan Palenstijn2014-11-241-0/+6
| | | | Matlab R2014b no longer seems to support it.
* Verify data is not sparse in astra_mex_data2dWillem Jan Palenstijn2014-07-231-0/+8
|
* Fix geometry memory leak in astra_mex_data3d create/linkWillem Jan Palenstijn2014-05-021-2/+3
|
* Add SIRT-Weighted BP3D (par3d-only) for use in large BPWillem Jan Palenstijn2014-05-021-0/+4
|