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

merge

Browse source
This commit is contained in:
cinap_lenrek 2013-05-12 19:05:51 +02:00
commit 4c4fbdf78c
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -828,7 +828,11 @@ struct FILE_STRING
"OggS", "ogg audio", 4, "audio/ogg", "OggS", "ogg audio", 4, "audio/ogg",
".snd", "sun audio", 4, "audio/basic", ".snd", "sun audio", 4, "audio/basic",
"\211PNG", "PNG image", 4, "image/png", "\211PNG", "PNG image", 4, "image/png",
"P1\n", "ppm", 3, "image/ppm",
"P2\n", "ppm", 3, "image/ppm",
"P3\n", "ppm", 3, "image/ppm", "P3\n", "ppm", 3, "image/ppm",
"P4\n", "ppm", 3, "image/ppm",
"P5\n", "ppm", 3, "image/ppm",
"P6\n", "ppm", 3, "image/ppm", "P6\n", "ppm", 3, "image/ppm",
"/* XPM */\n", "xbm", 10, "image/xbm", "/* XPM */\n", "xbm", 10, "image/xbm",
".HTML ", "troff -ms input", 6, "text/troff", ".HTML ", "troff -ms input", 6, "text/troff",

4
sys/src/cmd/jpg/writeppm.c
View file

@ -70,7 +70,7 @@ writedata(Biobuf *fd, Image *image, Memimage *memimage)
pix = (data[i]>>depth*((xmask-x)&xmask))&pmask; pix = (data[i]>>depth*((xmask-x)&xmask))&pmask;
if(((x+1)&xmask) == 0) if(((x+1)&xmask) == 0)
i++; i++;
col += Bprint(fd, "%d ", pix); col += Bprint(fd, "%d", pix);
if(col >= MAXLINE-(2+1)){ if(col >= MAXLINE-(2+1)){
Bprint(fd, "\n"); Bprint(fd, "\n");
col = 0; col = 0;
@ -81,7 +81,7 @@ writedata(Biobuf *fd, Image *image, Memimage *memimage)
break; break;
case GREY8: case GREY8:
for(i=0; i<ndata; i++){ for(i=0; i<ndata; i++){
col += Bprint(fd, "%d ", data[i]); col += Bprint(fd, "%d", data[i]);
if(col >= MAXLINE-(4+1)){ if(col >= MAXLINE-(4+1)){
Bprint(fd, "\n"); Bprint(fd, "\n");
col = 0; col = 0;