summaryrefslogtreecommitdiff
path: root/extensions/source
diff options
context:
space:
mode:
authorobo <obo@openoffice.org>2010-06-21 15:48:10 +0200
committerobo <obo@openoffice.org>2010-06-21 15:48:10 +0200
commit58dc05cfb67359e3f0d972688ecbc892bc6a510a (patch)
tree2316aa956bc9b6898a5df7cc5ba836ad693b08e0 /extensions/source
parentc49cbbfd983ef5d45a829439b1c6f6f1bcfc171a (diff)
parent715b125885c7c35b3107dd8da700b452acb6bf5d (diff)
CWS-TOOLING: integrate CWS vcl112
Diffstat (limited to 'extensions/source')
-rw-r--r--extensions/source/scanner/sane.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx
index af1a8d91c8fd..43c50e6f8451 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -642,6 +642,11 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
nStatus = p_get_parameters( maHandle, &aParams );
DUMP_STATE( nStatus, "sane_get_parameters" );
CheckConsistency( "sane_get_parameters" );
+ if (nStatus != SANE_STATUS_GOOD || aParams.bytes_per_line == 0)
+ {
+ bSuccess = FALSE;
+ break;
+ }
#if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL
const char* ppFormats[] = { "SANE_FRAME_GRAY", "SANE_FRAME_RGB",
"SANE_FRAME_RED", "SANE_FRAME_GREEN",