summaryrefslogtreecommitdiffstats
path: root/x.c
diff options
context:
space:
mode:
authorBryan Newbold <bnewbold@robocracy.org>2017-02-20 00:05:34 -0800
committerBryan Newbold <bnewbold@robocracy.org>2017-02-20 00:05:34 -0800
commit50eb784bfcf15ee3c6b0b53d747db92673395040 (patch)
tree60f039bb5aa27bc58d92ab0c7bab0d82dbfe7686 /x.c
parentae2b295c7deaf2d7c18ad1ed9b6050970e56bae7 (diff)
downloadscm-50eb784bfcf15ee3c6b0b53d747db92673395040.tar.gz
scm-50eb784bfcf15ee3c6b0b53d747db92673395040.zip
Import Upstream version 5e3upstream/5e3
Diffstat (limited to 'x.c')
-rw-r--r--x.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/x.c b/x.c
index 84c4455..e062ba9 100644
--- a/x.c
+++ b/x.c
@@ -675,12 +675,12 @@ void scm2XPoint(signp, dat, ipr, pos, s_caller)
x = VELTS(dat)[0];
y = VELTS(dat)[1];
break;
- case tc7_uvect: case tc7_ivect:
+ case tc7_VfixN32: case tc7_VfixZ32:
ASRTGO(2==LENGTH(dat), badarg);
x = MAKINUM(((long *)VELTS(dat))[0]);
y = MAKINUM(((long *)VELTS(dat))[1]);
break;
- case tc7_svect:
+ case tc7_VfixZ16:
ASRTGO(2==LENGTH(dat), badarg);
x = MAKINUM(((short *)VELTS(dat))[0]);
y = MAKINUM(((short *)VELTS(dat))[1]);
@@ -742,7 +742,7 @@ int scm2xpointslen(sara, s_caller)
if (!((1==(adm[1].ubnd - adm[1].lbnd))
&& (1==adm[1].inc)
&& ARRAY_CONTP(sara)
- && (tc7_svect==TYP7(ARRAY_V(sara))))) return -1;
+ && (tc7_VfixZ16==TYP7(ARRAY_V(sara))))) return -1;
len = 1 + adm[0].ubnd - adm[0].lbnd;
if (len < 0) return 0;
return len;
@@ -1337,7 +1337,7 @@ SCM x_free_color_cells(scmap, spxls, sargs)
unsigned int planes = 0;
ASRTER(NIMP(scmap) && COLORMAPP(scmap), scmap, ARG1, s_x_free_color_cells);
xcm = COLORMAP(scmap);
- ASRTER(NIMP(spxls) && (TYP7(spxls)==tc7_uvect), spxls, ARG2,
+ ASRTER(NIMP(spxls) && (TYP7(spxls)==tc7_VfixN32), spxls, ARG2,
s_x_free_color_cells);
switch (ilength(sargs) + 2) {
default: wta(sargs, (char *)WNA, s_x_free_color_cells);