[aseprite] 120/196: Avoid signed/unsigned comparison in gcc/debug compilation
Tobias Hansen
thansen at moszumanska.debian.org
Wed Apr 20 18:50:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch master
in repository aseprite.
commit 64449ffba8bebaa4240a3ae2b3fd796e7ac9f470
Author: David Capello <davidcapello at gmail.com>
Date: Mon Mar 28 18:59:35 2016 -0300
Avoid signed/unsigned comparison in gcc/debug compilation
---
src/app/ui/tabs.cpp | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/app/ui/tabs.cpp b/src/app/ui/tabs.cpp
index 60529fb..7377c65 100644
--- a/src/app/ui/tabs.cpp
+++ b/src/app/ui/tabs.cpp
@@ -1,5 +1,5 @@
// Aseprite
-// Copyright (C) 2001-2015 David Capello
+// Copyright (C) 2001-2016 David Capello
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -760,10 +760,10 @@ void Tabs::resetOldPositions(double t)
if (tab == m_floatingTab)
continue;
- ASSERT(tab->x != 0xfefefefe);
- ASSERT(tab->width != 0xfefefefe);
- ASSERT(tab->oldX != 0xfefefefe);
- ASSERT(tab->oldWidth != 0xfefefefe);
+ ASSERT(tab->x != (int)0xfefefefe);
+ ASSERT(tab->width != (int)0xfefefefe);
+ ASSERT(tab->oldX != (int)0xfefefefe);
+ ASSERT(tab->oldWidth != (int)0xfefefefe);
tab->oldX = int(inbetween(tab->oldX, tab->x, t));
tab->oldWidth = int(inbetween(tab->oldWidth, tab->width, t));
@@ -883,10 +883,10 @@ gfx::Rect Tabs::getTabBounds(Tab* tab)
box.w = tab->width;
}
else {
- ASSERT(tab->x != 0xfefefefe);
- ASSERT(tab->width != 0xfefefefe);
- ASSERT(tab->oldX != 0xfefefefe);
- ASSERT(tab->oldWidth != 0xfefefefe);
+ ASSERT(tab->x != (int)0xfefefefe);
+ ASSERT(tab->width != (int)0xfefefefe);
+ ASSERT(tab->oldX != (int)0xfefefefe);
+ ASSERT(tab->oldWidth != (int)0xfefefefe);
box.x = startX + int(inbetween(tab->oldX, tab->x, t));
box.w = int(inbetween(tab->oldWidth, tab->width, t));
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git
More information about the Pkg-games-commits
mailing list