[poppler] poppler/utils: ImageOutputDev.cc, 1.3, 1.4 ImageOutputDev.h, 1.1, 1.2

[Kristian Høgsberg]

Update of /cvs/poppler/poppler/utils
In directory kemper:/tmp/cvs-serv15640/utils

Modified Files:
	ImageOutputDev.cc ImageOutputDev.h 
Log Message:
2006-05-22  Kristian Høgsberg  <krh at redhat.com>

	Patch from Rainer Keller to fix the ImageOutputDev (#6984).
	
	* utils/ImageOutputDev.cc (drawImage): Upate to work with new
	16-bit color representation.

	* utils/ImageOutputDev.h: Return gTrue for needNonText().


Index: ImageOutputDev.cc
===================================================================
RCS file: /cvs/poppler/poppler/utils/ImageOutputDev.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ImageOutputDev.cc	23 Jan 2006 15:40:54 -0000	1.3
+++ ImageOutputDev.cc	22 May 2006 19:58:41 -0000	1.4
@@ -184,9 +184,9 @@
       p = imgStr->getLine();
       for (x = 0; x < width; ++x) {
 	colorMap->getRGB(p, &rgb);
-	fputc((int)(rgb.r * 255 + 0.5), f);
-	fputc((int)(rgb.g * 255 + 0.5), f);
-	fputc((int)(rgb.b * 255 + 0.5), f);
+	fputc(colToByte(rgb.r), f);
+	fputc(colToByte(rgb.g), f);
+	fputc(colToByte(rgb.b), f);
 	p += colorMap->getNumPixelComps();
       }
     }

Index: ImageOutputDev.h
===================================================================
RCS file: /cvs/poppler/poppler/utils/ImageOutputDev.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ImageOutputDev.h	12 Dec 2005 20:15:11 -0000	1.1
+++ ImageOutputDev.h	22 May 2006 19:58:41 -0000	1.2
@@ -45,7 +45,7 @@
   virtual GBool interpretType3Chars() { return gFalse; }
 
   // Does this device need non-text content?
-  virtual GBool needNonText() { return gFalse; }
+  virtual GBool needNonText() { return gTrue; }
 
   //---- get info about output device