Mercurial > hg > octave-max
changeset 11093:d748acc75658
gl-render.cc: Treat images with scalar unique(x/ydata) like Matlab.
| author | Ben Abbott <bpabbott@mac.com> |
|---|---|
| date | Sat, 09 Oct 2010 11:42:22 -0400 |
| parents | 8b9aeb20c03c |
| children | add5beb3b845 |
| files | src/ChangeLog src/gl-render.cc |
| diffstat | 2 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2010-10-09 Ben Abbott <bpabbott@mac.com> + + * gl-render.cc: Treat images with scalar unique(x/ydata) like Matlab. + 2010-10-08 John W. Eaton <jwe@octave.org> * octave.cc (maximum_braindamage):
--- a/src/gl-render.cc +++ b/src/gl-render.cc @@ -2703,8 +2703,15 @@ int h = dv(0), w = dv(1); bool ok = true; - const Matrix x = props.get_xdata ().matrix_value (); - const Matrix y = props.get_ydata ().matrix_value (); + Matrix x = props.get_xdata ().matrix_value (); + Matrix y = props.get_ydata ().matrix_value (); + + if (w > 1 && x(1) == x(0)) + x(1) = x(1) + (w-1); + + if (h > 1 && y(1) == y(0)) + y(1) = y(1) + (h-1); + const ColumnVector p0 = xform.transform (x(0), y(0), 0); const ColumnVector p1 = xform.transform (x(1), y(1), 0);