[Libreoffice-commits] core.git: 3 commits - canvas/source configure.ac

[Markus Mohrhard]

 canvas/source/directx/dx_surfacebitmap.cxx |    4 ++--
 configure.ac                               |    7 +------
 2 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 0ea59fd0bb19dafabcfdacf16fcc27f46796df4c
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Aug 13 11:36:52 2014 +0200

    clean configure.ac enable-opengl for windows
    
    It works now and should get the same treatment as the linux version.
    
    Change-Id: I382cc7cae9358ce26e0c2d85acc6a67e991d8118

diff --git a/configure.ac b/configure.ac
index 1c204b6..ff89d60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10487,12 +10487,7 @@ AC_MSG_CHECKING([whether to build the OpenGL Transitions component])
 ENABLE_OPENGL=
 
 if test -z "$enable_opengl"; then
-    if test $_os = WINNT; then
-        # By default disable the OpenGL transitions for Windows (the code compiles but works very
-        # badly and crashes). In other words, use --enable-opengl only if you plan to hack on that
-        # code for Windows.
-        enable_opengl=yes
-    elif test $_os = iOS; then
+    if test $_os = iOS; then
         # As such with some suitable minor tweaks the Mac OpenGL transitions code would presumably
         # build fine for iOS, too, but let's leave that for later
         enable_opengl=no
commit 2f0259d73f78e6a5ec08d2fe4941612a5b9fdb0e
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Aug 13 11:34:48 2014 +0200

    fix invalid memory access in dx bitmap code
    
    Change-Id: If3a495ab2db068f37dcee184e61c0c1e66f09666

diff --git a/canvas/source/directx/dx_surfacebitmap.cxx b/canvas/source/directx/dx_surfacebitmap.cxx
index e61ad20..084361a 100644
--- a/canvas/source/directx/dx_surfacebitmap.cxx
+++ b/canvas/source/directx/dx_surfacebitmap.cxx
@@ -552,7 +552,7 @@ namespace dxcanvas
 
             sal_uInt8 *pSrc = (sal_uInt8 *)((((BYTE *)aSurfaceDesc.lpSurface)+(rect.Y1*aSurfaceDesc.lPitch))+rect.X1);
             sal_uInt8 *pDst = (sal_uInt8 *)aRes.getArray();
-            sal_uInt32 nSegmentSizeInBytes = nWidth<<4;
+            sal_uInt32 nSegmentSizeInBytes = nWidth*4;
             for(sal_uInt32 y=0; y<nHeight; ++y)
             {
                 memcpy(pDst,pSrc,nSegmentSizeInBytes);
@@ -568,7 +568,7 @@ namespace dxcanvas
 
             sal_uInt8 *pSrc = (sal_uInt8 *)((((BYTE *)aLockedRect.pBits)+(rect.Y1*aLockedRect.Pitch))+rect.X1);
             sal_uInt8 *pDst = (sal_uInt8 *)aRes.getArray();
-            sal_uInt32 nSegmentSizeInBytes = nWidth<<4;
+            sal_uInt32 nSegmentSizeInBytes = nWidth*4;
             for(sal_uInt32 y=0; y<nHeight; ++y)
             {
                 memcpy(pDst,pSrc,nSegmentSizeInBytes);
commit 5bad93f5d5f9ace2c8bd0a30acbee51f56bd73e8
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Aug 13 02:15:20 2014 +0200

    enable opengl by default on windows
    
    Change-Id: I04cd67cce88563c0e1d82af984ccd3e6516b69cb

diff --git a/configure.ac b/configure.ac
index 9ae3d24..1c204b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10491,7 +10491,7 @@ if test -z "$enable_opengl"; then
         # By default disable the OpenGL transitions for Windows (the code compiles but works very
         # badly and crashes). In other words, use --enable-opengl only if you plan to hack on that
         # code for Windows.
-        enable_opengl=no
+        enable_opengl=yes
     elif test $_os = iOS; then
         # As such with some suitable minor tweaks the Mac OpenGL transitions code would presumably
         # build fine for iOS, too, but let's leave that for later