[poppler] poppler/poppler: GfxState.cc,1.7,1.8 Stream.cc,1.7,1.8

[Kristian Høgsberg]

Update of /cvs/poppler/poppler/poppler
In directory gabe:/tmp/cvs-serv11834/poppler

Modified Files:
	GfxState.cc Stream.cc 
Log Message:
2005-12-09  Kristian Høgsberg  <krh at redhat.com>

        * poppler/GfxState.cc: Use colToByte() for converting GxfColorComp
        to bytes (really fix #5117).

        * poppler/Stream.cc: Remove duplicated check (#5243).



Index: GfxState.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/GfxState.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- GfxState.cc	4 Dec 2005 01:42:29 -0000	1.7
+++ GfxState.cc	9 Dec 2005 20:49:59 -0000	1.8
@@ -198,9 +198,9 @@
 
     getRGB (&color, &rgb);
     out[i] =
-	((int) (rgb.r >> 8) << 16) |
-	((int) (rgb.g >> 8) << 8) |
-	((int) (rgb.b >> 8) << 0);
+	((int) colToByte(rgb.r) << 16) |
+	((int) colToByte(rgb.g) << 8) |
+	((int) colToByte(rgb.b) << 0);
   }
 }
 

Index: Stream.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/Stream.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Stream.cc	1 Dec 2005 22:45:10 -0000	1.7
+++ Stream.cc	9 Dec 2005 20:49:59 -0000	1.8
@@ -2932,10 +2932,6 @@
     error(getPos(), "Bad number of components in DCT stream", prec);
     return gFalse;
   }
-  if (numComps <= 0 || numComps > 4) {
-    error(getPos(), "Bad number of components in DCT stream", prec);
-    return gFalse;
-  }
   if (prec != 8) {
     error(getPos(), "Bad DCT precision %d", prec);
     return gFalse;