[poppler] Branch 'xpdf303merge' - 3 commits - poppler/SplashOutputDev.cc splash/Splash.cc

[Albert Astals Cid]

 poppler/SplashOutputDev.cc |    2 +-
 splash/Splash.cc           |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit f298e7f844105f2d9a36144e59be86c341e37507
Merge: 2a6bd7a... 0ca5453...
Author: Albert Astals Cid <aacid at kde.org>
Date:   Tue Aug 30 16:21:58 2011 +0200

    Merge branch 'master' into xpdf303merge

commit 0ca5453fea9e5342188f772acd6f31af1778f236
Author: Albert Astals Cid <aacid at kde.org>
Date:   Tue Aug 30 16:20:17 2011 +0200

    Compile when defining USE_FIXEDPOINT

diff --git a/splash/Splash.cc b/splash/Splash.cc
index e5c8096..9deec10 100644
--- a/splash/Splash.cc
+++ b/splash/Splash.cc
@@ -32,6 +32,7 @@
 #include <string.h>
 #include <limits.h>
 #include <assert.h>
+#include <math.h>
 #include "goo/gmem.h"
 #include "goo/GooLikely.h"
 #include "poppler/Error.h"
@@ -3370,8 +3371,8 @@ GBool Splash::gouraudTriangleShadedFill(SplashGouraudColor *shading)
                            xdbl + 1, ydbl + 1, color + 1,
                            xdbl + 2, ydbl + 2, color + 2);
       for (int m = 0; m < 3; ++m) {
-        xt = xdbl[m] * userToCanvasMatrix[0] + ydbl[m] * userToCanvasMatrix[2] + userToCanvasMatrix[4];
-        yt = xdbl[m] * userToCanvasMatrix[1] + ydbl[m] * userToCanvasMatrix[3] + userToCanvasMatrix[5];
+        xt = xdbl[m] * (double)userToCanvasMatrix[0] + ydbl[m] * (double)userToCanvasMatrix[2] + (double)userToCanvasMatrix[4];
+        yt = xdbl[m] * (double)userToCanvasMatrix[1] + ydbl[m] * (double)userToCanvasMatrix[3] + (double)userToCanvasMatrix[5];
         xdbl[m] = xt;
         ydbl[m] = yt;
         // we operate on scanlines which are integer offsets into the
commit bd7a53bc2f27fc3979f8de306e2dcaca53d4570a
Author: Albert Astals Cid <aacid at kde.org>
Date:   Tue Aug 30 16:20:08 2011 +0200

    match function definition

diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc
index 96cb3c4..7bacdba 100644
--- a/poppler/SplashOutputDev.cc
+++ b/poppler/SplashOutputDev.cc
@@ -426,7 +426,7 @@ SplashRadialPattern::~SplashRadialPattern() {
   delete opPattern;
 }
 
-GBool SplashRadialPattern::getParameter(double xs, double ys, SplashCoord *t) {
+GBool SplashRadialPattern::getParameter(double xs, double ys, double *t) {
   double b, c, s0, s1;
 
   // We want to solve this system of equations: