From: Martin Kretzschmar <mkretzschmar@src.gnome.org>
Date: Sat, 9 Nov 2002 16:20:59 +0000 (+0000)
Subject: xpdf page numbering is not zero-based!
X-Git-Tag: XPDF_1_01~15
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=c8a16b3469cf57c02e49439073a60908b4a93f91;p=evince.git

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 1668c246..c0f5ff45 100644
--- 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]);