← Back to branch summary

~ubuntu-branches/ubuntu/saucy/sane-backends/saucy

« back to all changes in this revision

Viewing changes to sanei/sanei_magic.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2011-02-14 14:28:56 UTC
  • mfrom: (1.2.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20110214142856-6gxjetg88q9zctid
Tags: 1.0.22-0ubuntu1
* New upstream release
* debian/control:
  - Use standards version 3.9.1
* debian/patches/allow_dll.d_symlinks.patch:
* debian/patches/fix_epson2_cancel.patch:
* debian/patches/fix_epson2_commands.patch:
* debian/patches/fix_xerox_mfp_color_mode.patch:
* debian/patches/genesys_disable_raw_data_log.patch:
* debian/patches/no_translations.patch:
* debian/patches/saned_exit_avahi_process.patch:
* debian/patches/scsi_perfection_2450.patch:
* debian/patches/scsi_scanjet_4c.patch:
* debian/patches/xerox_mfp_new_ids.patch:
  - Applied upstream
* debian/watch:
  - Dropped, the URL is not consistent between releases

Show diffs side-by-side

added added

removed removed

Lines of Context:
sanei/sanei_magic.c
508
508
  SANE_Status ret = SANE_STATUS_GOOD;
509
509
 
510
510
  int pwidth = params->pixels_per_line;
511
 
  int width = params->bytes_per_line;
512
511
  int height = params->lines;
513
512
 
514
513
  double TSlope = 0;
724
723
{
725
724
  SANE_Status ret = SANE_STATUS_GOOD;
726
725
 
727
 
  int slopes = 11;
728
 
  int offsets = 11;
 
726
  int slopes = 31;
 
727
  int offsets = 31;
729
728
  double maxSlope = 1;
730
729
  double minSlope = -1;
731
730
  int maxOffset = resolution/6;
1021
1020
 
1022
1021
  /* dont forget to cleanup */
1023
1022
  cleanup:
1024
 
  for(i=0;i<10;i++){
 
1023
  for(i=0;i<slopes;i++){
1025
1024
    if(lines[i])
1026
1025
      free(lines[i]);
1027
1026
  }
1341
1340
          near += buffer[i*bwidth + j*depth + k];
1342
1341
        }
1343
1342
  
1344
 
        if(abs(near - far) > winLen*depth*9){
 
1343
        if(abs(near - far) > 50*winLen*depth - near*40/255){
1345
1344
          buff[i] = j;
1346
1345
          break;
1347
1346
        }