← Back to branch summary

~ubuntu-branches/ubuntu/precise/ghostscript/precise

« back to all changes in this revision

Viewing changes to cups/gdevcups.c

  • Committer: Package Import Robot
  • Author(s): Till Kamppeter
  • Date: 2012-02-03 17:39:41 UTC
  • mfrom: (1.1.30)
  • Revision ID: package-import@ubuntu.com-20120203173941-5kza3knm2pvgsgh4
Tags: 9.05~dfsg~20120203-0ubuntu1
https://launchpad.net/bugs/925950
* New upstream release
   - GIT snapshot from February, 2 2012.
   - Upstream fix for X11 display output device (LP: #925950).
   - Additional fix for paper size matching of CUPS Raster output device.
* debian/rules: Reverted changes of last package, problem fixed upstresm.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cups/gdevcups.c
3463
3463
               (cups->MediaSize[1] > cups->PPD->custom_max[1])) &&
3464
3464
              ((cups->MediaSize[0] <= cups->PPD->custom_max[1]) &&
3465
3465
              (cups->MediaSize[1] <= cups->PPD->custom_max[0]))) {
3466
 
            /* Do not rotate */
3467
 
            cups->landscape = 0;
3468
 
 
3469
 
            for (i = 0; i < 4; i ++)
3470
 
              margins[i] = cups->PPD->custom_margins[i] / 72.0;
3471
 
            if (xflip == 1)
3472
 
            {
3473
 
              swap = margins[0]; margins[0] = margins[2]; margins[2] = swap;
3474
 
            }
3475
 
            if (yflip == 1)
3476
 
            {
3477
 
              swap = margins[1]; margins[1] = margins[3]; margins[3] = swap;
3478
 
            }
3479
 
          } else {
3480
3466
            /* Rotate */
3481
3467
            gx_device_set_media_size(pdev, cups->MediaSize[1],
3482
3468
                                     cups->MediaSize[0]);
3495
3481
            {
3496
3482
              swap = margins[0]; margins[0] = margins[2]; margins[2] = swap;
3497
3483
            }
 
3484
          } else {
 
3485
            /* Do not rotate */
 
3486
            cups->landscape = 0;
 
3487
 
 
3488
            for (i = 0; i < 4; i ++)
 
3489
              margins[i] = cups->PPD->custom_margins[i] / 72.0;
 
3490
            if (xflip == 1)
 
3491
            {
 
3492
              swap = margins[0]; margins[0] = margins[2]; margins[2] = swap;
 
3493
            }
 
3494
            if (yflip == 1)
 
3495
            {
 
3496
              swap = margins[1]; margins[1] = margins[3]; margins[3] = swap;
 
3497
            }
3498
3498
          }
3499
3499
        }
3500
3500
      }