XFA: Upgrade to libtiff 4.0.6.

third_party/libtiff/tif_fax3.c

-/* $Id: tif_fax3.c,v 1.74 2012-06-21 02:01:31 fwarmerdam Exp $ */
+/* $Id: tif_fax3.c,v 1.75 2015-08-30 20:49:55 erouault Exp $ */
 
 /*
  * Copyright (c) 1990-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and 
  * its documentation for any purpose is hereby granted without fee, provided
  * that (i) the above copyright notices and this permission notice appear in
  * all copies of the software and related documentation, and (ii) the names of
  * Sam Leffler and Silicon Graphics may not be used in any advertising or
  * publicity relating to the software without the specific, prior written
  * permission of Sam Leffler and Silicon Graphics.
  * 
  * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
  * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
  * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
  * 
  * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
  * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
  * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
  * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
  * OF THIS SOFTWARE.
  */
+
 #include "tiffiop.h"
 #ifdef CCITT_SUPPORT
 /*
  * TIFF Library.
  *
  * CCITT Group 3 (T.4) and Group 4 (T.6) Compression Support.
  *
  * This file contains support for decoding and encoding TIFF
  * compression algorithms 2, 3, 4, and 32771.
  *
@@ skipping 326 matching lines @@
 /*
  * Bit-fill a row according to the white/black
  * runs generated during G3/G4 decoding.
  */
 void
 _TIFFFax3fillruns(unsigned char* buf, uint32* runs, uint32* erun, uint32 lastx)
 {
         static const unsigned char _fillmasks[] =
             { 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff };
         unsigned char* cp;
-        uint32 x, bx, run,bx_;/* add bx_ = 8-bx for avoid ms evc compiler bug*/
+        uint32 x, bx, run;
         int32 n, nw;
         long* lp;
 
         if ((erun-runs)&1)
             *erun++ = 0;
         x = 0;
         for (; runs < erun; runs += 2) {
             run = runs[0];
             if (x+run > lastx || run > lastx )
                 run = runs[0] = (uint32) (lastx - x);
             if (run) {
                 cp = buf + (x>>3);
                 bx = x&7;
-//              if (run > 8-bx) {
-//                      if (bx) {                       /* align to byte boundary */
-//                              *cp++ &= 0xff << (8-bx);
-//                              run -= 8-bx;
-//                  }
-//Modify by Sunliang.Liu 20090804
-//Detail: For avoid ms evc compiler bug in WCE ARMV4(I) Release
-                bx_ = 8-bx;
-                if (run > bx_) {
+                if (run > 8-bx) {
                     if (bx) {                   /* align to byte boundary */
-                        *cp++ &= 0xff << bx_;
-                        run -= bx_;
+                        *cp++ &= 0xff << (8-bx);
+                        run -= 8-bx;
                     }
                     if( (n = run >> 3) != 0 ) { /* multiple bytes to fill */
                         if ((n/sizeof (long)) > 1) {
                             /*
                              * Align to longword boundary and fill.
                              */
                             for (; n && !isAligned(cp, long); n--)
                                     *cp++ = 0x00;
                             lp = (long*) cp;
                             nw = (int32)(n / sizeof (long));
                             n -= nw * sizeof (long);
                             do {
                                     *lp++ = 0L;
                             } while (--nw);
                             cp = (unsigned char*) lp;
                         }
-#ifdef FAX3_DEBUG
-                        printf("_TIFFFax3fillruns ZERO: %d\n",n);
-#endif
                         ZERO(n, cp);
                         run &= 7;
                     }
                     if (run)
                         cp[0] &= 0xff >> run;
                 } else
                     cp[0] &= ~(_fillmasks[run]>>bx);
                 x += runs[0];
             }
             run = runs[1];
@@ skipping 15 matching lines @@
                             for (; n && !isAligned(cp, long); n--)
                                 *cp++ = 0xff;
                             lp = (long*) cp;
                             nw = (int32)(n / sizeof (long));
                             n -= nw * sizeof (long);
                             do {
                                 *lp++ = -1L;
                             } while (--nw);
                             cp = (unsigned char*) lp;
                         }
-#ifdef FAX3_DEBUG
-                        printf("_TIFFFax3fillruns FILL: %d\n",n);
-#endif
                         FILL(n, cp);
                         run &= 7;
                     }
+                    /* Explicit 0xff masking to make icc -check=conversions happy */
                     if (run)
-                        cp[0] |= 0xff00 >> run;
+                        cp[0] = (unsigned char)((cp[0] | (0xff00 >> run))&0xff);
                 } else
                     cp[0] |= _fillmasks[run]>>bx;
                 x += runs[1];
             }
         }
         assert(x == lastx);
 }
 #undef  ZERO
 #undef  FILL
 
@@ skipping 916 matching lines @@
  * Compression Scheme Support.
  */
 
 #define SWAP(t,a,b) { t x; x = (a); (a) = (b); (b) = x; }
 /*
  * Decode the requested amount of G4-encoded data.
  */
 static int
 Fax4Decode(TIFF* tif, uint8* buf, tmsize_t occ, uint16 s)
 {
-#ifdef FAX3_DEBUG
-        FILE* file;
-#endif
         DECLARE_STATE_2D(tif, sp, "Fax4Decode");
-
         (void) s;
         if (occ % sp->b.rowbytes)
         {
                 TIFFErrorExt(tif->tif_clientdata, module, "Fractional scanlines cannot be read");
                 return (-1);
         }
         CACHE_STATE(tif, sp);
         while (occ > 0) {
                 a0 = 0;
                 RunLength = 0;
                 pa = thisrun = sp->curruns;
                 pb = sp->refruns;
                 b1 = *pb++;
 #ifdef FAX3_DEBUG
                 printf("\nBitAcc=%08X, BitsAvail = %d\n", BitAcc, BitsAvail);
                 printf("-------------------- %d\n", tif->tif_row);
                 fflush(stdout);
 #endif
                 EXPAND2D(EOFG4);
                 if (EOLcnt)
                     goto EOFG4;
                 (*sp->fill)(buf, thisrun, pa, lastx);
-#ifdef FAX3_DEBUG
-                file = fopen("fillbuf.txt", "a");
-                fwrite(buf, sp->b.rowbytes, 1, file);
-                fclose(file);
-#endif
                 SETVALUE(0);            /* imaginary change for reference */
                 SWAP(uint32*, sp->curruns, sp->refruns);
                 buf += sp->b.rowbytes;
                 occ -= sp->b.rowbytes;
                 sp->line++;
                 continue;
         EOFG4:
                 NeedBits16( 13, BADG4 );
         BADG4:
 #ifdef FAX3_DEBUG
                 if( GetBits(13) != 0x1001 )
                     fputs( "Bad EOFB\n", stderr );
 #endif                
                 ClrBits( 13 );
                 (*sp->fill)(buf, thisrun, pa, lastx);
-#ifdef FAX3_DEBUG
-                file = fopen("fillbuf.txt", "a");
-                fwrite(buf, sp->b.rowbytes, 1, file);
-                fclose(file);
-#endif
                 UNCACHE_STATE(tif, sp);
                 return ( sp->line ? 1 : -1);    /* don't error on badly-terminated strips */
         }
         UNCACHE_STATE(tif, sp);
         return (1);
 }
 #undef  SWAP
 
 /*
  * Encode the requested amount of data.
@@ skipping 155 matching lines @@
 #endif /* CCITT_SUPPORT */
 
 /* vim: set ts=8 sts=8 sw=8 noet: */
 /*
  * Local Variables:
  * mode: c
  * c-basic-offset: 8
  * fill-column: 78
  * End:
  */
-