Merge branch 'Cog' of https://github.com/OpenSmalltalk/opensmalltalk-vm into Cog

Author: eliotmiranda

src/plugins/B2DPlugin/B2DPlugin.c

@@ -1,9 +1,9 @@
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker.oscog-eem.2724 uuid: 8312b062-c234-4dbb-bc52-8541f45811bb
+	VMPluginCodeGenerator VMMaker.oscog-nice.2732 uuid: e0800e83-2731-9a4c-89f8-b7444f5e05d5
    from
-	BalloonEnginePlugin VMMaker.oscog-eem.2724 uuid: 8312b062-c234-4dbb-bc52-8541f45811bb
+	BalloonEnginePlugin VMMaker.oscog-nice.2732 uuid: e0800e83-2731-9a4c-89f8-b7444f5e05d5
  */
-static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.2724 uuid: 8312b062-c234-4dbb-bc52-8541f45811bb " __DATE__ ;
+static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-nice.2732 uuid: e0800e83-2731-9a4c-89f8-b7444f5e05d5 " __DATE__ ;
 
 
 
@@ -843,7 +843,7 @@ extern
 #endif
 struct VirtualMachine* interpreterProxy;
 static void * loadBBFn;
-static const char *moduleName = "B2DPlugin VMMaker.oscog-eem.2724 " INT_EXT;
+static const char *moduleName = "B2DPlugin VMMaker.oscog-nice.2732 " INT_EXT;
 static int* objBuffer;
 static sqInt objUsed;
 static unsigned int* spanBuffer;
@@ -13019,16 +13019,16 @@ stepToFirstBezierInat(sqInt bezier, sqInt yValue)
 		minY = yValue * 256;
 		while ((minY > lastY)
 		 && (fwDy1 >= 0)) {
-			lastX += (((usqInt)((fwDx1 + 32768))) >> 16);
-			lastY += (((usqInt)((fwDy1 + 32768))) >> 16);
+			lastX += (((sqInt)((fwDx1 + 32768))) >> 16);
+			lastY += (((sqInt)((fwDy1 + 32768))) >> 16);
 			fwDx1 += updateData1[GBUpdateDDX];
 			fwDy1 += updateData1[GBUpdateDDY];
 		}
 		updateData1[GBUpdateX] = lastX;
 		updateData1[GBUpdateY] = lastY;
 		updateData1[GBUpdateDX] = fwDx1;
 		updateData1[GBUpdateDY] = fwDy1;
-		xValue = (((usqInt)(lastX)) >> 8);
+		xValue = (((sqInt)(lastX)) >> 8);
 		/* begin edgeXValueOf:put: */
 		objBuffer[bezier + GEXValue] = xValue;
 		/* begin edgeNumLinesOf:put: */
@@ -13423,16 +13423,16 @@ stepToNextBezier(void)
 	minY = (workBuffer[GWCurrentY]) * 256;
 	while ((minY > lastY)
 	 && (fwDy >= 0)) {
-		lastX += (((usqInt)((fwDx + 32768))) >> 16);
-		lastY += (((usqInt)((fwDy + 32768))) >> 16);
+		lastX += (((sqInt)((fwDx + 32768))) >> 16);
+		lastY += (((sqInt)((fwDy + 32768))) >> 16);
 		fwDx += updateData[GBUpdateDDX];
 		fwDy += updateData[GBUpdateDDY];
 	}
 	updateData[GBUpdateX] = lastX;
 	updateData[GBUpdateY] = lastY;
 	updateData[GBUpdateDX] = fwDx;
 	updateData[GBUpdateDY] = fwDy;
-	xValue = (((usqInt)(lastX)) >> 8);
+	xValue = (((sqInt)(lastX)) >> 8);
 	/* begin edgeXValueOf:put: */
 	objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GEXValue] = xValue;
 	return null;
