diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-05-02 08:42:11 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-05-02 08:42:11 (GMT) |
| commit | efbdaed0eea51391a2683306068c3ab6cb7dd973 (patch) | |
| tree | e9a204ff15c9e557588be8fc0700265f99f7eae9 | |
| parent | 620c38bf41d68d50e812c79cd6b16d341010e5e6 (diff) | |
| parent | fa9b215690838b15cde6db8cf2be1545c20f6032 (diff) | |
| download | tk-efbdaed0eea51391a2683306068c3ab6cb7dd973.zip tk-efbdaed0eea51391a2683306068c3ab6cb7dd973.tar.gz tk-efbdaed0eea51391a2683306068c3ab6cb7dd973.tar.bz2 | |
merge core-8-6-branch
| -rw-r--r-- | doc/FindPhoto.3 | 2 | ||||
| -rw-r--r-- | generic/tkImgPhInstance.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/FindPhoto.3 b/doc/FindPhoto.3 index be2896b..dc218bf 100644 --- a/doc/FindPhoto.3 +++ b/doc/FindPhoto.3 @@ -263,7 +263,7 @@ The \fBTk_PhotoImageBlock\fR structure used to provide image data to data (e.g. separate planes for the red, green, blue and alpha channels). Unfortunately, the implementation fails to hold this promise. The problem is that the \fIpixelSize\fR field is -(incorrectly) used to determine wehter the image has an alpha channel. +(incorrectly) used to determine whether the image has an alpha channel. Currently, if the offset for the alpha channel is greater or equal than \fIpixelSize\fR, \fBtk_PhotoPutblock\fR assumes no alpha data is present and makes the image fully opaque. This means that for layouts diff --git a/generic/tkImgPhInstance.c b/generic/tkImgPhInstance.c index 98aaeab..fd98c6e 100644 --- a/generic/tkImgPhInstance.c +++ b/generic/tkImgPhInstance.c @@ -1261,7 +1261,7 @@ AllocateColors( } } else { /* - * Monochrome display - allocate the shades of grey we want. + * Monochrome display - allocate the shades of gray we want. */ for (i = 0; i < numColors; ++i) { |