[Libreoffice-commits] core.git: vcl/source

[Jan-Marek Glogowski]

 vcl/source/bitmap/bitmapscalesuper.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 3787547a71a533877be0ec2081d50390769ed97f
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date:   Thu Mar 12 20:28:29 2015 +0100

    Another "ancient compiler fix"
    
    AKA fix Ubuntu Precise build...
    
    gcc 4.6 isn't able to copy a non-static reference, so convert the
    reference to a pointer.
    
    Change-Id: I222f32f59d44995eb45ccd6eb2dd5f65103b2ce8

diff --git a/vcl/source/bitmap/bitmapscalesuper.cxx 
b/vcl/source/bitmap/bitmapscalesuper.cxx
index b2b8fba..116b233 100644
--- a/vcl/source/bitmap/bitmapscalesuper.cxx
+++ b/vcl/source/bitmap/bitmapscalesuper.cxx
@@ -75,9 +75,9 @@ struct ScaleContext {
 
 #define SCALE_THREAD_STRIP 32
 struct ScaleRangeContext {
-    ScaleContext &mrCtx;
+    ScaleContext *mrCtx;
     long mnStartY, mnEndY;
-    ScaleRangeContext( ScaleContext &rCtx, long nStartY )
+    ScaleRangeContext( ScaleContext *rCtx, long nStartY )
         : mrCtx( rCtx ), mnStartY( nStartY ),
           mnEndY( nStartY + SCALE_THREAD_STRIP ) {}
 };
@@ -95,7 +95,7 @@ public:
     {
         std::vector< ScaleRangeContext >::iterator it;
         for (it = maStrips.begin(); it != maStrips.end(); ++it)
-            mpFn( it->mrCtx, it->mnStartY, it->mnEndY );
+            mpFn( *(it->mrCtx), it->mnStartY, it->mnEndY );
     }
 };
 
@@ -1011,7 +1011,7 @@ bool BitmapScaleSuper::filter(Bitmap& rBitmap)
                 ScaleTask *pTask = new ScaleTask( pScaleRangeFn );
                 for ( sal_uInt32 j = 0; j < nStripsPerThread; j++ )
                 {
-                    ScaleRangeContext aRC( aContext, nStripY );
+                    ScaleRangeContext aRC( &aContext, nStripY );
                     pTask->push( aRC );
                     nStripY += SCALE_THREAD_STRIP;
                 }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits