File 0002-Move-the-non-trivial-part-of-the-clip-test... of Package poppler

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-Move-the-non-trivial-part-of-the-clip-test-to-the-im.patch of Package poppler (Revision 1ce5a3efa29f1b5213858c6eb12510cc)

Currently displaying revision 1ce5a3efa29f1b5213858c6eb12510cc , Show latest

From 194e57f21e6a7fe2a5eb3cf687599978b09e03f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Mon, 7 Oct 2019 20:46:33 +0200
Subject: [PATCH 2/3] Move the non-trivial part of the clip test to the
 implementation file

This allows to only have a SplashXPathScanner forward declaration in
the header file.
---
 splash/SplashClip.cc | 15 +++++++++++++++
 splash/SplashClip.h  | 21 +++------------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/splash/SplashClip.cc b/splash/SplashClip.cc
index a58fd29e..a4c2e73e 100644
--- a/splash/SplashClip.cc
+++ b/splash/SplashClip.cc
@@ -406,3 +406,18 @@ void SplashClip::clipAALine(SplashBitmap *aaBuf, int *x0, int *x1, int y, bool a
     }
   }
 }
+
+bool SplashClip::testClipPaths(int x, int y) {
+  if (antialias) {
+    x *= splashAASize;
+    y *= splashAASize;
+  }
+
+  for (int i = 0; i < length; ++i) {
+    if (!scanners[i]->test(x, y)) {
+      return false;
+    }
+  }
+
+  return true;
+}
diff --git a/splash/SplashClip.h b/splash/SplashClip.h
index a6ab1870..77b5e6c3 100644
--- a/splash/SplashClip.h
+++ b/splash/SplashClip.h
@@ -23,10 +23,10 @@
 #define SPLASHCLIP_H
 
 #include "SplashTypes.h"
-#include "SplashXPathScanner.h"
 
 class SplashPath;
 class SplashXPath;
+class SplashXPathScanner;
 class SplashBitmap;
 
 //------------------------------------------------------------------------
@@ -72,29 +72,13 @@ public:
   // Returns true if (<x>,<y>) is inside the clip.
   bool test(int x, int y)
   {
-    int i;
-
     // check the rectangle
     if (x < xMinI || x > xMaxI || y < yMinI || y > yMaxI) {
       return false;
     }
 
     // check the paths
-    if (antialias) {
-      for (i = 0; i < length; ++i) {
-        if (!scanners[i]->test(x * splashAASize, y * splashAASize)) {
-	  return false;
-        }
-      }
-    } else {
-      for (i = 0; i < length; ++i) {
-        if (!scanners[i]->test(x, y)) {
-	  return false;
-        }
-      }
-    }
-
-    return true;
+    return testClipPaths(x, y);
   }
 
   // Tests a rectangle against the clipping region.  Returns one of:
@@ -137,6 +121,7 @@ protected:
 
   SplashClip(SplashClip *clip);
   void grow(int nPaths);
+  bool testClipPaths(int x, int y);
 
   bool antialias;
   SplashCoord xMin, yMin, xMax, yMax;
-- 
2.23.0

Places

File 0002-Move-the-non-trivial-part-of-the-clip-test-to-the-im.patch of Package poppler (Revision 1ce5a3efa29f1b5213858c6eb12510cc)

Places