xpdf page numbering is not zero-based!

* xpdf/gpdf-view.cc (gpdf_view_key_press_event): xpdf page
numbering is not zero-based!

* xpdf/GfxState.cc (GfxDeviceCMYKColorSpace::getRGB): special case
cmyk k-only colors

* xpdf/GPOutputDev.h: declare drawImage

* xpdf/GPOutputDev.cc (getFontFace): forgot to rename one
font_name to gfont_name; cleanup whitespace in the source
(drawImage): implement. (Does not render output on
GnomePrintPreview older than 2002-06-14)

* shell/gpdf.c (gw_control_load_pdf): s|file://|file:|

diff --git a/pdf/xpdf/GfxState.cc b/pdf/xpdf/GfxState.cc
index 1668c246796924c0431b6879c3fca50540cd4fec..c0f5ff454894d2a03b3d76da3e733a598b0924cd 100644 (file)
--- a/pdf/xpdf/GfxState.cc
+++ b/pdf/xpdf/GfxState.cc
@@ -410,6 +410,12 @@ void GfxDeviceCMYKColorSpace::getGray(GfxColor *color, double *gray) {
 void GfxDeviceCMYKColorSpace::getRGB(GfxColor *color, GfxRGB *rgb) {
   double c, m, y, aw, ac, am, ay, ar, ag, ab;
 
+  /* FIXME ask Derek */
+  if (color->c[0] == 0.0 && color->c[1] == 0 && color->c[2] == 0) {
+    rgb->r = rgb->g = rgb->b = 1 - color->c[3];
+    return;
+  }
+    
   c = clip01(color->c[0] + color->c[3]);
   m = clip01(color->c[1] + color->c[3]);
   y = clip01(color->c[2] + color->c[3]);