commit 2c0fea94e8b8a6f868c1db6066043b9e915d2ca5
author Jeremy White <jwhite@codeweavers.com> Mon Mar 02 17:08:11 2009 -0600
committer Alexandre Julliard <julliard@winehq.org> Tue Mar 03 12:36:12 2009 +0100
tree 873349e09040ada2821b6e3bd771bb9b430b02c5
parent 1d58b7e1ccb12a3185790c9e67e461eaa722bd79

sane.ds: Implement grayscale and B&W scanning for native image transfers.

dlls/sane.ds/capability.c

diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c
index 63a8361..aacc6de 100644
--- a/dlls/sane.ds/capability.c
+++ b/dlls/sane.ds/capability.c
@@ -685,9 +685,11 @@
 /* ICAP_PIXELFLAVOR */
 static TW_UINT16 SANE_ICAPPixelFlavor (pTW_CAPABILITY pCapability, TW_UINT16 action)
 {
+    TW_UINT16 twCC = TWCC_BADCAP;
+#ifdef SONAME_LIBSANE
     static const TW_UINT32 possible_values[] = { TWPF_CHOCOLATE, TWPF_VANILLA };
     TW_UINT32 val;
-    TW_UINT16 twCC = TWCC_BADCAP;
+    TW_UINT32 flavor = activeDS.sane_param.depth == 1 ? TWPF_VANILLA : TWPF_CHOCOLATE;
 
     TRACE("ICAP_PIXELFLAVOR\n");
 
@@ -700,7 +702,7 @@
 
         case MSG_GET:
             twCC = msg_get_enum(pCapability, possible_values, sizeof(possible_values) / sizeof(possible_values[0]),
-                    TWTY_UINT16, TWPF_CHOCOLATE, TWPF_CHOCOLATE);
+                    TWTY_UINT16, flavor, flavor);
             break;
 
         case MSG_SET:
@@ -712,16 +714,17 @@
             break;
 
         case MSG_GETDEFAULT:
-            twCC = set_onevalue(pCapability, TWTY_UINT16, TWPF_CHOCOLATE);
+            twCC = set_onevalue(pCapability, TWTY_UINT16, flavor);
             break;
 
         case MSG_RESET:
             /* .. fall through intentional .. */
 
         case MSG_GETCURRENT:
-            twCC = set_onevalue(pCapability, TWTY_UINT16, TWPF_CHOCOLATE);
+            twCC = set_onevalue(pCapability, TWTY_UINT16, flavor);
             break;
     }
+#endif
     return twCC;
 }