[poppler] poppler/splash: SplashPath.cc, 1.2, 1.3 SplashPath.h, 1.2, 1.3

[Albert Astals Cid]

Update of /cvs/poppler/poppler/splash
In directory gabe:/tmp/cvs-serv14685

Modified Files:
	SplashPath.cc SplashPath.h 
Log Message:
Merge xpdf 3.00 -> 3.01 changes in SplashPath.* files


Index: SplashPath.cc
===================================================================
RCS file: /cvs/poppler/poppler/splash/SplashPath.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SplashPath.cc	27 Aug 2005 08:43:43 -0000	1.2
+++ SplashPath.cc	15 Sep 2005 22:20:37 -0000	1.3
@@ -148,7 +148,8 @@
   if (noCurrentPoint()) {
     return splashErrNoCurPt;
   }
-  if (pts[length - 1].x != pts[curSubpath].x ||
+  if (curSubpath == length - 1 ||
+      pts[length - 1].x != pts[curSubpath].x ||
       pts[length - 1].y != pts[curSubpath].y) {
     lineTo(pts[curSubpath].x, pts[curSubpath].y);
   }

Index: SplashPath.h
===================================================================
RCS file: /cvs/poppler/poppler/splash/SplashPath.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SplashPath.h	31 Jul 2005 09:54:04 -0000	1.2
+++ SplashPath.h	15 Sep 2005 22:20:37 -0000	1.3
@@ -82,6 +82,11 @@
   // Add (<dx>, <dy>) to every point on this path.
   void offset(SplashCoord dx, SplashCoord dy);
 
+  // Get the points on the path.
+  int getLength() { return length; }
+  void getPoint(int i, double *x, double *y, Guchar *f)
+    { *x = pts[i].x; *y = pts[i].y; *f = flags[i]; }
+
   // Get the current point.
   GBool getCurPt(SplashCoord *x, SplashCoord *y);