← Back to branch summary

~ubuntu-branches/ubuntu/vivid/tiff/vivid-proposed

« back to all changes in this revision

Viewing changes to libtiff/tif_ojpeg.c

  • Committer: Package Import Robot
  • Author(s): Jay Berkenbilt
  • Date: 2012-06-24 13:45:42 UTC
  • mfrom: (1.1.8)
  • Revision ID: package-import@ubuntu.com-20120624134542-2xxi2i0ytrcddfdx
Tags: 4.0.2-1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
libtiff/tif_ojpeg.c
1
 
/* $Id: tif_ojpeg.c,v 1.54 2011-05-31 17:05:07 bfriesen Exp $ */
 
1
/* $Id: tif_ojpeg.c,v 1.56 2012-05-24 03:15:18 fwarmerdam Exp $ */
2
2
 
3
3
/* WARNING: The type of JPEG encapsulation defined by the TIFF Version 6.0
4
4
   specification is now totally obsolete and deprecated for new applications and
1146
1146
        OJPEGState* sp=(OJPEGState*)tif->tif_data;
1147
1147
        uint8** m;
1148
1148
        uint32 n;
1149
 
        assert(sp->libjpeg_session_active==0);
 
1149
        /* if a previous attempt failed, don't try again */
 
1150
        if (sp->libjpeg_session_active != 0) 
 
1151
                return 0;
1150
1152
        sp->out_state=ososSoi;
1151
1153
        sp->restart_index=0;
1152
1154
        jpeg_std_error(&(sp->libjpeg_jpeg_error_mgr));
1954
1956
                        case osibsJpegInterchangeFormat:
1955
1957
                                sp->in_buffer_source=osibsStrile;
1956
1958
                        case osibsStrile:
 
1959
                                if (!_TIFFFillStriles( sp->tif ) 
 
1960
                                    || sp->tif->tif_dir.td_stripoffset == NULL
 
1961
                                    || sp->tif->tif_dir.td_stripbytecount == NULL)
 
1962
                                        return 0;
 
1963
 
1957
1964
                                if (sp->in_buffer_next_strile==sp->in_buffer_strile_count)
1958
1965
                                        sp->in_buffer_source=osibsEof;
1959
1966
                                else