[poppler] poppler/splash: Splash.cc,1.4,1.5 SplashTypes.h,1.3,1.4

[Albert Astals Cid]

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

Modified Files:
	Splash.cc SplashTypes.h 
Log Message:
Various fixes from Frank Meerkötter to enable fixedpoint arithmetic


Index: Splash.cc
===================================================================
RCS file: /cvs/poppler/poppler/splash/Splash.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Splash.cc	30 Oct 2005 20:29:05 -0000	1.4
+++ Splash.cc	6 Feb 2006 20:49:21 -0000	1.5
@@ -2020,10 +2020,10 @@
 	  for (xx = 0, x1 = x0 - glyph->x; xx < glyph->w; ++xx, ++x1) {
 	    alpha = *p++;
 	    if (softMask) {
-	      alpha = (int)(alpha * state->fillAlpha *
+	      alpha = (int)(alpha * (float)state->fillAlpha *
 			    softMask->data[y1 * softMask->rowSize + x1]);
 	    } else {
-	      alpha = (int)(alpha * state->fillAlpha);
+	      alpha = (int)(alpha * (float)state->fillAlpha);
 	    }
 	    if (alpha > 0) {
 	      if (noClip || state->clip->test(x1, y1)) {

Index: SplashTypes.h
===================================================================
RCS file: /cvs/poppler/poppler/splash/SplashTypes.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SplashTypes.h	30 Oct 2005 20:29:05 -0000	1.3
+++ SplashTypes.h	6 Feb 2006 20:49:21 -0000	1.4
@@ -14,7 +14,7 @@
 //------------------------------------------------------------------------
 
 #if USE_FIXEDPOINT
-#include "FixedPoint.h"
+#include "goo/FixedPoint.h"
 typedef FixedPoint SplashCoord;
 #else
 typedef double SplashCoord;