aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2017-01-13 08:32:17 +0100
committerMattias Andrée <maandree@kth.se>2017-01-13 08:32:17 +0100
commit836ed8b478c660a2fcb18cb4036da5706afd155c (patch)
tree92a8512ffcd96126944f87bf5ed0113381d735bf
parentvu-from-video: add -d (diff)
downloadblind-836ed8b478c660a2fcb18cb4036da5706afd155c.tar.gz
blind-836ed8b478c660a2fcb18cb4036da5706afd155c.tar.bz2
blind-836ed8b478c660a2fcb18cb4036da5706afd155c.tar.xz
vu-from-image: style fix + vu-from-video: fix loop
Signed-off-by: Mattias Andrée <maandree@kth.se>
-rw-r--r--src/vu-from-image.c2
-rw-r--r--src/vu-from-video.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/vu-from-image.c b/src/vu-from-image.c
index bdfbde3..9c2d047 100644
--- a/src/vu-from-image.c
+++ b/src/vu-from-image.c
@@ -229,7 +229,7 @@ main(int argc, char *argv[])
if (!pid) {
close(pipe_rw[0]);
- if (dup2(pipe_rw[1], STDOUT_FILENO) < 0)
+ if (dup2(pipe_rw[1], STDOUT_FILENO) == -1)
eprintf("dup2:");
close(pipe_rw[1]);
/* XXX Is there a way to convert directly to raw XYZ? (Would avoid gamut truncation) */
diff --git a/src/vu-from-video.c b/src/vu-from-video.c
index 9fa9942..92503bb 100644
--- a/src/vu-from-video.c
+++ b/src/vu-from-video.c
@@ -110,7 +110,7 @@ convert_segment(char *buf, size_t n, int fd, char *file)
double r, g, b;
pixel_t pixels[1024];
if (draft) {
- for (ptr = i = 0; ptr < n; ptr += 8, i++) {
+ for (ptr = i = 0; ptr < n; ptr += 8) {
pixels[i][3] = ntohs(((uint16_t *)(buf + ptr))[0]) / max;
y = ntohs(((uint16_t *)(buf + ptr))[1]);
u = ntohs(((uint16_t *)(buf + ptr))[2]);
@@ -122,7 +122,7 @@ convert_segment(char *buf, size_t n, int fd, char *file)
}
}
} else {
- for (ptr = i = 0; ptr < n; ptr += 8, i++) {
+ for (ptr = i = 0; ptr < n; ptr += 8) {
pixels[i][3] = ntohs(((uint16_t *)(buf + ptr))[0]) / max;
y = ntohs(((uint16_t *)(buf + ptr))[1]) / max;
u = ntohs(((uint16_t *)(buf + ptr))[2]) / max;