Attachment 593318 Details for Bug 803759 – Quick patch that revert broken changes

[patch] Quick patch that revert broken changes

hplip-3.12.6-revert-broken-changes.patch (text/plain), 3.29 KB, created by Nicolas Dufresne on 2012-06-20 22:20:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nicolas Dufresne

Created: 2012-06-20 22:20:39 UTC

Size: 3.29 KB

patch

obsolete

>diff -Nru hplip-3.12.6/scan/sane/soapht.c hplip-3.12.6.patch/scan/sane/soapht.c
>--- hplip-3.12.6/scan/sane/soapht.c	2012-06-18 06:42:51.000000000 -0400
>+++ hplip-3.12.6.patch/scan/sane/soapht.c	2012-06-20 18:13:41.339660394 -0400
>@@ -514,7 +514,16 @@
>    soapht_control_option(session, SOAP_OPTION_INPUT_SOURCE, SANE_ACTION_SET_AUTO, NULL, NULL); /* set default option */  
> 
>    /* Set supported resolutions. */
>-     soapht_control_option(session, SOAP_OPTION_SCAN_RESOLUTION, SANE_ACTION_SET_AUTO, NULL, NULL); /* set default option */
>+   i=1;
>+   session->resolutionList[i++] = 75;
>+   session->resolutionList[i++] = 100;
>+   session->resolutionList[i++] = 150;
>+   session->resolutionList[i++] = 200;
>+   session->resolutionList[i++] = 300;
>+   session->resolutionList[i++] = 600;
>+   //session->resolutionList[i++] = 1200;
>+   session->resolutionList[0] = i-1;    /* length of word_list */
>+   soapht_control_option(session, SOAP_OPTION_SCAN_RESOLUTION, SANE_ACTION_SET_AUTO, NULL, NULL); /* set default option */
> 
>    /* Set supported contrast. */
>    soapht_control_option(session, SOAP_OPTION_CONTRAST, SANE_ACTION_SET_AUTO, NULL, NULL); /* set default option */
>@@ -651,27 +660,16 @@
>          }
>          else if (action == SANE_ACTION_SET_VALUE)
>          {
>-          for (i=0; ps->inputSourceList[i]; i++)
>-           {
>-             if (strcasecmp(ps->inputSourceList[i], value) == 0)
>-             {
>-               ps->currentInputSource = ps->inputSourceMap[i];
>-               set_input_source_side_effects(ps, ps->currentInputSource);
>-               if(ps->currentInputSource == IS_ADF || ps->currentInputSource == IS_ADF_DUPLEX)
>-               {
>-                 i = ps->adf_resolutionList[0] + 1;
>-                 while(i--) ps->resolutionList[i] = ps->adf_resolutionList[i];
>-               }
>-               else //if(ps->currentInputSource == IS_PLATEN) 
>+            for (i=0; ps->inputSourceList[i]; i++)
>+            {
>+               if (strcasecmp(ps->inputSourceList[i], value) == 0)
>                {
>-                 i = ps->platen_resolutionList[0] + 1;
>-                 while(i--) ps->resolutionList[i] = ps->platen_resolutionList[i];
>+                  ps->currentInputSource = ps->inputSourceMap[i];
>+                  set_input_source_side_effects(ps, ps->currentInputSource);
>+                  stat = SANE_STATUS_GOOD;
>+                  break;
>                }
>-               mset_result |= SANE_INFO_RELOAD_PARAMS | SANE_INFO_RELOAD_OPTIONS;
>-               stat = SANE_STATUS_GOOD;
>-               break;
>-             }
>-           }
>+            }
>          }
>          else
>          {  /* Set default. */
>diff -Nru hplip-3.12.6/scan/sane/soaphti.h hplip-3.12.6.patch/scan/sane/soaphti.h
>--- hplip-3.12.6/scan/sane/soaphti.h	2012-06-18 06:42:51.000000000 -0400
>+++ hplip-3.12.6.patch/scan/sane/soaphti.h	2012-06-20 18:13:41.338660390 -0400
>@@ -133,12 +133,9 @@
> 
>    SANE_Fixed platen_min_width, platen_min_height;
>    SANE_Range platen_tlxRange, platen_tlyRange, platen_brxRange, platen_bryRange;
>-   SANE_Int platen_resolutionList[MAX_LIST_SIZE];
>-
>    SANE_Fixed adf_min_width, adf_min_height;
>    SANE_Range adf_tlxRange, adf_tlyRange, adf_brxRange, adf_bryRange;
>-   SANE_Int adf_resolutionList[MAX_LIST_SIZE];
>-   
>+
>    IP_HANDLE ip_handle;
> 
>    int index;                    /* dime buffer index */

Actions: View | Diff

Attachments on bug 803759: 593318