diff options
| author | ppatience0 <ppatience0@gmail.com> | 2013-05-12 12:53:43 -0400 |
|---|---|---|
| committer | ppatience0 <ppatience0@gmail.com> | 2013-05-12 12:53:43 -0400 |
| commit | 1d760c9b3ea8eb5d7d0484cb66527c6a9d4eb5ea (patch) | |
| tree | 11f3320515fef7b5e395bc78d1bd3028bf184dcb /sys/src | |
| parent | 8020743579ed7398bf0c61e5723d827d41d70475 (diff) | |
file: recognize bitmap and graymap ppm images
writeppm: do not print extra space after each pixel for graymap formats to save space
Diffstat (limited to 'sys/src')
| -rw-r--r-- | sys/src/cmd/file.c | 4 | ||||
| -rw-r--r-- | sys/src/cmd/jpg/writeppm.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/src/cmd/file.c b/sys/src/cmd/file.c index b92f088ad..ee6db10b4 100644 --- a/sys/src/cmd/file.c +++ b/sys/src/cmd/file.c @@ -828,7 +828,11 @@ struct FILE_STRING "OggS", "ogg audio", 4, "audio/ogg", ".snd", "sun audio", 4, "audio/basic", "\211PNG", "PNG image", 4, "image/png", + "P1\n", "ppm", 3, "image/ppm", + "P2\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", "/* XPM */\n", "xbm", 10, "image/xbm", ".HTML ", "troff -ms input", 6, "text/troff", diff --git a/sys/src/cmd/jpg/writeppm.c b/sys/src/cmd/jpg/writeppm.c index bf32f0d25..9d4c92d07 100644 --- a/sys/src/cmd/jpg/writeppm.c +++ b/sys/src/cmd/jpg/writeppm.c @@ -70,7 +70,7 @@ writedata(Biobuf *fd, Image *image, Memimage *memimage) pix = (data[i]>>depth*((xmask-x)&xmask))&pmask; if(((x+1)&xmask) == 0) i++; - col += Bprint(fd, "%d ", pix); + col += Bprint(fd, "%d", pix); if(col >= MAXLINE-(2+1)){ Bprint(fd, "\n"); col = 0; @@ -81,7 +81,7 @@ writedata(Biobuf *fd, Image *image, Memimage *memimage) break; case GREY8: for(i=0; i<ndata; i++){ - col += Bprint(fd, "%d ", data[i]); + col += Bprint(fd, "%d", data[i]); if(col >= MAXLINE-(4+1)){ Bprint(fd, "\n"); col = 0; |