@@ -13465,16 +13465,16 @@ stepToNextBezierForwardat(int *updateData, sqInt yValue)
 	minY = yValue * 256;
 	while ((minY > lastY)
 	 && (fwDy >= 0)) {
-		lastX += (((usqInt)((fwDx + 32768))) >> 16);
-		lastY += (((usqInt)((fwDy + 32768))) >> 16);
+		lastX += (((sqInt)((fwDx + 32768))) >> 16);
+		lastY += (((sqInt)((fwDy + 32768))) >> 16);
 		fwDx += updateData[GBUpdateDDX];
 		fwDy += updateData[GBUpdateDDY];
 	}
 	updateData[GBUpdateX] = lastX;
 	updateData[GBUpdateY] = lastY;
 	updateData[GBUpdateDX] = fwDx;
 	updateData[GBUpdateDY] = fwDy;
-	return (((usqInt)(lastX)) >> 8);
+	return (((sqInt)(lastX)) >> 8);
 }
 
 
@@ -13506,16 +13506,16 @@ stepToNextBezierInat(sqInt bezier, sqInt yValue)
 	minY = yValue * 256;
 	while ((minY > lastY)
 	 && (fwDy >= 0)) {
-		lastX += (((usqInt)((fwDx + 32768))) >> 16);
-		lastY += (((usqInt)((fwDy + 32768))) >> 16);
+		lastX += (((sqInt)((fwDx + 32768))) >> 16);
+		lastY += (((sqInt)((fwDy + 32768))) >> 16);
 		fwDx += updateData[GBUpdateDDX];
 		fwDy += updateData[GBUpdateDDY];
 	}
 	updateData[GBUpdateX] = lastX;
 	updateData[GBUpdateY] = lastY;
 	updateData[GBUpdateDX] = fwDx;
 	updateData[GBUpdateDY] = fwDy;
-	xValue = (((usqInt)(lastX)) >> 8);
+	xValue = (((sqInt)(lastX)) >> 8);
 	/* begin edgeXValueOf:put: */
 	objBuffer[bezier + GEXValue] = xValue;
 	return 0;
@@ -13648,16 +13648,16 @@ stepToNextWideBezierInat(sqInt bezier, sqInt yValue)
 		minY = yValue * 256;
 		while ((minY > lastY)
 		 && (fwDy >= 0)) {
-			lastX += (((usqInt)((fwDx + 32768))) >> 16);
-			lastY += (((usqInt)((fwDy + 32768))) >> 16);
+			lastX += (((sqInt)((fwDx + 32768))) >> 16);
+			lastY += (((sqInt)((fwDy + 32768))) >> 16);
 			fwDx += updateData[GBUpdateDDX];
 			fwDy += updateData[GBUpdateDDY];
 		}
 		updateData[GBUpdateX] = lastX;
 		updateData[GBUpdateY] = lastY;
 		updateData[GBUpdateDX] = fwDx;
 		updateData[GBUpdateDY] = fwDy;
-		(((usqInt)(lastX)) >> 8);
+		(((sqInt)(lastX)) >> 8);
 	}
 	else {
 
@@ -13678,16 +13678,16 @@ stepToNextWideBezierInat(sqInt bezier, sqInt yValue)
 	minY1 = yValue * 256;
 	while ((minY1 > lastY1)
 	 && (fwDy1 >= 0)) {
-		lastX1 += (((usqInt)((fwDx1 + 32768))) >> 16);
-		lastY1 += (((usqInt)((fwDy1 + 32768))) >> 16);
+		lastX1 += (((sqInt)((fwDx1 + 32768))) >> 16);
+		lastY1 += (((sqInt)((fwDy1 + 32768))) >> 16);
 		fwDx1 += updateData1[GBUpdateDDX];
 		fwDy1 += updateData1[GBUpdateDDY];
 	}
 	updateData1[GBUpdateX] = lastX1;
 	updateData1[GBUpdateY] = lastY1;
 	updateData1[GBUpdateDX] = fwDx1;
 	updateData1[GBUpdateDY] = fwDy1;
-	(((usqInt)(lastX1)) >> 8);
+	(((sqInt)(lastX1)) >> 8);
 	computeFinalWideBezierValueswidth(bezier, lineWidth);
 	return 0;
 }