Merge branch 'bug-2538' into 'master'
libtiff.html: fix function casing Closes #68 See merge request libtiff/libtiff!107
This commit is contained in:
commit
a7276b9198
@ -518,9 +518,9 @@
|
|||||||
TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &imagelength);<br>
|
TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &imagelength);<br>
|
||||||
buf = _TIFFmalloc(TIFFScanlineSize(tif));<br>
|
buf = _TIFFmalloc(TIFFScanlineSize(tif));<br>
|
||||||
for (row = 0; row < imagelength; row++)<br>
|
for (row = 0; row < imagelength; row++)<br>
|
||||||
tiffreadscanline(tif, buf, row);<br>
|
TIFFReadScanline(tif, buf, row, 0);<br>
|
||||||
_tifffree(buf);<br>
|
_TIFFfree(buf);<br>
|
||||||
tiffclose(tif);<br>
|
TIFFClose(tif);<br>
|
||||||
}<br>
|
}<br>
|
||||||
}</tt>
|
}</tt>
|
||||||
</p>
|
</p>
|
||||||
@ -547,17 +547,17 @@
|
|||||||
buf = _TIFFmalloc(TIFFScanlineSize(tif));<br>
|
buf = _TIFFmalloc(TIFFScanlineSize(tif));<br>
|
||||||
if (config == PLANARCONFIG_CONTIG) {<br>
|
if (config == PLANARCONFIG_CONTIG) {<br>
|
||||||
for (row = 0; row < imagelength; row++)<br>
|
for (row = 0; row < imagelength; row++)<br>
|
||||||
tiffreadscanline(tif, buf, row);<br>
|
TIFFReadScanline(tif, buf, row, 0);<br>
|
||||||
} else if (config == planarconfig_separate) {<br>
|
} else if (config == planarconfig_separate) {<br>
|
||||||
uint16 s, nsamples;<br>
|
uint16 s, nsamples;<br>
|
||||||
<br>
|
<br>
|
||||||
tiffgetfield(tif, tifftag_samplesperpixel, &nsamples);<br>
|
tiffgetfield(tif, tifftag_samplesperpixel, &nsamples);<br>
|
||||||
for (s = 0; s < nsamples; s++)<br>
|
for (s = 0; s < nsamples; s++)<br>
|
||||||
for (row = 0; row < imagelength; row++)<br>
|
for (row = 0; row < imagelength; row++)<br>
|
||||||
tiffreadscanline(tif, buf, row, s);<br>
|
TIFFReadScanline(tif, buf, row, s);<br>
|
||||||
}<br>
|
}<br>
|
||||||
_tifffree(buf);<br>
|
_TIFFfree(buf);<br>
|
||||||
tiffclose(tif);<br>
|
TIFFClose(tif);<br>
|
||||||
}<br>
|
}<br>
|
||||||
}</tt>
|
}</tt>
|
||||||
</p>
|
</p>
|
||||||
@ -568,7 +568,7 @@
|
|||||||
<p style="margin-left: 40px">
|
<p style="margin-left: 40px">
|
||||||
<tt> for (row = 0; row < imagelength; row++)<br>
|
<tt> for (row = 0; row < imagelength; row++)<br>
|
||||||
for (s = 0; s < nsamples; s++)<br>
|
for (s = 0; s < nsamples; s++)<br>
|
||||||
tiffreadscanline(tif, buf, row, s);</tt>
|
TIFFReadScanline(tif, buf, row, s);</tt>
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
...then problems would arise if <tt>RowsPerStrip</tt> was not one
|
...then problems would arise if <tt>RowsPerStrip</tt> was not one
|
||||||
@ -601,8 +601,8 @@
|
|||||||
buf = _TIFFmalloc(TIFFStripSize(tif));<br>
|
buf = _TIFFmalloc(TIFFStripSize(tif));<br>
|
||||||
for (strip = 0; strip < tiffnumberofstrips(tif); strip++)<br>
|
for (strip = 0; strip < tiffnumberofstrips(tif); strip++)<br>
|
||||||
tiffreadencodedstrip(tif, strip, buf, (tsize_t) -1);<br>
|
tiffreadencodedstrip(tif, strip, buf, (tsize_t) -1);<br>
|
||||||
_tifffree(buf);<br>
|
_TIFFfree(buf);<br>
|
||||||
tiffclose(tif);<br>
|
TIFFClose(tif);<br>
|
||||||
}<br>
|
}<br>
|
||||||
}</tt>
|
}</tt>
|
||||||
</p>
|
</p>
|
||||||
@ -702,8 +702,8 @@
|
|||||||
for (y = 0; y < imagelength; y += tilelength)<br>
|
for (y = 0; y < imagelength; y += tilelength)<br>
|
||||||
for (x = 0; x < imagewidth; x += tilewidth)<br>
|
for (x = 0; x < imagewidth; x += tilewidth)<br>
|
||||||
tiffreadtile(tif, buf, x, y, 0);<br>
|
tiffreadtile(tif, buf, x, y, 0);<br>
|
||||||
_tifffree(buf);<br>
|
_TIFFfree(buf);<br>
|
||||||
tiffclose(tif);<br>
|
TIFFClose(tif);<br>
|
||||||
}<br>
|
}<br>
|
||||||
}</tt>
|
}</tt>
|
||||||
</p>
|
</p>
|
||||||
@ -729,8 +729,8 @@
|
|||||||
buf = _TIFFmalloc(TIFFTileSize(tif));<br>
|
buf = _TIFFmalloc(TIFFTileSize(tif));<br>
|
||||||
for (tile = 0; tile < tiffnumberoftiles(tif); tile++)<br>
|
for (tile = 0; tile < tiffnumberoftiles(tif); tile++)<br>
|
||||||
tiffreadencodedtile(tif, tile, buf, (tsize_t) -1);<br>
|
tiffreadencodedtile(tif, tile, buf, (tsize_t) -1);<br>
|
||||||
_tifffree(buf);<br>
|
_TIFFfree(buf);<br>
|
||||||
tiffclose(tif);<br>
|
TIFFClose(tif);<br>
|
||||||
}<br>
|
}<br>
|
||||||
}</tt>
|
}</tt>
|
||||||
</p>
|
</p>
|
||||||
|
Loading…
Reference in New Issue
Block a user