Update to 1.11.0-beta1

This commit is contained in:
dP
2021-01-23 17:31:11 +03:00
parent d3c06c25c8
commit 5e4506f493
1045 changed files with 23534 additions and 60345 deletions
+2 -2
View File
@@ -22,7 +22,7 @@
Dimension maxdim(const Dimension &d1, const Dimension &d2)
{
Dimension d;
d.width = max(d1.width, d2.width);
d.height = max(d1.height, d2.height);
d.width = std::max(d1.width, d2.width);
d.height = std::max(d1.height, d2.height);
return d;
}