File difference report generated by CSDiff by ComponentSoftware on 26/12/2010 19:40

Base file: D:\dev2\work\cximage601\libtiff394orig\tif_ojpeg.c
Compared file: D:\dev2\work\cximage601\tiff\tif_ojpeg.c

192,193c192,193
< #include "jpeglib.h"
< #include "jerror.h"
---
> #include "..\jpeg\jpeglib.h"
> #include "..\jpeg\jerror.h"
651c651
< 		sp->plane_sample_offset=s;
---
> 		sp->plane_sample_offset=(uint8)s;
1009c1009
< 	sp->samples_per_pixel=tif->tif_dir.td_samplesperpixel;
---
> 	sp->samples_per_pixel=(uint8)tif->tif_dir.td_samplesperpixel;
1273c1273
< 					OJPEGReadSkip(sp,n-2);
---
> 					OJPEGReadSkip(sp,(uint16)(n-2));
1371c1371
< 		OJPEGReadSkip(sp,m-2);
---
> 		OJPEGReadSkip(sp,(uint16)(m-2));
1432c1432
< 		OJPEGReadSkip(sp,m-2);
---
> 		OJPEGReadSkip(sp,(uint16)(m-2));
1448c1448
< 		if (OJPEGReadBlock(sp,m-2,&nb[sizeof(uint32)+4])==0)
---
> 		if (OJPEGReadBlock(sp,(uint16)(m-2),&nb[sizeof(uint32)+4])==0)


<---------------------  End of report  --------------------->

