aboutsummaryrefslogtreecommitdiffstats
path: root/src/blind-round-wave.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/blind-round-wave.c47
1 files changed, 16 insertions, 31 deletions
diff --git a/src/blind-round-wave.c b/src/blind-round-wave.c
index 00a30e1..5aa3026 100644
--- a/src/blind-round-wave.c
+++ b/src/blind-round-wave.c
@@ -5,46 +5,32 @@ USAGE("[-e]")
static int equal = 0;
-
#define PROCESS(TYPE, SUFFIX)\
static void\
process_##SUFFIX(struct stream *stream)\
{\
- size_t i, n;\
- TYPE x, y, z, a;\
+ size_t i, j, n;\
+ TYPE v, *p;\
do {\
- n = stream->ptr / stream->pixel_size;\
if (equal) {\
+ n = stream->ptr / stream->pixel_size;\
for (i = 0; i < n; i++) {\
- a = ((TYPE *)(stream->buf))[4 * i + 3];\
- a = mod(a + 1, (TYPE)4) - 1;\
- a = a < 1 ? 1 - a * a / 2 : (a - 2) * (a - 2) / 2;\
- ((TYPE *)(stream->buf))[4 * i + 0] = a;\
- ((TYPE *)(stream->buf))[4 * i + 1] = a;\
- ((TYPE *)(stream->buf))[4 * i + 2] = a;\
- ((TYPE *)(stream->buf))[4 * i + 3] = a;\
+ p = (TYPE *)(stream->buf) + i * stream->n_chan;\
+ v = posmod(*p + 1, (TYPE)4) - 1;\
+ v = v < 1 ? 1 - v * v / 2 : (v - 2) * (v - 2) / 2;\
+ for (j = 0; j < stream->n_chan; j++)\
+ p[j] = v;\
}\
+ n *= stream->pixel_size;\
} else {\
+ n = stream->ptr / stream->chan_size;\
for (i = 0; i < n; i++) {\
- x = ((TYPE *)(stream->buf))[4 * i + 0];\
- y = ((TYPE *)(stream->buf))[4 * i + 1];\
- z = ((TYPE *)(stream->buf))[4 * i + 2];\
- a = ((TYPE *)(stream->buf))[4 * i + 3];\
- x = mod(x + 1, (TYPE)4) - 1;\
- y = mod(y + 1, (TYPE)4) - 1;\
- z = mod(z + 1, (TYPE)4) - 1;\
- a = mod(a + 1, (TYPE)4) - 1;\
- x = x < 1 ? 1 - x * x / 2 : (x - 2) * (x - 2) / 2;\
- y = y < 1 ? 1 - y * y / 2 : (y - 2) * (y - 2) / 2;\
- z = z < 1 ? 1 - z * z / 2 : (z - 2) * (z - 2) / 2;\
- a = a < 1 ? 1 - a * a / 2 : (a - 2) * (a - 2) / 2;\
- ((TYPE *)(stream->buf))[4 * i + 0] = x;\
- ((TYPE *)(stream->buf))[4 * i + 1] = y;\
- ((TYPE *)(stream->buf))[4 * i + 2] = z;\
- ((TYPE *)(stream->buf))[4 * i + 3] = a;\
+ p = (TYPE *)(stream->buf) + i;\
+ v = posmod(*p + 1, (TYPE)4) - 1;\
+ *p = v < 1 ? 1 - v * v / 2 : (v - 2) * (v - 2) / 2;\
}\
+ n *= stream->chan_size;\
}\
- n *= stream->pixel_size;\
ewriteall(STDOUT_FILENO, stream->buf, n, "<stdout>");\
memmove(stream->buf, stream->buf + n, stream->ptr -= n);\
} while (eread_stream(stream, SIZE_MAX));\
@@ -55,7 +41,6 @@ static int equal = 0;
PROCESS(double, lf)
PROCESS(float, f)
-
int
main(int argc, char *argv[])
{
@@ -75,9 +60,9 @@ main(int argc, char *argv[])
eopen_stream(&stream, NULL);
- 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);