From 2cdc041d627a2ef00b443c39c56443d3e33cc0be Mon Sep 17 00:00:00 2001 From: Thomas Bernard Date: Sat, 8 Feb 2020 17:54:51 +0100 Subject: [PATCH 1/2] libtiff.html: fix function casing fixes #68 / http://bugzilla.maptools.org/show_bug.cgi?id=2538 --- html/libtiff.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/html/libtiff.html b/html/libtiff.html index 56535d97..3f949ab3 100644 --- a/html/libtiff.html +++ b/html/libtiff.html @@ -518,9 +518,9 @@         TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &imagelength);
        buf = _TIFFmalloc(TIFFScanlineSize(tif));
        for (row = 0; row < imagelength; row++)
-             tiffreadscanline(tif, buf, row);
-         _tifffree(buf);
-         tiffclose(tif);
+             TIFFReadScanline(tif, buf, row, 0);
+         _TIFFfree(buf);
+         TIFFClose(tif);
    }
}

From 8c9dca34be96413611575fa3a46c0eddea75c72f Mon Sep 17 00:00:00 2001 From: Thomas Bernard Date: Sat, 8 Feb 2020 18:02:15 +0100 Subject: [PATCH 2/2] libtiff.html: fix function casing --- html/libtiff.html | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/html/libtiff.html b/html/libtiff.html index 3f949ab3..d6b5eab3 100644 --- a/html/libtiff.html +++ b/html/libtiff.html @@ -547,17 +547,17 @@         buf = _TIFFmalloc(TIFFScanlineSize(tif));
        if (config == PLANARCONFIG_CONTIG) {
            for (row = 0; row < imagelength; row++)
-                 tiffreadscanline(tif, buf, row);
+                 TIFFReadScanline(tif, buf, row, 0);
        } else if (config == planarconfig_separate) {
            uint16 s, nsamples;
            
            tiffgetfield(tif, tifftag_samplesperpixel, &nsamples);
            for (s = 0; s < nsamples; s++)
                for (row = 0; row < imagelength; row++)
-                     tiffreadscanline(tif, buf, row, s);
+                     TIFFReadScanline(tif, buf, row, s);
        }
-         _tifffree(buf);
-         tiffclose(tif);
+         _TIFFfree(buf);
+         TIFFClose(tif);
    }
}

@@ -568,7 +568,7 @@

            for (row = 0; row < imagelength; row++)
                for (s = 0; s < nsamples; s++)
-                     tiffreadscanline(tif, buf, row, s); +                     TIFFReadScanline(tif, buf, row, s);

...then problems would arise if RowsPerStrip was not one @@ -601,8 +601,8 @@         buf = _TIFFmalloc(TIFFStripSize(tif));
        for (strip = 0; strip < tiffnumberofstrips(tif); strip++)
            tiffreadencodedstrip(tif, strip, buf, (tsize_t) -1);
-         _tifffree(buf);
-         tiffclose(tif);
+         _TIFFfree(buf);
+         TIFFClose(tif);
    }
}

@@ -702,8 +702,8 @@         for (y = 0; y < imagelength; y += tilelength)
            for (x = 0; x < imagewidth; x += tilewidth)
                tiffreadtile(tif, buf, x, y, 0);
-         _tifffree(buf);
-         tiffclose(tif);
+         _TIFFfree(buf);
+         TIFFClose(tif);
    }
}

@@ -729,8 +729,8 @@         buf = _TIFFmalloc(TIFFTileSize(tif));
        for (tile = 0; tile < tiffnumberoftiles(tif); tile++)
            tiffreadencodedtile(tif, tile, buf, (tsize_t) -1);
-         _tifffree(buf);
-         tiffclose(tif);
+         _TIFFfree(buf);
+         TIFFClose(tif);
    }
}