AWARE SYSTEMS
TIFF and LibTiff Mail List Archive

1993.09.20 22:02 "Diffs for Microsoft Visua", by Eric Herrmann

Sam,

The Microsoft Visual C++ 1.0 compiler (Windows 3.1) is highly pedantic and requires a few more casts. Here are the diffs for the files. I apologize for the formatting but I don't have unix, I just have MKS. Fortunately there aren't many changes.

This is for 3.30beta.

Affected files:
 tif_dir.c
 tif_dirread.c
 tif_dirwrite.c
 tif_read.c
 tif_write.c

Eric Herrmann
Light Source
LS.BANZAI@AppleLink.Apple.com

--------------- tif_dir.c
44c44
<      if (*cpp = _TIFFmalloc(len))
---
>      if (*cpp = (char *)_TIFFmalloc(len))
--------------- tif_dirread.c
66c66
<  char *cp = _TIFFmalloc(n);
---
>  char *cp = (char *)_TIFFmalloc(n);
--------------- tif_dirwrite.c
137c137
<  data = _TIFFmalloc(dirsize);
---
>  data = (char *)_TIFFmalloc(dirsize);
785c785
<  (void) TIFFSeekFile(tif, -sizeof (nextdir), L_INCR);
---
>  (void) TIFFSeekFile(tif, -(long)sizeof (nextdir), L_INCR);
--------------- tif_read.c
111c111
<          (tif, buf, tif->tif_scanlinesize, sample);
---
>          (tif, (tidata_t) buf, tif->tif_scanlinesize, sample);
114c114
<          (*tif->tif_postdecode)(tif, buf, tif->tif_scanlinesize);
---
>          (*tif->tif_postdecode)(tif, (tidata_t) buf, tif->tif_scanlinesize);
150,151c150,151
<     (*tif->tif_decodestrip)(tif, buf, size, strip / td->td_stripsperimage))
{
<      (*tif->tif_postdecode)(tif, buf, size);
---
>     (*tif->tif_decodestrip)(tif, (tidata_t)buf, size, strip /
td->td_stripsperimage)) {
>      (*tif->tif_postdecode)(tif, (tidata_t)buf, size);
323,324c323,324
<      (*tif->tif_decodetile)(tif, buf, size, tile/td->td_stripsperimage)) {
<      (*tif->tif_postdecode)(tif, buf, size);
---
>      (*tif->tif_decodetile)(tif, (tidata_t)buf, size,
tile/td->td_stripsperimage)) {
>      (*tif->tif_postdecode)(tif, (tidata_t)buf, size);
480c480
<      tif->tif_rawdata = (tdata_t) _TIFFmalloc(tif->tif_rawdatasize);
---
>      tif->tif_rawdata = (tidata_t) _TIFFmalloc(tif->tif_rawdatasize);
--------------- tif_write.c
154c154
<  status = (*tif->tif_encoderow)(tif, buf, tif->tif_scanlinesize, sample);
---
>  status = (*tif->tif_encoderow)(tif, (tidata_t)buf, tif->tif_scanlinesize,
sample);
196c196
<      data, cc, strip / td->td_stripsperimage))
---
>      (tidata_t)data, cc, strip / td->td_stripsperimage))
233c233
<  return (TIFFAppendToStrip(tif, strip, data, cc) ? cc : (tsize_t) -1);
---
>  return (TIFFAppendToStrip(tif, strip, (tidata_t)data, cc) ? cc : (tsize_t)
-1);
312c312
<  if (!(*tif->tif_encodetile)(tif, data, cc, tile/td->td_stripsperimage))
---
>  if (!(*tif->tif_encodetile)(tif, (tidata_t)data, cc,
tile/td->td_stripsperimage))
349c349
<  return (TIFFAppendToStrip(tif, tile, data, cc) ? cc : (tsize_t) -1);
---
>  return (TIFFAppendToStrip(tif, tile, (tidata_t)data, cc) ? cc : (tsize_t)
-1);
458c458
<  tif->tif_rawdata = _TIFFmalloc(size);
---
>  tif->tif_rawdata = (tidata_t)_TIFFmalloc(size);