LFFiltShiftSum removed dependency on stats toolbox functions nansum etc

doda42 · Apr 18, 2023 · 0d6ddbb · 0d6ddbb
1 parent 5dd4a8a
commit 0d6ddbb
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -3,6 +3,11 @@ Copyright (c) 2013-2020 Donald G. Dansereau
 
 Please refer to README.md and LFToolbox.pdf for installation instructions and further information.
 
+---v0.5.2----------------------------------------------------------------------
+Minor bug fixes
+
+- LFFiltShiftSum removed dependency on stats toolbox functions nansum etc, should be compatible with newer matlab versions, tested on 2022b
+
 ---v0.5.1----------------------------------------------------------------------
 Minor bug fixes and improvements
 

diff --git a/Doc/LFToolbox.tex b/Doc/LFToolbox.tex
@@ -42,7 +42,7 @@
 
 \title{
 Light Field Toolbox for Matlab\\
-{\large v0.5.1}
+{\large v0.5.2}
 }
 
 

diff --git a/LFFiltShiftSum.m b/LFFiltShiftSum.m
@@ -159,14 +159,14 @@
 
 switch( lower(FiltOptions.FlattenMethod) )
 	case 'sum'
-		ImgOut = squeeze(nansum(nansum(LF,1),2));
+		ImgOut = squeeze(sum(LF,[1,2], 'omitnan'));
 	case 'max'
-		ImgOut = squeeze(nanmax(nanmax(LF,[],1),[],2));
+		ImgOut = squeeze(max(LF, [], [1,2], 'omitnan'));
 	case 'min'
-		ImgOut = squeeze(nanmin(nanmin(LF,[],1),[],2));
+		ImgOut = squeeze(min(LF, [], [1,2], 'omitnan'));
 	case 'median'
 		t = reshape(LF(:,:,:,:,1:NColChans), [prod(LFSize(1:2)), NewLFSize(3:4), NColChans]);
-		ImgOut = squeeze(nanmedian(t));
+		ImgOut = squeeze(median(t, 'omitnan'));
 	otherwise
 		error('Unrecognized method');
 end

diff --git a/LFToolbox.pdf b/LFToolbox.pdf
diff --git a/README.md b/README.md
@@ -18,6 +18,8 @@ Sample data:
 * Additional datasets and community links at [dgd.vision](http://dgd.vision/Tools/LFToolbox)
 
 ## What's New / Development Plan
+v0.5.2: bug fixes, see CHANGELOG.txt
+
 v0.5.1: bug fixes, documentation improvements, see CHANGELOG.txt
 
 v0.5 introduces new features, bug fixes, and performance improvements. Highlights:

diff --git a/SupportFunctions/LFToolboxVersion.m b/SupportFunctions/LFToolboxVersion.m
@@ -3,4 +3,4 @@
 % Copyright (c) 2013-2020 Donald G. Dansereau
 
 function VersionStr = LFToolboxVersion
-VersionStr = 'v0.5.1';
+VersionStr = 'v0.5.2';
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,7 +42,7 @@ @@
     \title{
     Light Field Toolbox for Matlab\\
-    {\large v0.5.1}
+    {\large v0.5.2}
     }
@@ Expand Down @@