[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - 2 commits - chart2/source

[Markus Mohrhard]

 chart2/source/view/main/DummyXShape.cxx  |    2 +-
 chart2/source/view/main/OpenGLRender.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fca1d65652e455dee8b3fcd163624ea74163b061
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Sun Dec 29 05:17:28 2013 +0100

    try to improve the rendering
    
    Change-Id: I873e56c28228e24c9d26419a013f358548873931

diff --git a/chart2/source/view/main/DummyXShape.cxx 
b/chart2/source/view/main/DummyXShape.cxx
index 261604c..4e4b3dc 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -953,7 +953,7 @@ void DummyChart::setSize( const awt::Size& aSize )
     tempSize.Height = height;
     mpWindow->SetSizePixel(Size(width, height));
     pWindow->SetSizePixel(Size(width, height));
-    DummyXShape::setSize(tempSize);
+    DummyXShape::setSize(Size(0,0));
     m_GLRender.SetWidth(width);
     m_GLRender.SetHeight(height);
     SAL_WARN("chart2.opengl", "DummyChart::GLRender.Width = " << width << ", 
GLRender.Height = " << height);
commit 633170623a616b028c0ba010e0705d17ac8bb064
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Sun Dec 29 05:16:17 2013 +0100

    fix warnings
    
    Change-Id: I3e45922aa6bc2bbd1db99025a5dde9670247501b

diff --git a/chart2/source/view/main/OpenGLRender.cxx 
b/chart2/source/view/main/OpenGLRender.cxx
index d4de633..c54ef8c 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -661,12 +661,12 @@ int OpenGLRender::RenderLine2FBO(int wholeFlag)
     Bitmap::ScopedWriteAccess pAlphaWriteAccess( aAlpha );
 
     size_t nCurPos = 0;
-    for( size_t y = 0; y < m_iHeight; ++y)
+    for( size_t y = 0; y < size_t(m_iHeight); ++y)
     {
         Scanline pScan = pWriteAccess->GetScanline(y);
         Scanline pAlphaScan = pAlphaWriteAccess->GetScanline(y);
 
-        for( size_t x = 0; x < m_iWidth; ++x )
+        for( size_t x = 0; x < size_t(m_iWidth); ++x )
         {
             *pScan++ = buf[nCurPos];
             *pScan++ = buf[nCurPos+1];
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits