Merge changes from CUPS 1.5.1-r9875.

[thirdparty/cups.git] / filter / image-zoom.c

diff --git a/filter/image-zoom.c b/filter/image-zoom.c
index f921fca899c81a21f6f9d1a690072cf1eb7ac84f..c631a502106596c5c5b459cda08c2465438e1c48 100644 (file)
--- a/filter/image-zoom.c
+++ b/filter/image-zoom.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: image-zoom.c 6649 2007-07-11 21:46:42Z mike $"
  *
- *   cupsImage zoom routines for the Common UNIX Printing System (CUPS).
+ *   cupsImage zoom routines for CUPS.
  *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 1993-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -136,7 +136,7 @@ _cupsImageZoomNew(
     z->ystep   = z->height / z->ysize;
     z->yincr   = 1;
     z->instep  = z->xstep * z->depth;
-    z->inincr  = z->xincr * z->depth;
+    z->inincr  = /* z->xincr * */ z->depth; /* z->xincr is always 1 */
 
     if (z->width < img->ysize)
       z->xmax = z->width;
@@ -163,7 +163,7 @@ _cupsImageZoomNew(
     z->ystep   = z->height / z->ysize;
     z->yincr   = 1;
     z->instep  = z->xstep * z->depth;
-    z->inincr  = z->xincr * z->depth;
+    z->inincr  = /* z->xincr * */ z->depth; /* z->xincr is always 1 */
 
     if (z->width < img->xsize)
       z->xmax = z->width;