Merge 563c99cdca into c07f3f0171

Fixed: fix macro definition.
Inside `mouse/mouse_c.h`: line 101 The expansion of MOUSE_COORD_TO_ABS will result in undesired calculation.
2025-06-17 13:33:55 +00:00 · 2024-12-12 07:46:14 +13:00 · 2024-10-10 20:06:20 +08:00 · 2024-10-08 11:00:06 +08:00
2 changed files with 2 additions and 2 deletions
--- a/mouse/mouse_c.h
+++ b/mouse/mouse_c.h
@ -99,7 +99,7 @@ void moveMouse(MMPointInt32 point){
 		// Mouse motion is now done using SendInput with MOUSEINPUT.
 		// We use Absolute mouse positioning
 		#define MOUSE_COORD_TO_ABS(coord, width_or_height) ( \
-			((65536 * coord) / width_or_height) + (coord < 0 ? -1 : 1))
+			((65536 * (coord)) / (width_or_height)) + ((coord) < 0 ? (-1) : 1))

 		MMRectInt32 rect = getScreenRect(1);
 		int32_t x = MOUSE_COORD_TO_ABS(point.x - rect.origin.x, rect.size.w);
--- a/screen/screengrab_c.h
+++ b/screen/screengrab_c.h
@ -90,7 +90,7 @@ MMBitmapRef copyMMBitmapFromDisplayInRect(MMRectInt32 rect, int32_t display_id,
 	if (!imageData) { return NULL; }

 	bufferSize = CFDataGetLength(imageData);
-	buffer = malloc(bufferSize);
+	buffer = (uint8_t *)malloc(bufferSize);
 	CFDataGetBytes(imageData, CFRangeMake(0, bufferSize), buffer);

 	bitmap = createMMBitmap_c(buffer,
Author	SHA1	Message	Date
XueHaonan	4db87b3d59	Merge `563c99cdca` into `c07f3f0171`	2024-12-12 07:46:14 +13:00
Xue Haonan	563c99cdca	Fixed: fix macro definition. Inside `mouse/mouse_c.h`: line 101 The expansion of MOUSE_COORD_TO_ABS will result in undesired calculation.	2024-10-10 20:06:20 +08:00
Xue Haonan	2c2c1745ed	Fixed pointer implicit conversion error.	2024-10-08 11:00:06 +08:00