diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 17:00:58 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 17:00:58 +0200 |
commit | d087d778ffb62e2713cb848540bcc819470365bd (patch) | |
tree | d69692a274dd1c7d0672e6bb7155a0fc106f9d49 /backend/sm3600-gray.c | |
parent | c8bd2513ecba169cff44c09c8058c36987357b18 (diff) | |
parent | 3759ce55ba79b8d3b9d8ed247a252273ee7dade3 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/sm3600-gray.c')
-rw-r--r-- | backend/sm3600-gray.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/backend/sm3600-gray.c b/backend/sm3600-gray.c index d9fda86..c5efe55 100644 --- a/backend/sm3600-gray.c +++ b/backend/sm3600-gray.c @@ -204,7 +204,7 @@ static TState ReadNextGrayLine(PTInstance this) { int iWrite; int iDot; - unsigned char chBits; + unsigned char chBits; int iRead; /* read position in raw line */ int nInterpolator; @@ -328,7 +328,7 @@ TState StartScanGray(TInstance *this) DoJog(this,this->state.cyTotalPath); INST_ASSERT(); this->state.cyTotalPath += this->param.cy/2; /* for jogging back */ - + /* regular scan is asynchronously, that is, the scanning is issued, and the driver does bulk reads, @@ -370,7 +370,7 @@ TState StartScanGray(TInstance *this) this->state.cchLineOut=(this->mode==gray) ? this->state.cxPixel : (this->state.cxPixel+7)/8; - + this->state.pchLineOut = malloc(this->state.cchLineOut); if (!this->state.pchLineOut) return FreeState(this,SetError(this, @@ -386,4 +386,3 @@ TState StartScanGray(TInstance *this) this->state.bScanning = true; return SANE_STATUS_GOOD; } - |