diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-09-10 19:11:27 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-09-10 19:11:27 +0200 |
| commit | 7e9455b3b15671ff99ed168638c405e2acedb6df (patch) | |
| tree | 444e59ece236e09dc153f665e42160aeb0208c24 /backend/v4l.c | |
| parent | bc8a517abd2e11e1435f4ef042cfcc8648b62ef7 (diff) | |
| parent | bce41b3c37c2a68e7dab234ce0247755a61ceb40 (diff) | |
Merge branch 'release/debian/1.0.31-1_experimental1' into masterdebian/1.0.31-1_experimental1
Diffstat (limited to 'backend/v4l.c')
| -rw-r--r-- | backend/v4l.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/backend/v4l.c b/backend/v4l.c index 006e7f7..f9245d0 100644 --- a/backend/v4l.c +++ b/backend/v4l.c @@ -72,7 +72,6 @@ #include "../include/sane/saneopts.h" #include <sys/ioctl.h> -#include <asm/types.h> /* XXX glibc */ #define BACKEND_NAME v4l #include "../include/sane/sanei_backend.h" @@ -1046,7 +1045,7 @@ sane_start (SANE_Handle handle) /* v4l1 actually returns BGR when we ask for RGB, so convert it */ if (s->pict.palette == VIDEO_PALETTE_RGB24) { - __u32 loop; + uint32_t loop; DBG (3, "sane_start: converting from BGR to RGB\n"); for (loop = 0; loop < (s->window.width * s->window.height * 3); loop += 3) { |