The R Project SVN R

Rev

Rev 35266 | Rev 36990 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 35266 Rev 36002
Line 1809... Line 1809...
1809 
    x = REAL(sx);
 1809 
    x = REAL(sx);
1810 
    y = REAL(sy);
 1810 
    y = REAL(sy);
1811 
    z = INTEGER(sz);
 1811 
    z = INTEGER(sz);
1812 
    c = (unsigned*)INTEGER(sc);
 1812 
    c = (unsigned*)INTEGER(sc);
1813 
 
 1813 
 
1814 
    /* Check of grid coordinates */
 1814 
    /* Check of grid coordinates now done in C code */
1815 
    /* We want them to all be finite and in strictly ascending order */
 - 
 
1816 
 
 - 
 
1817 
    if (nx < 1 || ny < 1) goto badxy;
 - 
 
1818 
    if (!R_FINITE(x[0])) goto badxy;
 - 
 
1819 
    if (!R_FINITE(y[0])) goto badxy;
 - 
 
1820 
    for (i = 1; i < nx; i++)
 - 
 
1821 
	if (!R_FINITE(x[i]) || x[i] <= x[i - 1]) goto badxy;
 - 
 
1822 
    for (j = 1; j < ny; j++)
 - 
 
1823 
	if (!R_FINITE(y[j]) || y[j] <= y[j - 1]) goto badxy;
 - 
 
1824 
 
 1815 
 
1825 
    colsave = Rf_gpptr(dd)->col;
 1816 
    colsave = Rf_gpptr(dd)->col;
1826 
    xpdsave = Rf_gpptr(dd)->xpd;
 1817 
    xpdsave = Rf_gpptr(dd)->xpd;
1827 
    /* override par("xpd") and force clipping to plot region */
 1818 
    /* override par("xpd") and force clipping to plot region */
1828 
    Rf_gpptr(dd)->xpd = 0;
 1819 
    Rf_gpptr(dd)->xpd = 0;
Line 1843... Line 1834...
1843 
    R_Visible = 0;
 1834 
    R_Visible = 0;
1844 
    UNPROTECT(1);
 1835 
    UNPROTECT(1);
1845 
    if (GRecording(call, dd))
 1836 
    if (GRecording(call, dd))
1846 
	recordGraphicOperation(op, oargs, dd);
 1837 
	recordGraphicOperation(op, oargs, dd);
1847 
    return R_NilValue;
 1838 
    return R_NilValue;
1848 
 
 - 
 
1849 
  badxy:
 - 
 
1850 
    errorcall(call, _("invalid x / y values or limits"));
 - 
 
1851 
    return R_NilValue;/* never used; to keep -Wall happy */
 - 
 
1852 
}
 1839 
}
1853 
 
 1840 
 
1854 
	/*  P e r s p e c t i v e   S u r f a c e   P l o t s  */
 1841 
	/*  P e r s p e c t i v e   S u r f a c e   P l o t s  */
1855 
 
 1842 
 
1856 
 
 1843