git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.opendreambox.org:/git/enigma2
[enigma2.git]
/
lib
/
gdi
/
erect.h
diff --git
a/lib/gdi/erect.h
b/lib/gdi/erect.h
index d95b8c0f6caf184ffd3b4256eda7dac19cbf204b..34713ab40f2a5724907b1f8aa43e9d1055085166 100644
(file)
--- a/
lib/gdi/erect.h
+++ b/
lib/gdi/erect.h
@@
-119,6
+119,14
@@
public:
static eRect emptyRect() { return eRect(0, 0, 0, 0); }
static eRect invalidRect() { return eRect(); }
static eRect emptyRect() { return eRect(0, 0, 0, 0); }
static eRect invalidRect() { return eRect(); }
+ inline void scale(int x_n, int x_d, int y_n, int y_d)
+ {
+ x1 *= x_n; x1 /= x_d;
+ x2 *= x_n; x2 /= x_d;
+ y1 *= y_n; y1 /= y_d;
+ y2 *= y_n; y2 /= y_d;
+ }
+
private:
int x1;
int y1;
private:
int x1;
int y1;
@@
-143,7
+151,7
@@
inline eRect::eRect( int left, int top, int width, int height )
}
inline bool eRect::empty() const
}
inline bool eRect::empty() const
-{ return x1
== x2 || y1 =
= y2; }
+{ return x1
>= x2 || y1 >
= y2; }
inline bool eRect::valid() const
{ return x1 <= x2 && y1 <= y2; }
inline bool eRect::valid() const
{ return x1 <= x2 && y1 <= y2; }