[poppler] 2 commits - splash/Splash.cc

[Albert Astals Cid]

 splash/Splash.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 998a9e7c982a72b0e931304b719de40f30094d12
Merge: 5e73cb0 73d09cd
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon May 13 19:30:26 2013 +0200

    Merge remote-tracking branch 'origin/poppler-0.22'
    
    Conflicts:
    	splash/Splash.cc

diff --cc splash/Splash.cc
index 1f100fe,0a2b212..fd618cd
--- a/splash/Splash.cc
+++ b/splash/Splash.cc
@@@ -1494,7 -1494,7 +1494,7 @@@ inline void Splash::drawAALine(SplashPi
  #endif
  
      if (t != 0) {
-       pipe->shape = (adjustLine) ? div255((int) lineOpacity * aaGamma[t]) : aaGamma[t];
 -      pipe->shape = (double)aaGamma[t];
++      pipe->shape = (adjustLine) ? div255((int) lineOpacity * (double)aaGamma[t]) : (double)aaGamma[t];
        (this->*pipe->run)(pipe);
        updateModX(x);
        updateModY(y);
commit 73d09cd55f3bd307450c2dd095e039ea39c69cea
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon May 13 19:28:40 2013 +0200

    Fix compilation with fixed point mode enabled
    
    Thanks to Andreas Müller for the tip

diff --git a/splash/Splash.cc b/splash/Splash.cc
index cd0ec72..0a2b212 100644
--- a/splash/Splash.cc
+++ b/splash/Splash.cc
@@ -1494,7 +1494,7 @@ inline void Splash::drawAALine(SplashPipe *pipe, int x0, int x1, int y) {
 #endif
 
     if (t != 0) {
-      pipe->shape = aaGamma[t];
+      pipe->shape = (double)aaGamma[t];
       (this->*pipe->run)(pipe);
       updateModX(x);
       updateModY(y);