Merge branch 'master' into dgursoy-patch-1

tomopy · Nov 12, 2021 · 735f451 · 735f451
2 parents f318814 + f95e099
commit 735f451
Show file tree

Hide file tree

Showing 9 changed files with 248 additions and 103 deletions.
diff --git a/doc/source/api/tomopy.misc.corr.rst b/doc/source/api/tomopy.misc.corr.rst
@@ -9,12 +9,13 @@
    .. rubric:: **Functions:**
 
    .. autosummary::
-   
+
       adjust_range
       circ_mask
       gaussian_filter
       median_filter
       median_filter_cuda
+      median_filter_nonfinite
       sobel_filter
       remove_nan
       remove_neg

diff --git a/source/include/gridrec/gridrec.h b/source/include/gridrec/gridrec.h
@@ -57,7 +57,7 @@ extern "C"
 
     DLL void gridrec(const float* data, int dy, int dt, int dx, const float* center,
                      const float* theta, float* recon, int ngridx, int ngridy,
-                     const char fname[16], const float* filter_par);
+                     const char* fname, const float* filter_par);
 
 #ifdef __cplusplus
 }

diff --git a/source/include/recon/recon.h b/source/include/recon/recon.h
@@ -60,7 +60,7 @@ void DLL
 
 void DLL
      fbp(const float* data, int dy, int dt, int dx, const float* center, const float* theta,
-         float* recon, int ngridx, int ngridy, const char name[16], const float* filter_par);
+         float* recon, int ngridx, int ngridy, const char* name, const float* filter_par);
 
 void DLL
      grad(const float* data, int dy, int dt, int dx, const float* center, const float* theta,