← Back to branch summary

~ubuntu-branches/ubuntu/natty/tiff/natty

« back to all changes in this revision

Viewing changes to libtiff/tif_getimage.c

  • Committer: Bazaar Package Importer
  • Author(s): Jay Berkenbilt
  • Date: 2010-06-18 21:28:11 UTC
  • mfrom: (10.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20100618212811-3t5mffcr8gpfpuel
Tags: 3.9.4-1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
libtiff/tif_getimage.c
1
 
/* $Id: tif_getimage.c,v 1.63.2.3 2009-08-30 16:21:46 bfriesen Exp $ */
 
1
/* $Id: tif_getimage.c,v 1.63.2.4 2010-06-08 18:50:42 bfriesen Exp $ */
2
2
 
3
3
/*
4
4
 * Copyright (c) 1991-1997 Sam Leffler
1846
1846
DECLAREContigPutFunc(putcontig8bitYCbCr22tile)
1847
1847
{
1848
1848
        uint32* cp2;
1849
 
        int32 incr = 2*toskew+w;
1850
1849
        (void) y;
1851
1850
        fromskew = (fromskew / 2) * 6;
1852
1851
        cp2 = cp+w+toskew;
1873
1872
                        cp2 ++ ;
1874
1873
                        pp += 6;
1875
1874
                }
1876
 
                cp += incr;
1877
 
                cp2 += incr;
 
1875
                cp += toskew*2+w;
 
1876
                cp2 += toskew*2+w;
1878
1877
                pp += fromskew;
1879
1878
                h-=2;
1880
1879
        }
1940
1939
DECLAREContigPutFunc(putcontig8bitYCbCr12tile)
1941
1940
{
1942
1941
        uint32* cp2;
1943
 
        int32 incr = 2*toskew+w;
1944
1942
        (void) y;
1945
1943
        fromskew = (fromskew / 2) * 4;
1946
1944
        cp2 = cp+w+toskew;
1955
1953
                        cp2 ++;
1956
1954
                        pp += 4;
1957
1955
                } while (--x);
1958
 
                cp += incr;
1959
 
                cp2 += incr;
 
1956
                cp += toskew*2+w;
 
1957
                cp2 += toskew*2+w;
1960
1958
                pp += fromskew;
1961
1959
                h-=2;
1962
1960
        }
2669
2667
}
2670
2668
 
2671
2669
/* vim: set ts=8 sts=8 sw=8 noet: */
 
2670
/*
 
2671
 * Local Variables:
 
2672
 * mode: c
 
2673
 * c-basic-offset: 8
 
2674
 * fill-column: 78
 
2675
 * End:
 
2676
 */