changeset 15886:942d3b0a034e

maint: periodic merge of stable to default
author John W. Eaton <jwe@octave.org>
date Thu, 03 Jan 2013 11:19:47 -0500
parents 9ede91b3872b (current diff) 065bc7944335 (diff)
children fde9297ae074
files libinterp/dldfcn/convhulln.cc
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/dldfcn/convhulln.cc	Thu Jan 03 03:05:16 2013 -0500
+++ b/libinterp/dldfcn/convhulln.cc	Thu Jan 03 11:19:47 2013 -0500
@@ -179,7 +179,7 @@
         {
           octave_idx_type j = 0;
 
-          if (! nonsimp_seen && ! facet->simplicial)
+          if (! (nonsimp_seen || facet->simplicial || qh hull_dim == 2))
             {
               nonsimp_seen = true;
 
@@ -313,4 +313,9 @@
 %! h = sortrows (sort (h, 2), [1 2 3]);
 %! assert (h, [1 2 3;1 2 4; 1 3 4; 2 3 4]);
 %! assert (v, 8/3, 10*eps);
+
+%!testif HAVE_QHULL
+%! triangle=[0 0; 1 1; 1 0; 1 2];
+%! h = convhulln (triangle);
+%! assert (size (h), [3 2]);
 */