summaryrefslogtreecommitdiffstats
path: root/src/FanFlatProjectionGeometry2D.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into parallel_vecWim van Aarle2015-05-261-12/+10
|\ | | | | | | | | | | | | | | Conflicts: astra_vc11.vcxproj.filters python/astra/functions.py src/ParallelBeamBlobKernelProjector2D.cpp src/ProjectionGeometry2D.cpp
| * Change XMLNode* to XMLNodeWillem Jan Palenstijn2015-05-061-12/+10
| | | | | | | | An XMLNode object is already simply a pointer, so no need to dynamically allocate XMLNodes.
* | updated 'line_fanflat' projectorWim van Aarle2015-03-121-0/+18
|/
* get_geometry now uses XML config object (for projections)Wim van Aarle2015-02-261-0/+14
|
* Update copyright to -2015Willem Jan Palenstijn2015-01-261-2/+2
|
* Update copyright headersWillem Jan Palenstijn2015-01-191-5/+5
|
* Update version to 1.3Willem Jan Palenstijn2013-07-011-0/+209