|
8238
|
1 |
--- vidalia-0.2.15/src/vidalia/network/ZImageView.cpp Fri Oct 7 21:16:56 2011
|
|
|
2 |
+++ vidalia-0.2.15/src/vidalia/network/ZImageView.cpp Sat Feb 11 21:27:08 2012
|
|
|
3 |
@@ -173,2 +173,3 @@
|
|
|
4 |
- float maxw = float(std::max<int>(sRect.width(), iRect.width())) + _padding;
|
|
|
5 |
- float maxh = float(std::max<int>(sRect.height(), iRect.height())) + _padding;
|
|
|
6 |
+#define max(a, b) (((a) > (b)) ? (a) : (b))
|
|
|
7 |
+ float maxw = float(max(sRect.width(), iRect.width())) + _padding;
|
|
|
8 |
+ float maxh = float(max(sRect.height(), iRect.height())) + _padding;
|