csa/tomo/tnv/regularization.git/main_func/regularizers_CPU, branch fast_tnv

all Matlab related stuff have been moved to wrappers

2018-01-25T11:21:12+00:00

Merge branch 'master' of https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize

2017-10-24T13:41:20+00:00

GH-OS fixed, demos updated, add_artifacts function

2017-10-19T21:16:43+00:00

Merge branch 'pythonize' of https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize

2017-10-11T15:04:49+00:00

 Conflicts:
	demos/exportDemoRD2Data.m
	main_func/regularizers_CPU/FGP_TV_core.h
	main_func/regularizers_CPU/LLT_model.c
	src/Python/test/readhd5.py
	src/Python/test_reconstructor.py
	src/Python/test_regularizers.py

removed copyIm

2017-10-11T14:38:09+00:00

typo

2017-10-11T14:38:09+00:00

typo and include matrix.h

2017-10-11T14:38:09+00:00

extern C fix

2017-10-11T14:38:09+00:00

extern C function called by C++

2017-10-11T14:38:08+00:00

adds extern "C" to the definition of the functions if the code is called
from C++ rather than from C/Matlab

removed definition of CopyImage

2017-10-11T14:32:34+00:00