Mercurial > octave-nkf
diff libinterp/corefcn/graphics.cc @ 19628:fe689210525c gui-release
maint: Periodic merge of stable to gui-release.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 20 Jan 2015 10:05:42 -0500 |
parents | 27f5d1607b84 446c46af4b42 |
children | be7ac98fab43 |
line wrap: on
line diff
--- a/libinterp/corefcn/graphics.cc Mon Jan 19 07:04:12 2015 +0100 +++ b/libinterp/corefcn/graphics.cc Tue Jan 20 10:05:42 2015 -0500 @@ -3779,7 +3779,7 @@ else if (std::abs (sz(0) - 182.0 * mm2in) + std::abs (sz(1) - 257.0 * mm2in) < tol) typ = "b5"; - else if (std::abs (sz(0) - 9.0) + else if (std::abs (sz(0) - 9.0) + std::abs (sz(1) - 12.0) < tol) typ = "arch-a"; else if (std::abs (sz(0) - 12.0) @@ -3794,7 +3794,7 @@ else if (std::abs (sz(0) - 36.0) + std::abs (sz(1) - 48.0) < tol) typ = "arch-e"; - else if (std::abs (sz(0) - 8.5) + else if (std::abs (sz(0) - 8.5) + std::abs (sz(1) - 11.0) < tol) typ = "a"; else if (std::abs (sz(0) - 11.0)