Changeset 16 for abuse/trunk/src/intsect.cppTweet

Timestamp:

Nov 10, 2005, 8:08:09 PM (17 years ago)

Author:

Sam Hocevar

Message:

• shitloads of long -> int32_t changes for 64 bit safety.

File:

• abuse/trunk/src/intsect.cpp (modified) (8 diffs)

abuse/trunk/src/intsect.cpp

@@ -2 +2 @@
 #include <stdlib.h>
 
-void pushback(long x1,long y1,long &x2,long &y2,
-                     long xp1, long yp1, long xp2, long yp2, int xdir, int ydir, int inside)
+void pushback(int32_t x1,int32_t y1,int32_t &x2,int32_t &y2,
+                     int32_t xp1, int32_t yp1, int32_t xp2, int32_t yp2, int xdir, int ydir, int inside)
 {
 
@@ -15 +15 @@
 
 
-/* int setback_intersect(long x1,long y1,long &x2,long &y2,
-                     long xp1, long yp1, long xp2, long yp2)
+/* int setback_intersect(int32_t x1,int32_t y1,int32_t &x2,int32_t &y2,
+                     int32_t xp1, int32_t yp1, int32_t xp2, int32_t yp2)
 {
-  long mx1,my1,b1,mx2,my2,b2,side1,side2,tx2,ty2;
+  int32_t mx1,my1,b1,mx2,my2,b2,side1,side2,tx2,ty2;
   my1=(y2-y1);
   if (!my1)                  // is the first line strait across?
@@ -110 +110 @@
           if (abs(mx1)>abs(my1))
           {
-            long ae_bd=my1*mx2-mx1*my2;
+            int32_t ae_bd=my1*mx2-mx1*my2;
             CONDITION(ae_bd,"line intersect fuck up");
             tx2=(mx1*mx2*(b2-b1))/ae_bd+xadd;
@@ -117 +117 @@
           else
           {
-            long db_ea=(my2*mx1-mx2*my1);
+            int32_t db_ea=(my2*mx1-mx2*my1);
             CONDITION(db_ea,"line intersect fuck up");
             ty2=(mx1*b1*my2-my1*mx2*b2)/db_ea+yadd;
@@ -137 +137 @@
 
 
-int setback_intersect(long x1,long y1,long &x2,long &y2,
-                      long xp1, long yp1, long xp2, long yp2, 
-                     long inside)  // which side is inside the polygon? (0 always setback)
+int setback_intersect(int32_t x1,int32_t y1,int32_t &x2,int32_t &y2,
+                      int32_t xp1, int32_t yp1, int32_t xp2, int32_t yp2, 
+                     int32_t inside)  // which side is inside the polygon? (0 always setback)
 {
   // the line equations will be put in the form
@@ -145 +145 @@
   //     A        B        C  
 
-  long a1,b1,c1,a2,b2,c2,r1,r2;              
+  int32_t a1,b1,c1,a2,b2,c2,r1,r2;              
 
   a1=y2-y1;        
@@ -157 +157 @@
   } 
 
-  long xdiff,ydiff;
-/*  long xdiff=abs(xp1-xp2),ydiff=yp1-yp2;  
+  int32_t xdiff,ydiff;
+/*  int32_t xdiff=abs(xp1-xp2),ydiff=yp1-yp2;  
   if (xdiff>=ydiff)                              // increment the endpoints 
     if (xp2<xp1) { xp2--; xp1++; }                               
@@ -187 +187 @@
            inside==0 || r2==0) 
       { 
-        long ae=a1*b2,bd=b1*a2; 
+        int32_t ae=a1*b2,bd=b1*a2;      
         if (ae!=bd)         // co-linear returns 0
         {