diff options
| author | Mattias Andrée <maandree@kth.se> | 2017-05-10 22:52:21 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@kth.se> | 2017-05-10 22:52:21 +0200 |
| commit | 687e7aa9abf91f1bade59213a8b53f9bb4ec4186 (patch) | |
| tree | 98fd798df79322f72d35b375f451d8edb5c143f3 /src/blind-transpose.c | |
| parent | Fix warnings (diff) | |
| download | blind-687e7aa9abf91f1bade59213a8b53f9bb4ec4186.tar.gz blind-687e7aa9abf91f1bade59213a8b53f9bb4ec4186.tar.bz2 blind-687e7aa9abf91f1bade59213a8b53f9bb4ec4186.tar.xz | |
Fix errors from the latest commits
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to 'src/blind-transpose.c')
| -rw-r--r-- | src/blind-transpose.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/blind-transpose.c b/src/blind-transpose.c index 750de02..3bbc6fb 100644 --- a/src/blind-transpose.c +++ b/src/blind-transpose.c @@ -4,11 +4,11 @@ USAGE("") -static size_t srcw, srch, srcwps, srchps, ps; +static size_t srcw, srch, srcwps, srchps, ps, n; #define PROCESS(TYPE)\ do {\ - size_t x, i, n = ps / sizeof(TYPE);\ + size_t x, i;\ char *src, *img;\ for (x = 0; x < srchps; x += ps) {\ img = row + x;\ @@ -43,9 +43,11 @@ main(int argc, char *argv[]) buf = emalloc(stream.frame_size); image = emalloc(srchps); + ps = stream.pixel_size; process = ps % sizeof(long) ? process_char : process_long; + n = ps / (ps % sizeof(long) ? sizeof(char) : sizeof(long)); while (eread_frame(&stream, buf)) { - for (y = 0; y < srcwps; y += ps) { + for (y = 0; y < srcwps; y += stream.pixel_size) { process(image, buf + y); ewriteall(STDOUT_FILENO, image, srchps, "<stdout>"); } |