diff Framework/StoneEnumerations.h @ 561:1201b12eb9f8 dev

merge default -> dev
author Alain Mazy <alain@mazy.be>
date Thu, 18 Apr 2019 09:30:00 +0200
parents 77e0eb83ff63 77a21b28becd
children 3080ec4ec6b9
line wrap: on
line diff
--- a/Framework/StoneEnumerations.h	Wed Apr 17 16:13:42 2019 +0200
+++ b/Framework/StoneEnumerations.h	Thu Apr 18 09:30:00 2019 +0200
@@ -206,5 +206,6 @@
                                 double& deltaY /* out */,
                                 BitmapAnchor anchor,
                                 unsigned int bitmapWidth,
-                                unsigned int bitmapHeight);
+                                unsigned int bitmapHeight,
+                                unsigned int border = 0);
 }