From: Pierre Ossman Date: Tue, 3 Mar 2015 15:35:28 +0000 (+0100) Subject: Make Rect::area() signed, just like Rect::width()/height() X-Git-Tag: v1.4.90~33^2~21 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=615a0f58f17d46fe861f753418bfa78ae19bce89;p=tigervnc.git Make Rect::area() signed, just like Rect::width()/height() Makes it more sane what type to use when interacting with this class. --- diff --git a/common/rfb/Rect.h b/common/rfb/Rect.h index 52e92b57..b5ae2548 100644 --- a/common/rfb/Rect.h +++ b/common/rfb/Rect.h @@ -102,7 +102,7 @@ namespace rfb { inline bool overlaps(const Rect &r) const { return tl.x < r.br.x && tl.y < r.br.y && br.x > r.tl.x && br.y > r.tl.y; } - inline unsigned int area() const {return is_empty() ? 0 : (br.x-tl.x)*(br.y-tl.y);} + inline int area() const {return is_empty() ? 0 : (br.x-tl.x)*(br.y-tl.y);} inline Point dimensions() const {return Point(width(), height());} inline int width() const {return br.x-tl.x;} inline int height() const {return br.y-tl.y;}