From d576fbeadc7f52a0b7c63ba0793f8bdcceccc15b Mon Sep 17 00:00:00 2001
From: scuri <scuri>
Date: Tue, 15 Dec 2009 19:33:00 +0000
Subject: *** empty log message ***

---
 src/cd.def      |  1 +
 src/drv/cdpdf.c | 14 ++++++++++++++
 src/gdk/cdgdk.c |  4 ++--
 src/gdk/cdgdk.h |  6 ------
 4 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/cd.def b/src/cd.def
index 004538b..754ed69 100644
--- a/src/cd.def
+++ b/src/cd.def
@@ -147,6 +147,7 @@ EXPORTS
   wdWorld2Canvas
   wdCanvas2World
   wdCanvasSetTransform
+  wdCanvasGetTransform
   wdCanvasTranslate
   wdCanvasScale
 
diff --git a/src/drv/cdpdf.c b/src/drv/cdpdf.c
index 8faa824..a5d91d4 100644
--- a/src/drv/cdpdf.c
+++ b/src/drv/cdpdf.c
@@ -1396,6 +1396,19 @@ static cdAttribute pdf_attrib =
   get_pdf_attrib
 }; 
 
+static char* get_version_attrib(cdCtxCanvas* ctxcanvas)
+{
+  (void)ctxcanvas;
+  return (char*)PDF_get_parameter(ctxcanvas->pdf, "version", 0);
+}
+
+static cdAttribute version_attrib =
+{
+  "PDFLIBVERSION",
+  NULL,
+  get_version_attrib
+}; 
+
 static void cdcreatecanvas(cdCanvas* canvas, void *data)
 {
   char *line = (char *)data;
@@ -1437,6 +1450,7 @@ static void cdcreatecanvas(cdCanvas* canvas, void *data)
   cdRegisterAttribute(canvas, &creator_attrib);
   cdRegisterAttribute(canvas, &author_attrib);
   cdRegisterAttribute(canvas, &keywords_attrib);
+  cdRegisterAttribute(canvas, &version_attrib);
 
   setpdfdefaultvalues(ctxcanvas);
 
diff --git a/src/gdk/cdgdk.c b/src/gdk/cdgdk.c
index e0692fc..5a84c6e 100644
--- a/src/gdk/cdgdk.c
+++ b/src/gdk/cdgdk.c
@@ -15,8 +15,8 @@
 #include <gdk/gdk.h>
 
 
-GdkColor (*cdgdkGetPixel)(cdCtxCanvas *ctxcanvas, unsigned long rgb); /* access to the color table */
-void (*cdgdkGetRGB)(cdCtxCanvas *ctxcanvas, unsigned long pixel, 
+static GdkColor (*cdgdkGetPixel)(cdCtxCanvas *ctxcanvas, unsigned long rgb); /* access to the color table */
+static void (*cdgdkGetRGB)(cdCtxCanvas *ctxcanvas, unsigned long pixel, 
                                           unsigned char* red, 
                                           unsigned char* green, 
                                           unsigned char* blue); /* access to the color table */
diff --git a/src/gdk/cdgdk.h b/src/gdk/cdgdk.h
index 82cb25d..86ac7a6 100644
--- a/src/gdk/cdgdk.h
+++ b/src/gdk/cdgdk.h
@@ -69,12 +69,6 @@ struct _cdCtxCanvas {
 #define cdCOLOR8TO16(_x) (_x*257)  /* 65535/255 = 257 */
 #define cdCOLOR16TO8(_x) ((unsigned char)(_x/257))
 
-extern GdkColor (*cdgdkGetPixel)(cdCtxCanvas *ctxcanvas, unsigned long rgb);
-extern void (*cdxGetRGB)(cdCtxCanvas *ctxcanvas, unsigned long pixel, 
-                                                 unsigned char* red, 
-                                                 unsigned char* green, 
-                                                 unsigned char* blue);
-
 cdCtxCanvas *cdgdkCreateCanvas(cdCanvas* canvas, GdkDrawable* wnd, GdkScreen* scr, GdkVisual* vis);
 void cdgdkInitTable(cdCanvas* canvas);
 void cdgdkKillCanvas(cdCtxCanvas *ctxcanvas);
-- 
cgit v1.2.3