summaryrefslogtreecommitdiff
path: root/src/window.cpp
diff options
context:
space:
mode:
authorSam Spilsbury <smspillaz@gmail.com>2010-02-05 00:18:32 +0800
committerSam Spilsbury <smspillaz@gmail.com>2010-02-05 00:18:32 +0800
commitda75fba9478b5fd7461ae31500f95bb21227c412 (patch)
tree29f79b493fe057c2ae49e56e296ac6aa3f5a3833 /src/window.cpp
parent55d8c5b16aed34a04b3405e0a63575b9002612b2 (diff)
downloadunity-window-decorator-da75fba9478b5fd7461ae31500f95bb21227c412.tar.gz
unity-window-decorator-da75fba9478b5fd7461ae31500f95bb21227c412.tar.bz2
Fix typo and fix more warnings
Diffstat (limited to 'src/window.cpp')
-rw-r--r--src/window.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/window.cpp b/src/window.cpp
index 0c0cfff..6beb475 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -3929,7 +3929,8 @@ PrivateWindow::readIconHint ()
XImage *image, *maskImage = NULL;
Display *dpy = screen->dpy ();
unsigned int width, height, dummy;
- int i, j, k, iDummy;
+ unsigned int i, j, k;
+ int iDummy;
Window wDummy;
CompIcon *icon;
XColor *colors;
@@ -3952,8 +3953,8 @@ PrivateWindow::readIconHint ()
}
k = 0;
- for ((unsigned int) j = 0; j < height; j++)
- for ((unsigned int) i = 0; i < width; i++)
+ for (j = 0; j < height; j++)
+ for (i = 0; i < width; i++)
colors[k++].pixel = XGetPixel (image, i, j);
for (i = 0; i < k; i += 256)
@@ -3976,9 +3977,9 @@ PrivateWindow::readIconHint ()
k = 0;
p = (CARD32 *) icon->data ();
- for ((unsigned int) j = 0; j < height; j++)
+ for (j = 0; j < height; j++)
{
- for ((unsigned int) i = 0; i < width; i++)
+ for (i = 0; i < width; i++)
{
if (maskImage && !XGetPixel (maskImage, i, j))
*p++ = 0;