Merge changes from CUPS 1.4svn-r8131.

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

diff --git a/filter/image-colorspace.c b/filter/image-colorspace.c
index 2cb4ced018af2e1c31a4ad51b21976dcb39281fa..981dc30884a80eae073659f25267aa98563ee6dd 100644 (file)
--- a/filter/image-colorspace.c
+++ b/filter/image-colorspace.c
@@ -1,28 +1,19 @@
 /*
- * "$Id: image-colorspace.c 5519 2006-05-12 15:06:42Z mike $"
+ * "$Id: image-colorspace.c 7720 2008-07-11 22:46:21Z mike $"
  *
  *   Colorspace conversions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007-2008 by Apple Inc.
  *   Copyright 1993-2006 by Easy Software Products.
  *
  *   The color saturation/hue matrix stuff is provided thanks to Mr. Paul
  *   Haeberli at "http://www.sgi.com/grafica/matrix/index.html".
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *
@@ -516,8 +507,7 @@ cupsImageRGBAdjust(cups_ib_t *pixels,       /* IO - Input/output pixels */
   static cups_clut_t   *lut = NULL;    /* Lookup table for matrix */
 
 
-  if (saturation != last_sat ||
-      hue != last_hue)
+  if (saturation != last_sat || hue != last_hue || !lut)
   {
    /*
     * Build the color adjustment matrix...
@@ -1573,5 +1563,5 @@ zshear(float mat[3][3],                   /* I - Matrix */
 
 
 /*
- * End of "$Id: image-colorspace.c 5519 2006-05-12 15:06:42Z mike $".
+ * End of "$Id: image-colorspace.c 7720 2008-07-11 22:46:21Z mike $".
  */