treat SOF1 like SOF0 when doing fixup subsamples

This commit is contained in:
Frank Warmerdam 2009-06-23 18:46:48 +00:00
parent 21816633ca
commit 12d0b53f44

View File

@ -1,4 +1,4 @@
/* $Id: tif_jpeg.c,v 1.82 2009-06-21 18:49:38 fwarmerdam Exp $ */ /* $Id: tif_jpeg.c,v 1.83 2009-06-23 18:46:48 fwarmerdam Exp $ */
/* /*
* Copyright (c) 1994-1997 Sam Leffler * Copyright (c) 1994-1997 Sam Leffler
@ -789,7 +789,6 @@ JPEGFixupTagsSubsamplingSec(struct JPEGFixupTagsSubsamplingData* data)
case JPEG_MARKER_SOS: case JPEG_MARKER_SOS:
case JPEG_MARKER_DHT: case JPEG_MARKER_DHT:
case JPEG_MARKER_DRI: case JPEG_MARKER_DRI:
case JPEG_MARKER_SOF1:
/* this type of marker has data, but it has no use to us and should be skipped */ /* this type of marker has data, but it has no use to us and should be skipped */
{ {
uint16 n; uint16 n;
@ -803,6 +802,7 @@ JPEGFixupTagsSubsamplingSec(struct JPEGFixupTagsSubsamplingData* data)
} }
break; break;
case JPEG_MARKER_SOF0: case JPEG_MARKER_SOF0:
case JPEG_MARKER_SOF1:
/* this marker contains the subsampling factors we're scanning for */ /* this marker contains the subsampling factors we're scanning for */
{ {
uint16 n; uint16 n;