xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

file: deal with negative coordinates in plan9 bitmaps, print image size

Browse source
This commit is contained in:
cinap_lenrek 2016-03-27 16:38:39 +02:00
parent 9aa6573359
commit bf2195b88c
1 changed files with 48 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

102
sys/src/cmd/file.c
View file

@ -167,7 +167,7 @@ int longoff(void);
int istar(void); int istar(void);
int isface(void); int isface(void);
int isexec(void); int isexec(void);
int p9bitnum(uchar*); int p9bitnum(char*, int*);
int p9subfont(uchar*); int p9subfont(uchar*);
void print_utf(void); void print_utf(void);
void type(char*, int); void type(char*, int);
@ -1310,28 +1310,18 @@ isenglish(void)
*/ */
#define P9BITLEN 12 #define P9BITLEN 12
int int
p9bitnum(uchar *bp) p9bitnum(char *s, int *v)
{ {
int n, c, len; char *es;
len = P9BITLEN; if(s[P9BITLEN-1] != ' ')
while(*bp == ' ') {
bp++;
len--;
if(len <= 0)
return -1;
}
n = 0;
while(len > 1) {
c = *bp++;
if(!isdigit(c))
return -1;
n = n*10 + c-'0';
len--;
}
if(*bp != ' ')
return -1; return -1;
return n; s[P9BITLEN-1] = '\0';
*v = strtol(s, &es, 10);
s[P9BITLEN-1] = ' ';
if(es != &s[P9BITLEN-1])
return -1;
return 0;
} }
int int
@ -1347,13 +1337,18 @@ depthof(char *s, int *newp)
if(s == es) if(s == es)
return -1; return -1;
if('0'<=*s && *s<='9') if('0'<=*s && *s<='9')
return 1<<strtol(s, 0, 0); return 1<<strtol(s, nil, 0);
*newp = 1; *newp = 1;
d = 0; d = 0;
while(s<es && *s!=' '){ while(s<es && *s!=' '){
s++; /* skip letter */ if(strchr("rgbkamx", *s) == nil)
d += strtoul(s, &s, 10); return -1;
s++;
if('0'<=*s && *s<='9')
d += strtoul(s, &s, 10);
else
return -1;
} }
if(d % 8 == 0 || 8 % d == 0) if(d % 8 == 0 || 8 % d == 0)
@ -1366,43 +1361,41 @@ int
isp9bit(void) isp9bit(void)
{ {
int dep, lox, loy, hix, hiy, px, new, cmpr; int dep, lox, loy, hix, hiy, px, new, cmpr;
ulong t;
long len; long len;
char *newlabel; char *newlabel;
uchar *cp; uchar *cp;
cp = buf; cp = buf;
cmpr = 0; cmpr = 0;
newlabel = "old ";
if(memcmp(cp, "compressed\n", 11) == 0) { if(memcmp(cp, "compressed\n", 11) == 0) {
cmpr = 1; cmpr = 1;
cp = buf + 11; cp = buf + 11;
} }
dep = depthof((char*)cp + 0*P9BITLEN, &new); if((dep = depthof((char*)cp + 0*P9BITLEN, &new)) < 0)
if(new) return 0;
newlabel = ""; newlabel = new ? "" : "old ";
lox = p9bitnum(cp + 1*P9BITLEN); if(p9bitnum((char*)cp + 1*P9BITLEN, &lox) < 0)
loy = p9bitnum(cp + 2*P9BITLEN); return 0;
hix = p9bitnum(cp + 3*P9BITLEN); if(p9bitnum((char*)cp + 2*P9BITLEN, &loy) < 0)
hiy = p9bitnum(cp + 4*P9BITLEN); return 0;
if(dep < 0 || lox < 0 || loy < 0 || hix < 0 || hiy < 0) if(p9bitnum((char*)cp + 3*P9BITLEN, &hix) < 0)
return 0;
if(p9bitnum((char*)cp + 4*P9BITLEN, &hiy) < 0)
return 0;
hix -= lox;
hiy -= loy;
if(hix <= 0 || hiy <= 0)
return 0; return 0;
if(dep < 8){ if(dep < 8){
px = 8/dep; /* pixels per byte */ px = 8/dep; /* pixels per byte */
/* set l to number of bytes of data per scan line */ /* set l to number of bytes of data per scan line */
if(lox >= 0) len = (hix+px-1)/px;
len = (hix+px-1)/px - lox/px;
else{ /* make positive before divide */
t = (-lox)+px-1;
t = (t/px)*px;
len = (t+hix+px-1)/px;
}
}else }else
len = (hix-lox)*dep/8; len = hix*dep/8;
len *= hiy - loy; /* col length */ len *= hiy; /* col length */
len += 5 * P9BITLEN; /* size of initial ascii */ len += 5 * P9BITLEN; /* size of initial ascii */
/* /*
@ -1412,8 +1405,8 @@ isp9bit(void)
* for subfont, the subfont header should follow immediately. * for subfont, the subfont header should follow immediately.
*/ */
if (cmpr) { if (cmpr) {
print(mime ? "image/p9bit\n" : "Compressed %splan 9 image or subfont, depth %d\n", print(mime ? "image/p9bit\n" : "Compressed %splan 9 image or subfont, depth %d, size %dx%d\n",
newlabel, dep); newlabel, dep, hix, hiy);
return 1; return 1;
} }
/* /*
@ -1422,11 +1415,13 @@ isp9bit(void)
*/ */
if (len != 0 && (mbuf->length == 0 || mbuf->length == len || if (len != 0 && (mbuf->length == 0 || mbuf->length == len ||
mbuf->length > len && mbuf->length < len+P9BITLEN)) { mbuf->length > len && mbuf->length < len+P9BITLEN)) {
print(mime ? "image/p9bit\n" : "%splan 9 image, depth %d\n", newlabel, dep); print(mime ? "image/p9bit\n" : "%splan 9 image, depth %d, size %dx%d\n",
newlabel, dep, hix, hiy);
return 1; return 1;
} }
if (p9subfont(buf+len)) { if (p9subfont(buf+len)) {
print(mime ? "image/p9bit\n" : "%ssubfont file, depth %d\n", newlabel, dep); print(mime ? "image/p9bit\n" : "%ssubfont file, depth %d, size %dx%d\n",
newlabel, dep, hix, hiy);
return 1; return 1;
} }
return 0; return 0;
@ -1441,16 +1436,15 @@ p9subfont(uchar *p)
if (p+3*P9BITLEN > buf+sizeof(buf)) if (p+3*P9BITLEN > buf+sizeof(buf))
return 1; return 1;
n = p9bitnum(p + 0*P9BITLEN); /* char count */ if (p9bitnum((char*)p + 0*P9BITLEN, &n) < 0) /* char count */
if (n < 0)
return 0; return 0;
h = p9bitnum(p + 1*P9BITLEN); /* height */ if (p9bitnum((char*)p + 1*P9BITLEN, &h) < 0) /* height */
if (h < 0)
return 0; return 0;
a = p9bitnum(p + 2*P9BITLEN); /* ascent */ if (p9bitnum((char*)p + 2*P9BITLEN, &a) < 0) /* ascent */
if (a < 0)
return 0; return 0;
return 1; if(n > 0 && h > 0 && a >= 0)
return 1;
return 0;
} }
#define WHITESPACE(c) ((c) == ' ' || (c) == '\t' || (c) == '\n') #define WHITESPACE(c) ((c) == ' ' || (c) == '\t' || (c) == '\n')