diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-06 06:37:43 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-06 06:37:43 (GMT) |
| commit | 07160023530295009919bcf063e260bfaebe9851 (patch) | |
| tree | 284c5d2aea3f4504edd3da311d2b2dc4f98e90bd /generic/tkImgPhoto.h | |
| parent | 5e7c6982ce66c388008bd5a81fac55fbf5b900da (diff) | |
| parent | caa253fcf5871c9886ed214cfc4d68c5ab45d8f2 (diff) | |
| download | tk-07160023530295009919bcf063e260bfaebe9851.zip tk-07160023530295009919bcf063e260bfaebe9851.tar.gz tk-07160023530295009919bcf063e260bfaebe9851.tar.bz2 | |
Merge 8.6. Fix some more -Wshadow warnings
Diffstat (limited to 'generic/tkImgPhoto.h')
| -rw-r--r-- | generic/tkImgPhoto.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/generic/tkImgPhoto.h b/generic/tkImgPhoto.h index e65893f..d7283b3 100644 --- a/generic/tkImgPhoto.h +++ b/generic/tkImgPhoto.h @@ -50,13 +50,6 @@ typedef struct PhotoModel PhotoModel; #endif /* - * An unsigned 32-bit integral type, used for pixel values. We use int rather - * than long here to accommodate those systems where longs are 64 bits. - */ - -typedef unsigned int pixel; - -/* * The maximum number of pixels to transmit to the server in a single * XPutImage call. */ @@ -110,10 +103,10 @@ struct ColorTable { XVisualInfo visualInfo; /* Information about the visual for windows * using this color table. */ - pixel redValues[256]; /* Maps 8-bit values of red intensity to a + unsigned redValues[256]; /* Maps 8-bit values of red intensity to a * pixel value or index in pixelMap. */ - pixel greenValues[256]; /* Ditto for green intensity. */ - pixel blueValues[256]; /* Ditto for blue intensity. */ + unsigned greenValues[256]; /* Ditto for green intensity. */ + unsigned blueValues[256]; /* Ditto for blue intensity. */ unsigned long *pixelMap; /* Actual pixel values allocated. */ unsigned char colorQuant[3][256]; |