Attachment 101585 Details for Bug 156300

CUPS patch to use poppler (1st try, not complete)

cups-1.2.2-poppler.patch (text/x-diff), 4.77 KB, created by Klaus Singvogel on 2006-10-16 15:34:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Klaus Singvogel

Created: 2006-10-16 15:34:19 UTC

Size: 4.77 KB

patch

obsolete

>--- cups-1.2.2/pdftops/GlobalParams.cxx.orig	2005-09-17 16:52:15.000000000 +0200
>+++ cups-1.2.2/pdftops/GlobalParams.cxx	2006-07-27 15:04:39.000000000 +0200
>@@ -26,11 +26,6 @@
> #if HAVE_PAPER_H
> #include <paper.h>
> #endif
>-#include "gmem.h"
>-#include "GString.h"
>-#include "GList.h"
>-#include "GHash.h"
>-#include "gfile.h"
> #include "Error.h"
> #include "NameToCharCode.h"
> #include "CharCodeToUnicode.h"
>@@ -38,6 +33,10 @@
> #include "CMap.h"
> #include "BuiltinFontTables.h"
> #include "FontEncodingTables.h"
>+#include <poppler/goo/gtypes.h>
>+#include <poppler/goo/gmem.h>
>+#include <poppler/goo/GooString.h>
>+#include <poppler/goo/gfile.h>
> #ifdef ENABLE_PLUGINS
> #  include "XpdfPluginAPI.h"
> #endif
>@@ -321,7 +320,7 @@
> 
> GlobalParams::GlobalParams(char *cfgFileName) {
>   UnicodeMap *map;
>-  GString *fileName;
>+  GooString *fileName;
>   FILE *f;
>   int i;
> 
>--- cups-1.2.2/pdftops/GlobalParams.h.orig	2005-09-17 16:52:15.000000000 +0200
>+++ cups-1.2.2/pdftops/GlobalParams.h	2006-07-27 15:04:59.000000000 +0200
>@@ -16,7 +16,7 @@
> #endif
> 
> #include <stdio.h>
>-#include "gtypes.h"
>+#include <poppler/goo/gtypes.h>
> #include "CharTypes.h"
> 
> #if MULTITHREADED
>--- cups-1.2.2/pdftops/Makefile.orig	2006-05-04 22:53:35.000000000 +0200
>+++ cups-1.2.2/pdftops/Makefile	2006-07-27 15:11:52.000000000 +0200
>@@ -10,62 +10,13 @@
> 
> include ../Makedefs
> 
>+LIBS += -lpoppler
>+
> #
> # Object files...
> #
> 
>-LIBOBJS	=	\
>-		Annot.o \
>-		Array.o \
>-		BuiltinFont.o \
>-		BuiltinFontTables.o \
>-		Catalog.o \
>-		CharCodeToUnicode.o \
>-		CMap.o \
>-		Decrypt.o \
>-		Dict.o \
>-		Error.o \
>-		FoFiBase.o \
>-		FoFiEncodings.o \
>-		FoFiTrueType.o \
>-		FoFiType1C.o \
>-		FoFiType1.o \
>-		FontEncodingTables.o \
>-		Function.o \
>-		gfile.o \
>-		Gfx.o \
>-		GfxFont.o \
>-		GfxState.o \
>-		GHash.o \
>-		GList.o \
>-		GlobalParams.o \
>-		gmem.o \
>-		gmempp.o \
>-		GString.o \
>-		JArithmeticDecoder.o \
>-		JBIG2Stream.o \
>-		JPXStream.o \
>-		Lexer.o \
>-		Link.o \
>-		NameToCharCode.o \
>-		Object.o \
>-		Outline.o \
>-		OutputDev.o \
>-		Page.o \
>-		parseargs.o \
>-		Parser.o \
>-		PDFDoc.o \
>-		PDFDocEncoding.o \
>-		PSOutputDev.o \
>-		PSTokenizer.o \
>-		SecurityHandler.o \
>-		Stream.o \
>-		UnicodeMap.o \
>-		UnicodeTypeTable.o \
>-		XpdfPluginAPI.o \
>-		XRef.o
>-
>-OBJS	=	pdftops.o $(LIBOBJS)
>+OBJS	=	pdftops.o GlobalParams.o parseargs.o $(LIBOBJS)
> 
> TARGETS	=	libxpdf.a pdftops
> 
>@@ -119,9 +70,9 @@
> # pdftops
> #
> 
>-pdftops:	libxpdf.a pdftops.o ../cups/$(LIBCUPS)
>+pdftops:	${OBJS} ../cups/$(LIBCUPS)
> 	echo Linking $@...
>-	$(CXX) $(LDFLAGS) -o $@ pdftops.o libxpdf.a $(LIBS) $(CXXLIBS) -lm
>+	$(CXX) $(LDFLAGS) -o $@ ${OBJS} $(LIBS) $(CXXLIBS) -lm
> 
> 
> #
>@@ -139,7 +90,7 @@
> # Dependencies...
> #
> 
>-include Dependencies
>+#include Dependencies
> 
> 
> #
>--- cups-1.2.2/pdftops/parseargs.h.orig	2005-09-17 16:52:15.000000000 +0200
>+++ cups-1.2.2/pdftops/parseargs.h	2006-07-27 14:57:52.000000000 +0200
>@@ -13,7 +13,7 @@
> extern "C" {
> #endif
> 
>-#include "gtypes.h"
>+#include <poppler/goo/gtypes.h>
> 
> /*
>  * Argument kinds.
>--- cups-1.2.2/pdftops/pdftops.cxx.orig	2006-01-10 21:53:28.000000000 +0100
>+++ cups-1.2.2/pdftops/pdftops.cxx	2006-07-27 15:09:55.000000000 +0200
>@@ -35,20 +35,18 @@
> #include <stdlib.h>
> #include <stddef.h>
> #include <cups/string.h>
>-#include "parseargs.h"
>-#include "GString.h"
>-#include "gmem.h"
>-#include "Object.h"
>-#include "Stream.h"
>-#include "Array.h"
>-#include "Dict.h"
>-#include "XRef.h"
>-#include "Catalog.h"
>-#include "Page.h"
>-#include "PDFDoc.h"
>-#include "PSOutputDev.h"
>-#include "GlobalParams.h"
>-#include "Error.h"
>+#include <poppler/goo/GooString.h>
>+#include <poppler/goo/gmem.h>
>+#include <poppler/Object.h>
>+#include <poppler/Stream.h>
>+#include <poppler/Array.h>
>+#include <poppler/Dict.h>
>+#include <poppler/XRef.h>
>+#include <poppler/Catalog.h>
>+#include <poppler/Page.h>
>+#include <poppler/PDFDoc.h>
>+#include <poppler/PSOutputDev.h>
>+#include <poppler/Error.h>
> #include "config.h"
> 
> #include <cups/cups.h>
>@@ -63,8 +61,8 @@
>      char *argv[])			// I - Command-line arguments
> {
>   PDFDoc	*doc;			// Input file
>-  GString	*fileName;		// Input filename
>-  GString	*psFileName;		// Output filename
>+  GooString	*fileName;		// Input filename
>+  GooString	*psFileName;		// Output filename
>   PSLevel	level;			// PostScript level
>   PSOutputDev	*psOut;			// Output device
>   int		num_options;		// Number of options
>@@ -110,9 +108,9 @@
>       write(fd, buffer, bytes);
>     close(fd);
> 
>-    fileName = new GString(tempfile);
>+    fileName = new GooString(tempfile);
>   } else {
>-    fileName = new GString(argv[6]);
>+    fileName = new GooString(argv[6]);
>     tempfile[0] = '\0';
>   }
> 
>@@ -303,7 +301,7 @@
>   if (doc->isOk() && doc->okToPrint())
>   {
>     // CUPS always writes to stdout...
>-    psFileName = new GString("-");
>+    psFileName = new GooString("-");
> 
>     // write PostScript file
>     psOut = new PSOutputDev(psFileName->getCString(), doc->getXRef(),

Actions: View

Attachments on bug 156300: 101581 | 101582 | 101584 | 101585