Merge pull request #232 from amroamroamro/cv310

followup fixes to PR#231
kyamagu · Feb 16, 2016 · 4eeb765 · 4eeb765
2 parents 3737945 + c11ed06
commit 4eeb765
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/opencv_contrib/+cv/DisparityWLSFilter.m b/opencv_contrib/+cv/DisparityWLSFilter.m
@@ -427,7 +427,13 @@ function load(this, fname_or_str, varargin)
             end
 
             % object properties (as name/value pairs)
-            p = properties(matcher);
+            %p = properties(matcher);  % HACK: Octave doesnt like this, throws syntax error!
+            mc = metaclass(matcher);
+            if ~mexopencv.isOctave() && isprop(mc, 'PropertyList')
+                p = {mc.PropertyList.Name};
+            else
+                p = cellfun(@(x) x.Name, mc.Properties, 'UniformOutput',false);
+            end
             for i=1:numel(p)
                 if strcmp(p{i}, 'id'), continue; end
                 C{end+1} = p{i};

diff --git a/opencv_contrib/test/unit_tests/TestSuperpixelLSC.m b/opencv_contrib/test/unit_tests/TestSuperpixelLSC.m
@@ -3,6 +3,12 @@
 
     methods (Static)
         function test_1
+            %TODO: OpenCV's SuperpixelLSC is buggy; sometimes crashes MATLAB when called repeatedly
+            if true
+                disp('SKIP');
+                return;
+            end
+
             img = cv.imread(fullfile(mexopencv.root(),'test','fruits.jpg'), ...
                 'Color',true, 'ReduceScale',2);
             lab = cv.cvtColor(img, 'RGB2Lab');