summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--generic/tkImgPhoto.c3
-rw-r--r--win/tkWinRegion.c4
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 7dec571..2d680c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-26 Pat Thoyts <patthoyts@users.sourceforge.net>
+
+ * win/tkWinRegion.c (TkpBuildRegionFromAlphaData): Fixed syntax error
+ * generic/tkImgPhoto.c (Tk_PhotoPutBlock): Removed unreferences vars.
+
+
2004-10-26 Donal K. Fellows <donal.k.fellows@man.ac.uk>
* macosx/tkMacOSXRegion.c (TkpBuildRegionFromAlphaData):
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index 66ed41f..46ae9d4 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.50 2004/10/26 13:15:09 dkf Exp $
+ * RCS: @(#) $Id: tkImgPhoto.c,v 1.51 2004/10/26 14:07:57 patthoyts Exp $
*/
#include "tkInt.h"
@@ -4520,7 +4520,6 @@ Tk_PhotoPutBlock(interp, handle, blockPtr, x, y, width, height, compRule)
*/
if (alphaOffset) {
- int x1, y1, end;
/*
* This block is grossly inefficient. For each row in the image, it
diff --git a/win/tkWinRegion.c b/win/tkWinRegion.c
index 27a74b5..c3914e2 100644
--- a/win/tkWinRegion.c
+++ b/win/tkWinRegion.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWinRegion.c,v 1.4 2004/10/26 13:15:09 dkf Exp $
+ * RCS: @(#) $Id: tkWinRegion.c,v 1.5 2004/10/26 14:07:57 patthoyts Exp $
*/
#include "tkWinInt.h"
@@ -179,7 +179,7 @@ TkpBuildRegionFromAlphaData(region, x, y, width, height, dataPtr,
for (y1 = 0; y1 < height; y1++) {
lineDataPtr = dataPtr;
- for {x1 = 0; x1 < width; x1 = end) {
+ for (x1 = 0; x1 < width; x1 = end) {
/* search for first non-transparent pixel */
while ((x1 < width) && !*lineDataPtr) {
x1++;