From 627a9bc45d1b7f45c0ca8e46a13e31a520ed37c9 Mon Sep 17 00:00:00 2001 From: "m. allan noah" Date: Wed, 23 Jun 2010 16:03:40 -0400 Subject: [PATCH] fix compilation bug when jpeg is enabled --- ChangeLog | 6 ++++++ backend/fujitsu.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c5cba75c2..5f0d4457a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-06-23 m. allan noah + * backend/fujitsu.c: Fix compilation bug when jpeg support is enabled. + +2010-06-23 Julien Blache + * various: corrected initialization, printing, etc. in many backends + 2010-06-21 Julien Blache * tools/sane-desc.c: udev rules: set libsane_matched=yes for SCSI devices too. Used by udev-acl later on. diff --git a/backend/fujitsu.c b/backend/fujitsu.c index 9c9437fcd..0f1bf6eaf 100644 --- a/backend/fujitsu.c +++ b/backend/fujitsu.c @@ -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 ){