diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-11-05 13:48:19 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-11-05 13:48:19 +0300 |
commit | 0ca79840f3497375591a43b38d520ada03dfb2dd (patch) | |
tree | 011c02abc751d78c74c06e8cf50a2251712156be /src | |
parent | 9f7b1073ad4e1cc8f17e83fb13b85e4a20d5320e (diff) | |
download | manaverse-0ca79840f3497375591a43b38d520ada03dfb2dd.tar.gz manaverse-0ca79840f3497375591a43b38d520ada03dfb2dd.tar.bz2 manaverse-0ca79840f3497375591a43b38d520ada03dfb2dd.tar.xz manaverse-0ca79840f3497375591a43b38d520ada03dfb2dd.zip |
fix compilation warnings.
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/windows/editdialog.cpp | 2 | ||||
-rw-r--r-- | src/resources/image.cpp | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/gui/windows/editdialog.cpp b/src/gui/windows/editdialog.cpp index 97ebc23ca..05f55ad67 100644 --- a/src/gui/windows/editdialog.cpp +++ b/src/gui/windows/editdialog.cpp @@ -47,8 +47,6 @@ void EditDialog::postInit() // TRANSLATORS: edit dialog label Button *const okButton = new Button(this, _("OK"), mEventOk, this); - const int numRows = 1; - const int fontHeight = getFont()->getHeight(); const int pad = getPadding(); const int pad2 = pad * 2; mTextField->setPosition(pad, pad); diff --git a/src/resources/image.cpp b/src/resources/image.cpp index 4229cb8af..f185d103e 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -358,9 +358,9 @@ void Image::setAlpha(const float alpha) { for (int y = by; y < maxHeight; y ++) { - const int i1 = y * sw; - const int x1 = i1 + bx; - const int x2 = i1 + maxWidth; + const int idx = y * sw; + const int x1 = idx + bx; + const int x2 = idx + maxWidth; for (int i = x1; i < x2; i ++) { const uint8_t sourceAlpha = mAlphaChannel[i]; |