summaryrefslogtreecommitdiff
path: root/src/window.cpp
diff options
context:
space:
mode:
authorSam Spilsbury <smspillaz@gmail.com>2010-10-19 11:45:12 +0800
committerSam Spilsbury <smspillaz@gmail.com>2010-10-24 22:42:07 +0800
commit62e557ec650006f2d3dd614f84804ed1b5cd4349 (patch)
tree369b8c0d95bb3235eaacd520cc6c7aba1d0f5568 /src/window.cpp
parent6f4cb23385f8818f4373c939f241f1a20596870a (diff)
downloadunity-window-decorator-62e557ec650006f2d3dd614f84804ed1b5cd4349.tar.gz
unity-window-decorator-62e557ec650006f2d3dd614f84804ed1b5cd4349.tar.bz2
core: general code cleanup (static analysis)
Diffstat (limited to 'src/window.cpp')
-rw-r--r--src/window.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/window.cpp b/src/window.cpp
index f04282e..6f58335 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -4103,7 +4103,6 @@ CompWindow::getIcon (int width,
for (i = 0; i + 2 < n; i += iw * ih + 2)
{
unsigned long *idata = (unsigned long *) data;
- unsigned long j;
iw = idata[i];
ih = idata[i + 1];
@@ -4116,6 +4115,7 @@ CompWindow::getIcon (int width,
if (iw && ih)
{
+ unsigned long j;
icon = new CompIcon (screen, iw, ih);
if (!icon)
continue;
@@ -5414,12 +5414,12 @@ CompWindow::mwmFunc ()
void
CompWindow::updateFrameRegion ()
{
- CompRect r;
- int x, y;
-
- if (priv->frame && priv->serverGeometry.width () == priv->geometry.width () &&
+ if (priv->frame && priv->serverGeometry.width () == priv->geometry.width () &&
priv->serverGeometry.height () == priv->geometry.height ())
{
+ CompRect r;
+ int x, y;
+
priv->frameRegion = CompRegion ();
updateFrameRegion (priv->frameRegion);