summaryrefslogtreecommitdiff
path: root/apps/plugins/ppmviewer.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/plugins/ppmviewer.c')
-rw-r--r--apps/plugins/ppmviewer.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/apps/plugins/ppmviewer.c b/apps/plugins/ppmviewer.c
index cc7440de96..b186393d05 100644
--- a/apps/plugins/ppmviewer.c
+++ b/apps/plugins/ppmviewer.c
@@ -57,19 +57,19 @@ char ppm_getc(int fd)
57{ 57{
58 char ch; 58 char ch;
59 59
60 if (!rb->read(fd, &ch, 1)) { 60 if (!rb->read(fd, &ch, 1)) {
61 ppm_error("EOF. Read error reading a byte"); 61 ppm_error("EOF. Read error reading a byte");
62 return PLUGIN_ERROR; 62 return PLUGIN_ERROR;
63 } 63 }
64 64
65 if (ch == '#') { 65 if (ch == '#') {
66 do { 66 do {
67 if (!rb->read(fd, &ch, 1)) { 67 if (!rb->read(fd, &ch, 1)) {
68 ppm_error("EOF. Read error reading a byte"); 68 ppm_error("EOF. Read error reading a byte");
69 return PLUGIN_ERROR; 69 return PLUGIN_ERROR;
70 } 70 }
71 } while (ch != '\n' && ch != '\r'); 71 } while (ch != '\n' && ch != '\r');
72 } 72 }
73 return ch; 73 return ch;
74} 74}
75 75
@@ -81,7 +81,7 @@ int ppm_getuint(int fd)
81 81
82 do { 82 do {
83 ch = ppm_getc(fd); 83 ch = ppm_getc(fd);
84 } while (ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r'); 84 } while (ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r');
85 85
86 if (ch < '0' || ch > '9') { 86 if (ch < '0' || ch > '9') {
87 ppm_error("Junk (%c) in file where an integer should be.", ch); 87 ppm_error("Junk (%c) in file where an integer should be.", ch);
@@ -213,7 +213,7 @@ int read_ppm_row(int fd,
213 int col; 213 int col;
214 int r, g, b; 214 int r, g, b;
215 switch (format) { 215 switch (format) {
216 case PPM_FORMAT: 216 case PPM_FORMAT:
217 for (col = 0; col < cols; ++col) { 217 for (col = 0; col < cols; ++col) {
218 r = ppm_getuint(fd); 218 r = ppm_getuint(fd);
219 g = ppm_getuint(fd); 219 g = ppm_getuint(fd);
@@ -231,7 +231,7 @@ int read_ppm_row(int fd,
231 } 231 }
232 break; 232 break;
233 233
234 case RPPM_FORMAT: 234 case RPPM_FORMAT:
235 for (col = 0; col < cols; ++col) { 235 for (col = 0; col < cols; ++col) {
236 r = ppm_getrawsample(fd, maxval); 236 r = ppm_getrawsample(fd, maxval);
237 g = ppm_getrawsample(fd, maxval); 237 g = ppm_getrawsample(fd, maxval);
@@ -246,14 +246,14 @@ int read_ppm_row(int fd,
246 (255 / maxval) * r, 246 (255 / maxval) * r,
247 (255 / maxval) * g, 247 (255 / maxval) * g,
248 (255 / maxval) * b); 248 (255 / maxval) * b);
249 } 249 }
250 break; 250 break;
251 251
252 default: 252 default:
253 ppm_error("What?!"); 253 ppm_error("What?!");
254 return PLUGIN_ERROR; 254 return PLUGIN_ERROR;
255 } 255 }
256 return 1; 256 return 1;
257} 257}
258 258
259int read_ppm(int fd, 259int read_ppm(int fd,