summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'tiff/contrib/win_dib/tiff2dib.c')
-rw-r--r--tiff/contrib/win_dib/tiff2dib.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/tiff/contrib/win_dib/tiff2dib.c b/tiff/contrib/win_dib/tiff2dib.c
index 2fa2de69..5b9e1747 100644
--- a/tiff/contrib/win_dib/tiff2dib.c
+++ b/tiff/contrib/win_dib/tiff2dib.c
@@ -4,7 +4,7 @@
*
* The function LoadTIFFinDIB in this source file let you load
* a TIFF file and build a memory DIB with it and return the
- * HANDLE (HDIB) of the memory bloc containing the DIB.
+ * HANDLE (HDIB) of the memory block containing the DIB.
*
* Example :
*
@@ -30,7 +30,7 @@ static HDIB CreateDIB(DWORD dwWidth, DWORD dwHeight, WORD wBitCount);
static LPSTR FindDIBBits(LPSTR lpDIB);
static WORD PaletteSize(LPSTR lpDIB);
static WORD DIBNumColors(LPSTR lpDIB);
-static int checkcmap(int n, uint16* r, uint16* g, uint16* b);
+static int checkcmap(int n, uint16_t* r, uint16_t* g, uint16_t* b);
@@ -49,7 +49,7 @@ static int checkcmap(int n, uint16* r, uint16* g, uint16* b);
* Description:
*
* This function load a TIFF file and build a memory DIB with it
- * and return the HANDLE (HDIB) of the memory bloc containing
+ * and return the HANDLE (HDIB) of the memory block containing
* the DIB.
*
* 4/12/95 Philippe Tenenhaus 100423.3705@compuserve.com
@@ -127,10 +127,10 @@ HDIB LoadTIFFinDIB(LPSTR lpFileName)
//PhotometricInterpretation = 3 image have a color palette
if (PhotometricInterpretation == 3)
{
- uint16* red;
- uint16* green;
- uint16* blue;
- int16 i;
+ uint16_t* red;
+ uint16_t* green;
+ uint16_t* blue;
+ int16_t i;
LPBITMAPINFO lpbmi;
int Palette16Bits;
@@ -220,7 +220,7 @@ imageWidth*SamplePerPixel);
}
-static int checkcmap(int n, uint16* r, uint16* g, uint16* b)
+static int checkcmap(int n, uint16_t* r, uint16_t* g, uint16_t* b)
{
while (n-- > 0)
if (*r++ >= 256 || *g++ >= 256 || *b++ >= 256)