summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--generic/tkBitmap.c8
-rw-r--r--generic/tkFont.c4
-rw-r--r--generic/tkImgPhoto.c4
3 files changed, 8 insertions, 8 deletions
diff --git a/generic/tkBitmap.c b/generic/tkBitmap.c
index ad4f36f..c8d83fd 100644
--- a/generic/tkBitmap.c
+++ b/generic/tkBitmap.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkBitmap.c,v 1.17 2007/06/24 16:17:13 dkf Exp $
+ * RCS: @(#) $Id: tkBitmap.c,v 1.18 2007/06/25 02:04:27 das Exp $
*/
#include "tkPort.h"
@@ -1084,9 +1084,11 @@ TkReadBitmapFile(
Display *display,
Drawable d,
const char *filename,
- unsigned int *width_return, *height_return,
+ unsigned int *width_return,
+ unsigned int *height_return,
Pixmap *bitmap_return,
- int *x_hot_return, *y_hot_return)
+ int *x_hot_return,
+ int *y_hot_return)
{
char *data;
diff --git a/generic/tkFont.c b/generic/tkFont.c
index 450061f..7a0b6fa 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkFont.c,v 1.37 2007/06/24 16:07:34 dkf Exp $
+ * RCS: @(#) $Id: tkFont.c,v 1.38 2007/06/25 02:04:27 das Exp $
*/
#include "tkPort.h"
@@ -1854,8 +1854,6 @@ Tk_UnderlineChars(
int lastByte) /* Index of first byte after the last
* character. */
{
- TkFont *fontPtr = (TkFont *) tkfont;
-
TkUnderlineCharsInContext(display, drawable, gc, tkfont, string,
lastByte, x, y, firstByte, lastByte);
}
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index 6b4132b..626d38f 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -17,7 +17,7 @@
* Department of Computer Science,
* Australian National University.
*
- * RCS: @(#) $Id: tkImgPhoto.c,v 1.71 2007/06/24 16:07:34 dkf Exp $
+ * RCS: @(#) $Id: tkImgPhoto.c,v 1.72 2007/06/25 02:04:27 das Exp $
*/
#include "tkInt.h"
@@ -5037,7 +5037,7 @@ DitherInstance(
int nLines, bigEndian, i, c, x, y, xEnd, doDithering = 1;
int bitsPerPixel, bytesPerLine, lineLength;
unsigned char *srcLinePtr;
- schar *errLinePtr, *errPtr;
+ schar *errLinePtr;
pixel firstBit, word, mask;
/*