comparison libinterp/corefcn/graphics.in.h @ 20309:140ce5e857bf

maint: Periodic merge of stable to default.
author Rik <rik@octave.org>
date Tue, 23 Jun 2015 20:00:59 -0700
parents 530803d4f65f b8c1b3e9aa91
children 6db2ea5556a4
comparison
equal deleted inserted replaced
20307:c2206fda3986 20309:140ce5e857bf
1459 1459
1460 void add_constraint (octave_idx_type len) 1460 void add_constraint (octave_idx_type len)
1461 { 1461 {
1462 size_constraints.remove (dim_vector (1, -1)); 1462 size_constraints.remove (dim_vector (1, -1));
1463 size_constraints.remove (dim_vector (-1, 1)); 1463 size_constraints.remove (dim_vector (-1, 1));
1464 size_constraints.remove (dim_vector (0, 0));
1464 1465
1465 add_constraint (dim_vector (1, len)); 1466 add_constraint (dim_vector (1, len));
1466 add_constraint (dim_vector (len, 1)); 1467 add_constraint (dim_vector (len, 1));
1467 } 1468 }
1468 1469
4740 4741
4741 protected: 4742 protected:
4742 void init (void) 4743 void init (void)
4743 { 4744 {
4744 xdata.add_constraint (2); 4745 xdata.add_constraint (2);
4746 xdata.add_constraint (dim_vector (0, 0));
4745 ydata.add_constraint (2); 4747 ydata.add_constraint (2);
4748 ydata.add_constraint (dim_vector (0, 0));
4746 cdata.add_constraint ("double"); 4749 cdata.add_constraint ("double");
4747 cdata.add_constraint ("single"); 4750 cdata.add_constraint ("single");
4748 cdata.add_constraint ("logical"); 4751 cdata.add_constraint ("logical");
4749 cdata.add_constraint ("uint8"); 4752 cdata.add_constraint ("uint8");
4750 cdata.add_constraint ("uint16"); 4753 cdata.add_constraint ("uint16");