# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1357229987 18000
# Node ID 942d3b0a034e7458f6908b3e29142a20a58cb2cc
# Parent  9ede91b3872bc1322cafe952bd256d3ec7cb834a# Parent  065bc79443350b77397102c9febb5dab85a61c1a
maint: periodic merge of stable to default

diff -r 9ede91b3872b -r 942d3b0a034e libinterp/dldfcn/convhulln.cc
--- 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]);
 */