Class2: Disable correctPhaseCData for JBIG & JPEG.

From Lee:
|  commit 6a8ca65e979bf39f16461e13b221ad6768e22b5b
|  Author: Lee Howard <faxguy@howardsilvan.com>
|  Date:   Thu Feb 15 23:36:39 2007 +0000
|
|    Disable correctPhaseCData for JBIG & JPEG.

diff --git a/faxd/Class2.c++ b/faxd/Class2.c++
index 5c5638397c87aa61ed3e7d30056eea73efe7d67d..97a0086dcbf653e331b105837361d49f8cad55d1 100644 (file)
--- a/faxd/Class2.c++
+++ b/faxd/Class2.c++
@@ -441,7 +441,7 @@ Class2Modem::parseClass2Capabilities(const char* cap, Class2Params& params, bool
             * as a bitmap to suit T.30, but a T.32-following modem will only report 
             * one supported receiver format (and not all of them).  Thus when 
             * parsing T.32 DIS we must convert the modem response to a bitmap.  
-            * However, due to the inconguency between T.30 and T.32 the bitmap will 
+            * However, due to the incongruency between T.30 and T.32 the bitmap will
             * only contain the the reported format and the required format.
             */
            if (isDIS) {

diff --git a/faxd/Class2Send.c++ b/faxd/Class2Send.c++
index 81be8b64c3b2ce197eeb28d8efbb4e16173f5318..398f23ea49bff9905eab68ede7f0fea06232afe6 100644 (file)
--- a/faxd/Class2Send.c++
+++ b/faxd/Class2Send.c++
@@ -500,7 +500,8 @@ Class2Modem::sendPageData(TIFF* tif, u_int pageChop)
         /*
          * correct broken Phase C (T.4/T.6) data if necessary
          */
-       lastByte = correctPhaseCData(dp, &totdata, fillorder, (conf.class2RTFCC ? params : newparams), rows);
+        if (params.df <= DF_2DMMR)
+           lastByte = correctPhaseCData(dp, &totdata, fillorder, (conf.class2RTFCC ? params : newparams), rows);
 
        params = newparams;             // revert back