kopia lustrzana https://gitlab.com/sane-project/backends
Merge branch 'ps-devel-fix-microtek-va_list-001' into 'master'
Fix uclibc compile (include stdarg.h for va_list/va_start/va_end), fix NDEBUG compile (PDBG/pixma_dbg) See merge request sane-project/backends!638merge-requests/637/merge
commit
e86175e726
|
@ -57,6 +57,7 @@
|
|||
|
||||
#include "../include/sane/config.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
|
|
@ -968,16 +968,16 @@ pixma_read_image (pixma_t * s, void *buf, unsigned len)
|
|||
s->last_source = s->param->source;
|
||||
if ((s->cur_image_size != s->param->image_size) && !s->param->mode_jpeg)
|
||||
{
|
||||
pixma_dbg (1, "WARNING:image size mismatches\n");
|
||||
pixma_dbg (1,
|
||||
PDBG (pixma_dbg (1, "WARNING:image size mismatches\n"));
|
||||
PDBG (pixma_dbg (1,
|
||||
" %"PRIu64" expected (%d lines) but %"PRIu64" received (%"PRIu64" lines)\n",
|
||||
s->param->image_size, s->param->h,
|
||||
s->cur_image_size,
|
||||
s->cur_image_size / s->param->line_size);
|
||||
s->cur_image_size / s->param->line_size));
|
||||
if ((s->cur_image_size % s->param->line_size) != 0)
|
||||
{
|
||||
pixma_dbg (1,
|
||||
"BUG:received data not multiple of line_size\n");
|
||||
PDBG (pixma_dbg (1,
|
||||
"BUG:received data not multiple of line_size\n"));
|
||||
}
|
||||
}
|
||||
if ((s->cur_image_size < s->param->image_size) && !s->param->mode_jpeg)
|
||||
|
|
|
@ -43,6 +43,7 @@ Userspace scan tool for the Microtek 3600 scanner
|
|||
|
||||
====================================================================== */
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <unistd.h>
|
||||
#include "sm3600-scantool.h"
|
||||
|
||||
|
|
Ładowanie…
Reference in New Issue