diff options
| author | jlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2006-05-22 21:33:05 +0000 |
|---|---|---|
| committer | jlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2006-05-22 21:33:05 +0000 |
| commit | f301802fc285c5ec9effadfbf13de653822dddd8 (patch) | |
| tree | 6d627f9da77fa964c6797d263dc9a7bc58249f02 /filter/image-jpeg.c | |
| parent | a9252913e79774ff099dcc33283c1fb1ae3cb61f (diff) | |
| download | cups-f301802fc285c5ec9effadfbf13de653822dddd8.tar.gz | |
Load cups into easysw/current.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@158 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'filter/image-jpeg.c')
| -rw-r--r-- | filter/image-jpeg.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/filter/image-jpeg.c b/filter/image-jpeg.c index 6b1dc9c26..5a07a7bbd 100644 --- a/filter/image-jpeg.c +++ b/filter/image-jpeg.c @@ -1,9 +1,9 @@ /* - * "$Id: image-jpeg.c 4741 2005-10-02 04:25:52Z mike $" + * "$Id: image-jpeg.c 5508 2006-05-11 11:41:16Z mike $" * * JPEG image routines for the Common UNIX Printing System (CUPS). * - * Copyright 1993-2005 by Easy Software Products. + * Copyright 1993-2006 by Easy Software Products. * * These coded instructions, statements, and computer programs are the * property of Easy Software Products and are protected by Federal @@ -195,7 +195,6 @@ _cupsImageReadJPEG( cupsImageRGBAdjust(in, img->xsize, saturation, hue); if ((img->colorspace == CUPS_IMAGE_WHITE && cinfo.out_color_space == JCS_GRAYSCALE) || - (img->colorspace == CUPS_IMAGE_RGB && cinfo.out_color_space == JCS_RGB) || (img->colorspace == CUPS_IMAGE_CMYK && cinfo.out_color_space == JCS_CMYK)) { #ifdef DEBUG @@ -255,6 +254,9 @@ _cupsImageReadJPEG( default : break; + case CUPS_IMAGE_RGB : + cupsImageRGBToRGB(in, out, img->xsize); + break; case CUPS_IMAGE_WHITE : cupsImageRGBToWhite(in, out, img->xsize); break; @@ -318,5 +320,5 @@ _cupsImageReadJPEG( /* - * End of "$Id: image-jpeg.c 4741 2005-10-02 04:25:52Z mike $". + * End of "$Id: image-jpeg.c 5508 2006-05-11 11:41:16Z mike $". */ |