git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Usermode/libc - Fix strchr and strrchr behavior
[tpg/acess2.git]
/
Usermode
/
Applications
/
axwin4_src
/
Server
/
CRect.cpp
diff --git
a/Usermode/Applications/axwin4_src/Server/CRect.cpp
b/Usermode/Applications/axwin4_src/Server/CRect.cpp
index
6f504d8
..
acbcc27
100644
(file)
--- a/
Usermode/Applications/axwin4_src/Server/CRect.cpp
+++ b/
Usermode/Applications/axwin4_src/Server/CRect.cpp
@@
-7,6
+7,7
@@
*/
#include <CRect.hpp>
#include <algorithm>
*/
#include <CRect.hpp>
#include <algorithm>
+#include <acess/sys.h>
namespace AxWin {
namespace AxWin {
@@
-57,10
+58,10
@@
CRect CRect::Intersection(const CRect& other) const
int x2 = ::std::min(m_x2, other.m_x2);
int y2 = ::std::min(m_y2, other.m_y2);
int x2 = ::std::min(m_x2, other.m_x2);
int y2 = ::std::min(m_y2, other.m_y2);
- if( x
1 <= x2
|| y2 <= y1 )
+ if( x
2 <= x1
|| y2 <= y1 )
return CRect();
return CRect();
- return CRect(x1, y1, x2-x1, y2-y
2
);
+ return CRect(x1, y1, x2-x1, y2-y
1
);
}
CRect CRect::RelativeIntersection(const CRect& area)
}
CRect CRect::RelativeIntersection(const CRect& area)
UCC
git Repository :: git.ucc.asn.au