c3058..dab03 (2009-04-20 23:56)
(2009-04-22 21:55) 44c17..77ca3
Author: AndreasDate: Tue Apr 21 12:39:18 +0200 2009
Subject: Change some of the casts to use static_cast.
| src/Client.cc | |
| 1313 | @@ -1313,11 +1313,11 @@ |
| 1313 | // underflows in w and h. Keep in mind that _size->base_{width,height} are |
| 1314 | // guaranteed to be non-negative by getWMNormalHints(). |
| 1315 | if (_size->flags & PBaseSize) { |
| 1316 | if ((uint)(_size->base_width) < w) { |
| 1317 | if (static_cast<uint>(_size->base_width) < w) { |
| 1318 | base_w = _size->base_width; |
| 1319 | w -= base_w; |
| 1320 | } |
| 1321 | if ((uint)(_size->base_height) < h) { |
| 1322 | if (static_cast<uint>(_size->base_height) < h) { |
| 1323 | base_h = _size->base_height; |
| 1324 | h -= base_h; |
| 1325 | } |
| ... | |
| 1341 | @@ -1341,16 +1341,16 @@ |
| 1341 | tmp = ((double)(w * amin_x + h * amin_y)) / |
| 1342 | ((double)(amin_x * amin_x + amin_y * amin_y)); |
| 1343 | |
| 1344 | w = (uint)(amin_x * tmp) + base_w; |
| 1345 | h = (uint)(amin_y * tmp) + base_h; |
| 1346 | w = static_cast<uint>(amin_x * tmp) + base_w; |
| 1347 | h = static_cast<uint>(amin_y * tmp) + base_h; |
| 1348 | |
| 1349 | // Check if w/h is greater than amax_x/amax_y |
| 1350 | } else if (w * amax_y > amax_x * h) { |
| 1351 | tmp = ((double)(w * amax_x + h * amax_y)) / |
| 1352 | ((double)(amax_x * amax_x + amax_y * amax_y)); |
| 1353 | |
| 1354 | w = (uint)(amax_x * tmp) + base_w; |
| 1355 | h = (uint)(amax_y * tmp) + base_h; |
| 1356 | w = static_cast<uint>(amax_x * tmp) + base_w; |
| 1357 | h = static_cast<uint>(amax_y * tmp) + base_h; |
| 1358 | } |
| 1359 | |
| 1360 | getIncSize(r_w, r_h, w, h, false); |
| ... | |