From 0edda028473b92e321c02af7a2a9596b4274c3a4 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 7 May 2020 10:36:51 +0200 Subject: [PATCH] removing register keyword needed for c++17 compatibility, this file is only used in iOS builds --- src/generic/regiong.cpp | 168 ++++++++++++++++++++-------------------- 1 file changed, 84 insertions(+), 84 deletions(-) diff --git a/src/generic/regiong.cpp b/src/generic/regiong.cpp index 8249dcf0b3..7973fb292f 100644 --- a/src/generic/regiong.cpp +++ b/src/generic/regiong.cpp @@ -60,13 +60,13 @@ public: Region r, wxRect *rect); static bool XOffsetRegion( - register Region pRegion, - register int x, - register int y); + Region pRegion, + int x, + int y); static bool XIntersectRegion( Region reg1, Region reg2, /* source regions */ - register Region newReg); /* destination Region */ + Region newReg); /* destination Region */ static bool XUnionRegion( Region reg1, Region reg2, /* source regions */ @@ -74,7 +74,7 @@ public: static bool XSubtractRegion( Region regM, Region regS, - register Region regD); + Region regD); static bool XXorRegion(Region sra, Region srb, Region dr); static bool XEmptyRegion( Region r); @@ -83,7 +83,7 @@ public: Region pRegion, int x, int y); static wxRegionContain XRectInRegion( - register Region region, + Region region, int rx, int ry, unsigned int rwidth, unsigned int rheight); @@ -93,77 +93,77 @@ protected: Region pReg); static bool XDestroyRegion(Region r); static int miIntersectO ( - register Region pReg, - register BoxPtr r1, + Region pReg, + BoxPtr r1, BoxPtr r1End, - register BoxPtr r2, + BoxPtr r2, BoxPtr r2End, wxCoord y1, wxCoord y2); static void miRegionCopy( - register Region dstrgn, - register Region rgn); + Region dstrgn, + Region rgn); static int miCoalesce( - register Region pReg, /* Region to coalesce */ + Region pReg, /* Region to coalesce */ int prevStart, /* Index of start of previous band */ int curStart); /* Index of start of current band */ static void miRegionOp( - register Region newReg, /* Place to store result */ + Region newReg, /* Place to store result */ Region reg1, /* First region in operation */ Region reg2, /* 2d region in operation */ int (*overlapFunc)( - register Region pReg, - register BoxPtr r1, + Region pReg, + BoxPtr r1, BoxPtr r1End, - register BoxPtr r2, + BoxPtr r2, BoxPtr r2End, wxCoord y1, wxCoord y2), /* Function to call for over- * lapping bands */ int (*nonOverlap1Func)( - register Region pReg, - register BoxPtr r, + Region pReg, + BoxPtr r, BoxPtr rEnd, - register wxCoord y1, - register wxCoord y2), /* Function to call for non- + wxCoord y1, + wxCoord y2), /* Function to call for non- * overlapping bands in region * 1 */ int (*nonOverlap2Func)( - register Region pReg, - register BoxPtr r, + Region pReg, + BoxPtr r, BoxPtr rEnd, - register wxCoord y1, - register wxCoord y2)); /* Function to call for non- + wxCoord y1, + wxCoord y2)); /* Function to call for non- * overlapping bands in region * 2 */ static int miUnionNonO ( - register Region pReg, - register BoxPtr r, + Region pReg, + BoxPtr r, BoxPtr rEnd, - register wxCoord y1, - register wxCoord y2); + wxCoord y1, + wxCoord y2); static int miUnionO ( - register Region pReg, - register BoxPtr r1, + Region pReg, + BoxPtr r1, BoxPtr r1End, - register BoxPtr r2, + BoxPtr r2, BoxPtr r2End, - register wxCoord y1, - register wxCoord y2); + wxCoord y1, + wxCoord y2); static int miSubtractNonO1 ( - register Region pReg, - register BoxPtr r, + Region pReg, + BoxPtr r, BoxPtr rEnd, - register wxCoord y1, - register wxCoord y2); + wxCoord y1, + wxCoord y2); static int miSubtractO ( - register Region pReg, - register BoxPtr r1, + Region pReg, + BoxPtr r1, BoxPtr r1End, - register BoxPtr r2, + BoxPtr r2, BoxPtr r2End, - register wxCoord y1, - register wxCoord y2); + wxCoord y1, + wxCoord y2); protected: long size; long numRects; @@ -714,9 +714,9 @@ XDestroyRegion( bool REGION:: XOffsetRegion( - register Region pRegion, - register int x, - register int y) + Region pRegion, + int x, + int y) { int nbox; BOX *pbox; @@ -758,10 +758,10 @@ XOffsetRegion( /* static void*/ int REGION:: miIntersectO ( - register Region pReg, - register BoxPtr r1, + Region pReg, + BoxPtr r1, BoxPtr r1End, - register BoxPtr r2, + BoxPtr r2, BoxPtr r2End, wxCoord y1, wxCoord y2) @@ -824,7 +824,7 @@ bool REGION:: XIntersectRegion( Region reg1, Region reg2, /* source regions */ - register Region newReg) /* destination Region */ + Region newReg) /* destination Region */ { /* check for trivial reject */ if ( (!(reg1->numRects)) || (!(reg2->numRects)) || @@ -847,8 +847,8 @@ XIntersectRegion( void REGION:: miRegionCopy( - register Region dstrgn, - register Region rgn) + Region dstrgn, + Region rgn) { if (dstrgn != rgn) /* don't want to copy to itself */ @@ -905,7 +905,7 @@ miRegionCopy( /* static int*/ int REGION:: miCoalesce( - register Region pReg, /* Region to coalesce */ + Region pReg, /* Region to coalesce */ int prevStart, /* Index of start of previous band */ int curStart) /* Index of start of current band */ { @@ -1057,32 +1057,32 @@ miCoalesce( /* static void*/ void REGION:: miRegionOp( - register Region newReg, /* Place to store result */ + Region newReg, /* Place to store result */ Region reg1, /* First region in operation */ Region reg2, /* 2d region in operation */ int (*overlapFunc)( - register Region pReg, - register BoxPtr r1, + Region pReg, + BoxPtr r1, BoxPtr r1End, - register BoxPtr r2, + BoxPtr r2, BoxPtr r2End, wxCoord y1, wxCoord y2), /* Function to call for over- * lapping bands */ int (*nonOverlap1Func)( - register Region pReg, - register BoxPtr r, + Region pReg, + BoxPtr r, BoxPtr rEnd, - register wxCoord y1, - register wxCoord y2), /* Function to call for non- + wxCoord y1, + wxCoord y2), /* Function to call for non- * overlapping bands in region * 1 */ int (*nonOverlap2Func)( - register Region pReg, - register BoxPtr r, + Region pReg, + BoxPtr r, BoxPtr rEnd, - register wxCoord y1, - register wxCoord y2)) /* Function to call for non- + wxCoord y1, + wxCoord y2)) /* Function to call for non- * overlapping bands in region * 2 */ { @@ -1366,11 +1366,11 @@ miRegionOp( /* static void*/ int REGION:: miUnionNonO ( - register Region pReg, - register BoxPtr r, + Region pReg, + BoxPtr r, BoxPtr rEnd, - register wxCoord y1, - register wxCoord y2) + wxCoord y1, + wxCoord y2) { BoxPtr pNextRect; @@ -1415,13 +1415,13 @@ miUnionNonO ( /* static void*/ int REGION:: miUnionO ( - register Region pReg, - register BoxPtr r1, + Region pReg, + BoxPtr r1, BoxPtr r1End, - register BoxPtr r2, + BoxPtr r2, BoxPtr r2End, - register wxCoord y1, - register wxCoord y2) + wxCoord y1, + wxCoord y2) { BoxPtr pNextRect; @@ -1567,11 +1567,11 @@ XUnionRegion( /* static void*/ int REGION:: miSubtractNonO1 ( - register Region pReg, - register BoxPtr r, + Region pReg, + BoxPtr r, BoxPtr rEnd, - register wxCoord y1, - register wxCoord y2) + wxCoord y1, + wxCoord y2) { BoxPtr pNextRect; @@ -1614,13 +1614,13 @@ miSubtractNonO1 ( /* static void*/ int REGION:: miSubtractO ( - register Region pReg, - register BoxPtr r1, + Region pReg, + BoxPtr r1, BoxPtr r1End, - register BoxPtr r2, + BoxPtr r2, BoxPtr r2End, - register wxCoord y1, - register wxCoord y2) + wxCoord y1, + wxCoord y2) { BoxPtr pNextRect; int x1; @@ -1761,7 +1761,7 @@ miSubtractO ( *----------------------------------------------------------------------- */ -bool REGION::XSubtractRegion(Region regM, Region regS, register Region regD) +bool REGION::XSubtractRegion(Region regM, Region regS, Region regD) { /* check for trivial reject */ if ( (!(regM->numRects)) || (!(regS->numRects)) || @@ -1851,7 +1851,7 @@ bool REGION::XPointInRegion(Region pRegion, int x, int y) return false; } -wxRegionContain REGION::XRectInRegion(register Region region, +wxRegionContain REGION::XRectInRegion(Region region, int rx, int ry, unsigned int rwidth, unsigned int rheight)