summaryrefslogtreecommitdiffstats
path: root/src/ParallelProjectionGeometry2D.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into parvecWillem Jan Palenstijn2016-07-281-1/+5
|\
| * Replace boost::lexical_cast by stringstreamsWillem Jan Palenstijn2016-01-051-1/+0
| | | | | | | | | | | | This is to avoid the dependence of lexical_cast on the current locale. The stringstreams used for the new string parsing/output functions are explicitly imbued with the C/classic locale.
| * Add extra null check for ExtraDetectorOffsetDaniel M. Pelt2015-06-251-3/+5
| |
| * Include ExtraDetectorOffset in returned configurationDaniel M. Pelt2015-06-241-0/+3
| |
* | Merge remote-tracking branch 'upstream/master' into parallel_vecWim van Aarle2015-05-261-4/+4
|\| | | | | | | | | | | | | | | Conflicts: astra_vc11.vcxproj.filters python/astra/functions.py src/ParallelBeamBlobKernelProjector2D.cpp src/ProjectionGeometry2D.cpp
| * Change XMLNode* to XMLNodeWillem Jan Palenstijn2015-05-061-4/+4
| | | | | | | | An XMLNode object is already simply a pointer, so no need to dynamically allocate XMLNodes.
* | removed extraDetectorOffsetWim van Aarle2015-03-131-2/+1
| |
* | parallel projectors now always use vector geometries internallyWim van Aarle2015-03-121-1/+21
|/
* 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/+186