|
6 | 6 | * Copyright © 1991-2018 Microsoft Corp. |
7 | 7 | * Copyright © 2009, Michael I. Schwartz. |
8 | 8 | * Copyright © 1998-2019 Harald Oehlmann, Elmicron GmbH |
9 | | - * Copyright © 2021 Kevin Walzer/WordTech Communications LLC. |
| 9 | + * Copyright © 2021 Kevin Walzer. |
10 | 10 | * |
11 | 11 | * See the file "license.terms" for information on usage and redistribution of |
12 | 12 | * this file, and for a DISCLAIMER OF ALL WARRANTIES. |
@@ -905,7 +905,7 @@ static Tcl_Size ParseArrow ( |
905 | 905 | static Tcl_Size ParseArrShp( |
906 | 906 | TCL_UNUSED(void *), |
907 | 907 | Tcl_Interp *interp, |
908 | | - int objc, |
| 908 | + Tcl_Size objc, |
909 | 909 | Tcl_Obj *const *objv, |
910 | 910 | void *dstPtr) |
911 | 911 | { |
@@ -983,11 +983,11 @@ static Tcl_Size ParseCapStyle ( |
983 | 983 | static Tcl_Size ParseSmooth( |
984 | 984 | TCL_UNUSED(void *), |
985 | 985 | Tcl_Interp *interp, |
986 | | - int objc, |
| 986 | + Tcl_Size objc, |
987 | 987 | Tcl_Obj *const *objv, |
988 | 988 | void *dstPtr) |
989 | 989 | { |
990 | | - int boolValue; |
| 990 | + bool boolValue; |
991 | 991 | Tcl_Size index; |
992 | 992 |
|
993 | 993 | static const struct SmoothMethod { |
@@ -1711,7 +1711,7 @@ static int GdiCharWidths( |
1711 | 1711 | } |
1712 | 1712 |
|
1713 | 1713 | { |
1714 | | - int i; |
| 1714 | + unsigned char i; |
1715 | 1715 | char ind[2]; |
1716 | 1716 | ind[1] = '\0'; |
1717 | 1717 |
|
@@ -1999,7 +1999,7 @@ static int GdiText( |
1999 | 1999 | Tcl_DStringInit(&ds); |
2000 | 2000 | wstring = Tcl_UtfToWCharDString(layout->chunks[i].start, |
2001 | 2001 | layout->chunks[i].numBytes, &ds); |
2002 | | - retval = TextOutW(hDC, xi, yi, wstring, Tcl_DStringLength(&ds)/2); |
| 2002 | + retval = TextOutW(hDC, xi, yi, wstring, (int)Tcl_DStringLength(&ds)/2); |
2003 | 2003 | Tcl_DStringFree(&ds); |
2004 | 2004 | ya += fm.linespace; |
2005 | 2005 | nlseen = 0; |
@@ -2051,7 +2051,7 @@ static int GdiTextPlain( |
2051 | 2051 | string = Tcl_GetStringFromObj(objv[4], &strlen); |
2052 | 2052 | Tcl_DStringInit(&ds); |
2053 | 2053 | wstring = Tcl_UtfToWCharDString(string, strlen, &ds); |
2054 | | - retval = TextOutW(hDC, x0, y0, wstring, Tcl_DStringLength(&ds)/2); |
| 2054 | + retval = TextOutW(hDC, x0, y0, wstring, (int)Tcl_DStringLength(&ds)/2); |
2055 | 2055 | Tcl_DStringFree(&ds); |
2056 | 2056 | Tcl_SetObjResult(interp, Tcl_NewIntObj(retval)); |
2057 | 2057 | return TCL_OK; |
@@ -3624,7 +3624,7 @@ static HANDLE BitmapToDIB( |
3624 | 3624 |
|
3625 | 3625 | /* Calculate size of memory block required to store BITMAPINFO. */ |
3626 | 3626 |
|
3627 | | - dwLen = bi.biSize + DIBNumColors(&bi) * sizeof(RGBQUAD); |
| 3627 | + dwLen = (DWORD)(bi.biSize + DIBNumColors(&bi) * sizeof(RGBQUAD)); |
3628 | 3628 |
|
3629 | 3629 | /* Get a DC. */ |
3630 | 3630 |
|
@@ -3678,7 +3678,7 @@ static HANDLE BitmapToDIB( |
3678 | 3678 |
|
3679 | 3679 | /* Realloc the buffer big enough to hold all the bits. */ |
3680 | 3680 |
|
3681 | | - dwLen = bi.biSize + DIBNumColors(&bi) * sizeof(RGBQUAD) + bi.biSizeImage; |
| 3681 | + dwLen = (DWORD)(bi.biSize + DIBNumColors(&bi) * sizeof(RGBQUAD) + bi.biSizeImage); |
3682 | 3682 |
|
3683 | 3683 | if ((h = GlobalReAlloc(hDIB, dwLen, 0)) != 0) { |
3684 | 3684 | hDIB = h; |
@@ -3821,7 +3821,7 @@ static HPALETTE GetSystemPalette(void) |
3821 | 3821 | /* Set some important fields. */ |
3822 | 3822 |
|
3823 | 3823 | lpLogPal->palVersion = 0x300; |
3824 | | - lpLogPal->palNumEntries = nColors; |
| 3824 | + lpLogPal->palNumEntries = (WORD)nColors; |
3825 | 3825 |
|
3826 | 3826 | /* Copy the current system palette into our logical palette. */ |
3827 | 3827 |
|
|
0 commit comments