Huw Davies : wineps: Move the default resolution fallback to the ppd parser .
Alexandre Julliard
julliard at winehq.org
Thu Apr 12 15:23:12 CDT 2012
Module: wine
Branch: master
Commit: 1d2cd06592da89b0a8401cc8a1d331181a8a8f7a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d2cd06592da89b0a8401cc8a1d331181a8a8f7a
Author: Huw Davies <huw at codeweavers.com>
Date: Thu Apr 12 13:03:13 2012 +0100
wineps: Move the default resolution fallback to the ppd parser.
---
dlls/wineps.drv/init.c | 5 -----
dlls/wineps.drv/ppd.c | 4 ++++
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c
index 0134bd6..584254c 100644
--- a/dlls/wineps.drv/init.c
+++ b/dlls/wineps.drv/init.c
@@ -707,11 +707,6 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name)
goto fail;
}
- /* Some gimp-print ppd files don't contain a DefaultResolution line
- set it to 300 if it's not specified */
- if(pi->ppd->DefaultResolution == 0)
- pi->ppd->DefaultResolution = 300;
-
if(using_default_devmode) {
DWORD papersize;
diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c
index c4dff21..456195d 100644
--- a/dlls/wineps.drv/ppd.c
+++ b/dlls/wineps.drv/ppd.c
@@ -634,6 +634,10 @@ PPD *PSDRV_ParsePPD(char *fname)
list_init( &ppd->InputSlots );
list_init( &ppd->Duplexes );
+ /* Some gimp-print ppd files don't contain a DefaultResolution line
+ so default to 300 */
+ ppd->DefaultResolution = 300;
+
/*
* The Windows PostScript drivers create the following "virtual bin" for
* every PostScript printer
More information about the wine-cvs
mailing list