diff options
Diffstat (limited to '')
| -rw-r--r-- | src/blind-matrix-scale.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/blind-matrix-scale.c b/src/blind-matrix-scale.c index 8dd6b83..5675a8e 100644 --- a/src/blind-matrix-scale.c +++ b/src/blind-matrix-scale.c @@ -10,9 +10,9 @@ static int per_channel = 0; typedef TYPE pixel_t[4];\ pixel_t matrix[9];\ pixel_t buf[2];\ - int i;\ + size_t i;\ \ - for (i = 0; i < 4; i++) {\ + for (i = 0; i < stream->n_chan; i++) {\ matrix[0][i] = 1, matrix[1][i] = 0, matrix[2][i] = 0;\ matrix[3][i] = 0, matrix[4][i] = 1, matrix[5][i] = 0;\ matrix[6][i] = 0, matrix[7][i] = 0, matrix[8][i] = 1;\ @@ -20,13 +20,17 @@ static int per_channel = 0; \ while (eread_frame(stream, buf)) {\ if (per_channel) {\ - for (i = 0; i < 4; i++) {\ + for (i = 0; i < stream->n_chan; i++) {\ matrix[0][i] = buf[0][i];\ matrix[4][i] = buf[1][i];\ }\ } else {\ - matrix[0][3] = matrix[0][2] = matrix[0][1] = matrix[0][0] = buf[0][1] * buf[0][3];\ - matrix[4][3] = matrix[4][2] = matrix[4][1] = matrix[4][0] = buf[1][1] * buf[1][3];\ + buf[0][1] *= buf[0][3];\ + buf[1][1] *= buf[1][3];\ + for (i = 0; i < stream->n_chan; i++) {\ + matrix[0][i] = buf[0][1];\ + matrix[4][i] = buf[1][1];\ + }\ }\ ewriteall(STDOUT_FILENO, matrix, sizeof(matrix), "<stdout>");\ }\ @@ -62,9 +66,9 @@ main(int argc, char *argv[]) fprint_stream_head(stdout, &stream); efflush(stdout, "<stdout>"); - if (!strcmp(stream.pixfmt, "xyza")) + if (stream.encoding == DOUBLE) process = process_lf; - else if (!strcmp(stream.pixfmt, "xyza f")) + else if (stream.encoding == FLOAT) process = process_f; else eprintf("pixel format %s is not supported, try xyza\n", stream.pixfmt); |