X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2FBitmapOutputDev.cc;h=d0129d260c63e168d10dd7d0bfaa05955dd763c0;hb=6a4e4086d9fb91474f4d8c7ae20ec2ad205a34d9;hp=c9cbd0c9e3621ff2735f367603288ce252ed03f3;hpb=bb51f4b9fa144d46ff9ff32e8c9d818ae4e97153;p=swftools.git

diff --git a/lib/pdf/BitmapOutputDev.cc b/lib/pdf/BitmapOutputDev.cc
index c9cbd0c..d0129d2 100644
--- a/lib/pdf/BitmapOutputDev.cc
+++ b/lib/pdf/BitmapOutputDev.cc
@@ -440,6 +440,16 @@ static void clearBooleanBitmap(SplashBitmap*btm)
     }
 }
 
+long long unsigned int compare64(long long unsigned int*data1, long long unsigned int*data2, int len)
+{
+    long long unsigned int c;
+    int t;
+    for(t=0;t<len;t++) {
+        c |= data1[t]&data2[t];
+    }
+    return c;
+}
+
 GBool BitmapOutputDev::intersection()
 {
     SplashBitmap*boolpoly = boolpolybitmap;
@@ -457,17 +467,18 @@ GBool BitmapOutputDev::intersection()
 	
 	int t;
 	int len = height*width8;
-	unsigned int c=0;
-	if(len & (sizeof(unsigned int)-1)) {
-	    Guchar c2=0;
-	    for(t=0;t<len;t++) {
-		c2 |= polypixels[t]&textpixels[t];
-	    }
-	    c = c2;
-	} else {
-	    len /= sizeof(unsigned int);
-	    for(t=0;t<len;t++) {
-		c |= (((unsigned int*)polypixels)[t]) & (((unsigned int*)textpixels)[t]);
+	unsigned long long int c=0;
+        assert(sizeof(unsigned long long int)==8);
+	{
+            if((polypixels&7) || (textpixels&7)) {
+                msg("<warning> Non-optimal alignment");
+            }
+            int l2 = len;
+	    len /= sizeof(unsigned long long int);
+            c = compare64((unsigned long long int*)polypixels, (unsigned long long int*)textpixels, len);
+            int l1 = len*sizeof(unsigned long long int);
+	    for(t=l1;t<l2;t++) {
+		c |= (unsigned long long int)(polypixels[t]&textpixels[t]);
 	    }
 	}
 	if(c)