[poppler] poppler/poppler: Gfx.cc, 1.6, 1.7 OutputDev.cc, 1.3, 1.4 OutputDev.h, 1.4, 1.5

[Jeff Muizelaar]

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

Modified Files:
	Gfx.cc OutputDev.cc OutputDev.h 
Log Message:
2006-02-04  Jeff Muizelaar  <jeff at infidigm.net>

	* poppler/Gfx.cc:
	* poppler/OutputDev.cc:
	* poppler/OutputDev.h: Let output devices know about pdf grouping
	operators.
	Patch by Thorkild Stray.


Index: Gfx.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/Gfx.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Gfx.cc	18 Jan 2006 22:32:13 -0000	1.6
+++ Gfx.cc	4 Feb 2006 21:10:41 -0000	1.7
@@ -3591,9 +3591,16 @@
     printf("\n");
     fflush(stdout);
   }
+
+  if(numArgs == 2) {
+    out->beginMarkedContent(args[0].getName(),args[1].getDict());
+  } else {
+    out->beginMarkedContent(args[0].getName());
+  }
 }
 
 void Gfx::opEndMarkedContent(Object args[], int numArgs) {
+  out->endMarkedContent();
 }
 
 void Gfx::opMarkPoint(Object args[], int numArgs) {
@@ -3604,6 +3611,13 @@
     printf("\n");
     fflush(stdout);
   }
+
+  if(numArgs == 2) {
+    out->markPoint(args[0].getName(),args[1].getDict());
+  } else {
+    out->markPoint(args[0].getName());
+  }
+
 }
 
 //------------------------------------------------------------------------

Index: OutputDev.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/OutputDev.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- OutputDev.cc	30 Oct 2005 20:29:05 -0000	1.3
+++ OutputDev.cc	4 Feb 2006 21:10:41 -0000	1.4
@@ -121,6 +121,22 @@
   drawImage(state, ref, str, width, height, colorMap, NULL, gFalse);
 }
 
+void OutputDev::endMarkedContent() {
+}
+
+void OutputDev::beginMarkedContent(char *name) {
+}
+
+void OutputDev::beginMarkedContent(char *name, Dict *properties) {
+}
+
+void OutputDev::markPoint(char *name) {
+}
+
+void OutputDev::markPoint(char *name, Dict *properties) {
+}
+
+
 #if OPI_SUPPORT
 void OutputDev::opiBegin(GfxState *state, Dict *opiDict) {
 }

Index: OutputDev.h
===================================================================
RCS file: /cvs/poppler/poppler/poppler/OutputDev.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- OutputDev.h	1 Nov 2005 15:29:32 -0000	1.4
+++ OutputDev.h	4 Feb 2006 21:10:41 -0000	1.5
@@ -183,6 +183,16 @@
 				   int maskWidth, int maskHeight,
 				   GfxImageColorMap *maskColorMap);
 
+  //----- grouping operators
+
+  virtual void endMarkedContent();
+  virtual void beginMarkedContent(char *name);
+  virtual void beginMarkedContent(char *name, Dict *properties);
+  virtual void markPoint(char *name);
+  virtual void markPoint(char *name, Dict *properties);
+  
+  
+
 #if OPI_SUPPORT
   //----- OPI functions
   virtual void opiBegin(GfxState *state, Dict *opiDict);