comparison 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
comparison
equal deleted inserted replaced
19624:6d75f1683ce8 19628:fe689210525c
3777 + std::abs (sz(1) - 364.0 * mm2in) < tol) 3777 + std::abs (sz(1) - 364.0 * mm2in) < tol)
3778 typ = "b4"; 3778 typ = "b4";
3779 else if (std::abs (sz(0) - 182.0 * mm2in) 3779 else if (std::abs (sz(0) - 182.0 * mm2in)
3780 + std::abs (sz(1) - 257.0 * mm2in) < tol) 3780 + std::abs (sz(1) - 257.0 * mm2in) < tol)
3781 typ = "b5"; 3781 typ = "b5";
3782 else if (std::abs (sz(0) - 9.0) 3782 else if (std::abs (sz(0) - 9.0)
3783 + std::abs (sz(1) - 12.0) < tol) 3783 + std::abs (sz(1) - 12.0) < tol)
3784 typ = "arch-a"; 3784 typ = "arch-a";
3785 else if (std::abs (sz(0) - 12.0) 3785 else if (std::abs (sz(0) - 12.0)
3786 + std::abs (sz(1) - 18.0) < tol) 3786 + std::abs (sz(1) - 18.0) < tol)
3787 typ = "arch-b"; 3787 typ = "arch-b";
3792 + std::abs (sz(1) - 36.0) < tol) 3792 + std::abs (sz(1) - 36.0) < tol)
3793 typ = "arch-d"; 3793 typ = "arch-d";
3794 else if (std::abs (sz(0) - 36.0) 3794 else if (std::abs (sz(0) - 36.0)
3795 + std::abs (sz(1) - 48.0) < tol) 3795 + std::abs (sz(1) - 48.0) < tol)
3796 typ = "arch-e"; 3796 typ = "arch-e";
3797 else if (std::abs (sz(0) - 8.5) 3797 else if (std::abs (sz(0) - 8.5)
3798 + std::abs (sz(1) - 11.0) < tol) 3798 + std::abs (sz(1) - 11.0) < tol)
3799 typ = "a"; 3799 typ = "a";
3800 else if (std::abs (sz(0) - 11.0) 3800 else if (std::abs (sz(0) - 11.0)
3801 + std::abs (sz(1) - 17.0) < tol) 3801 + std::abs (sz(1) - 17.0) < tol)
3802 typ = "b"; 3802 typ = "b";