[Bug 763] Class 2.x received g4 files are corrupted by HylaFAX

2D-MMR faxes received in Class 2.x on some Multitech modems are out of spec,
causing problems with some decoders (such as the one in libtiff). Thanks to
Patrice Fournier and iFAX Solutions.

diff --git a/faxd/G3Decoder.c++ b/faxd/G3Decoder.c++
index f06854870cd753658cfe7e7b80400b867a76fec8..868d5e687556117dc8ce4cae27f09ac3b399c172 100644 (file)
--- a/faxd/G3Decoder.c++
+++ b/faxd/G3Decoder.c++
@@ -216,7 +216,7 @@ G3Decoder::decodeRow(void* scanline, u_int lastx)
        pb = refruns;
        b1 = *pb++;
 #define        badlength(a0,lastx) do {                        \
-    if (isG4)                                          \
+    if (isG4 && RTCrow == -1)                          \
        RTCrow = rowref;                                \
     badPixelCount("2D", a0, lastx);                    \
     rowgood = false;                                   \