ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

twain: A few cleanups, using some consts from sane.

This commit is contained in:
Aric Stewart 2006-03-22 13:34:44 -06:00 committed by Alexandre Julliard
parent 1a5c6ef47d
commit 0bcc992162
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/twain/ds_image.c
View File

@ -120,7 +120,7 @@ TW_UINT16 TWAIN_ImageInfoGet (pTW_IDENTITY pOrigin, pTW_IDENTITY pDest,
TRACE("Bits per Sample %i\n",pSource->sane_param.depth); TRACE("Bits per Sample %i\n",pSource->sane_param.depth);
TRACE("Frame Format %i\n",pSource->sane_param.format); TRACE("Frame Format %i\n",pSource->sane_param.format);
if (pSource->sane_param.format == 1 /*RGB*/ ) if (pSource->sane_param.format == SANE_FRAME_RGB )
{ {
pImageInfo->BitsPerPixel = pSource->sane_param.depth * 3; pImageInfo->BitsPerPixel = pSource->sane_param.depth * 3;
pImageInfo->Compression = TWCP_NONE; pImageInfo->Compression = TWCP_NONE;
@ -131,9 +131,18 @@ TW_UINT16 TWAIN_ImageInfoGet (pTW_IDENTITY pOrigin, pTW_IDENTITY pDest,
pImageInfo->BitsPerSample[2] = pSource->sane_param.depth; pImageInfo->BitsPerSample[2] = pSource->sane_param.depth;
pImageInfo->PixelType = TWPT_RGB; pImageInfo->PixelType = TWPT_RGB;
} }
else if (pSource->sane_param.format == SANE_FRAME_GRAY)
{
pImageInfo->BitsPerPixel = pSource->sane_param.depth;
pImageInfo->Compression = TWCP_NONE;
pImageInfo->Planar = TRUE;
pImageInfo->SamplesPerPixel = 1;
pImageInfo->BitsPerSample[0] = pSource->sane_param.depth;
pImageInfo->PixelType = TWPT_GRAY;
}
else else
{ {
ERR("Unhandled source frame type\n"); ERR("Unhandled source frame type %i\n",pSource->sane_param.format);
twRC = TWRC_FAILURE; twRC = TWRC_FAILURE;
pSource->twCC = TWCC_SEQERROR; pSource->twCC = TWCC_SEQERROR;
} }