fix compilation bug when jpeg is enabled

merge-requests/1/head
m. allan noah 2010-06-23 16:03:40 -04:00
rodzic 2c4c666874
commit 627a9bc45d
2 zmienionych plików z 8 dodań i 2 usunięć

Wyświetl plik

@ -1,3 +1,9 @@
2010-06-23 m. allan noah <kitno455 at gmail dot com>
* backend/fujitsu.c: Fix compilation bug when jpeg support is enabled.
2010-06-23 Julien Blache <jb@jblache.org>
* various: corrected initialization, printing, etc. in many backends
2010-06-21 Julien Blache <jb@jblache.org>
* tools/sane-desc.c: udev rules: set libsane_matched=yes for SCSI
devices too. Used by udev-acl later on.

Wyświetl plik

@ -6172,7 +6172,7 @@ sane_start (SANE_Handle handle)
(s->mode == MODE_COLOR && s->color_interlace == COLOR_INTERLACE_3091)
|| (s->swcrop || s->swdeskew || s->swdespeck
#ifdef SANE_FRAME_JPEG
&& s->s.format != SANE_FRAME_JPEG
&& s->params.format != SANE_FRAME_JPEG
#endif
)
)
@ -6236,7 +6236,7 @@ sane_start (SANE_Handle handle)
* so we block and buffer. yuck */
if( (s->swdeskew || s->swdespeck || s->swcrop)
#ifdef SANE_FRAME_JPEG
&& s->s.format != SANE_FRAME_JPEG
&& s->params.format != SANE_FRAME_JPEG
#endif
){