Bug 389: only use normal and fine resolutions when not using XVRes

diff --git a/CHANGES b/CHANGES
index d0dc7c1f7835fa644b388e1712997880807d34e6..349bfac135e0d3da7a10db4fc9a877bae554ebd8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 
 Changelog for HylaFAX 4.2.0
 
+* only use normal and fine resolutions when not using XVRes (28 Jun 2004)
 * limit fax retrains to allowed moments (28 Jun 2004)
 * change DynamicLocalID to DynamicConfig (22 Jun 2004)
 * fix V.17 fallbacks after the CTC/CTR exchange (21 Jun 2004)

diff --git a/faxd/faxQueueApp.c++ b/faxd/faxQueueApp.c++
index 919f02d4720bdd9852ba92259fc782317c7842da..e19bccc147eb0653fa6bd1e6eef78784ba941e83 100644 (file)
--- a/faxd/faxQueueApp.c++
+++ b/faxd/faxQueueApp.c++
@@ -549,14 +549,10 @@ faxQueueApp::prepareJob(Job& job, FaxRequest& req,
            params.vr = VR_300X300;
        if (info.getSupportsVRes() & VR_R16 && job.modem->supportsVR(VR_R16))
            params.vr = VR_R16;
-    } else {
-       if (info.getSupportsVRes() & VR_200X100 && job.modem->supportsVR(VR_200X100))
-           params.vr = VR_200X100;
+    } else {                           // limit ourselves to normal and fine
        if (vres > 150) {
            if (info.getSupportsVRes() & VR_FINE && job.modem->supportsVR(VR_FINE))
                params.vr = VR_FINE;
-           if (info.getSupportsVRes() & VR_200X200 && job.modem->supportsVR(VR_200X200))
-               params.vr = VR_200X200;
        }
     }
     params.setPageWidthInMM(