git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
adding timers works now
[enigma2.git]
/
lib
/
gdi
/
erect.cpp
diff --git
a/lib/gdi/erect.cpp
b/lib/gdi/erect.cpp
index b72e5d04bdb6e075df2d6e1f4f26edf5ae5cde01..43cefc533fd5dca38fdf8dc9880b13367cc47e34 100644
(file)
--- a/
lib/gdi/erect.cpp
+++ b/
lib/gdi/erect.cpp
@@
-1,5
+1,4
@@
#include <lib/gdi/erect.h>
#include <lib/gdi/erect.h>
-#include <iostream>
/*****************************************************************************
eRect member functions
/*****************************************************************************
eRect member functions
@@
-151,8
+150,8
@@
eRect& eRect::operator&=(const eRect &r)
eRect eRect::operator|(const eRect &r) const
{
eRect eRect::operator|(const eRect &r) const
{
- if (
isV
alid() ) {
- if ( r.
isV
alid() ) {
+ if (
v
alid() ) {
+ if ( r.
v
alid() ) {
eRect tmp;
tmp.setLeft( MIN( x1, r.x1 ) );
tmp.setRight( MAX( x2, r.x2 ) );
eRect tmp;
tmp.setLeft( MIN( x1, r.x1 ) );
tmp.setRight( MAX( x2, r.x2 ) );