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-color.c | |
| parent | c8bd2513ecba169cff44c09c8058c36987357b18 (diff) | |
| parent | 3759ce55ba79b8d3b9d8ed247a252273ee7dade3 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/sm3600-color.c')
| -rw-r--r-- | backend/sm3600-color.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/backend/sm3600-color.c b/backend/sm3600-color.c index 9b3c540..2e42ada 100644 --- a/backend/sm3600-color.c +++ b/backend/sm3600-color.c @@ -171,7 +171,7 @@ TState StartScanColor(TInstance *this) this->state.cyTotalPath = this->param.y/2-(2*this->state.ySensorSkew)*600/this->param.res; DoJog(this,this->state.cyTotalPath); INST_ASSERT(); - this->state.cyTotalPath += + this->state.cyTotalPath += (this->state.cyPixel+2*this->state.ySensorSkew) *600/this->param.res; /* for jogging back */ @@ -214,7 +214,7 @@ TState StartScanColor(TInstance *this) RegWrite(this,R_SLEN, 2, this->state.cyWindow+ (2*this->state.ySensorSkew)*600/this->param.res); - this->state.szOrder=ORDER_BRG; + this->state.szOrder=ORDER_BRG; RegWrite(this,R_CCAL, 3, this->calibration.rgbBias); INST_ASSERT(); /* 0xBBGGRR */ switch (this->param.res) { @@ -294,7 +294,7 @@ TState StartScanColor(TInstance *this) } /* calculate and prepare intermediate line transfer buffer */ - + this->state.cchLineOut=3*this->state.cxPixel; this->state.pchLineOut = malloc(this->state.cchLineOut); if (!this->state.pchLineOut) @@ -310,4 +310,3 @@ TState StartScanColor(TInstance *this) this->state.bScanning = true; return SANE_STATUS_GOOD; } - |