[Libreoffice-commits] core.git: Branch 'feature/opengl-mac-fixes' - 2 commits - chart2/opengl chart2/source

[Markus Mohrhard]

 chart2/opengl/README.deprecated                |   15 +++++++++++++++
 chart2/source/view/charttypes/GL3DBarChart.cxx |    3 +++
 2 files changed, 18 insertions(+)

New commits:
commit 11af6d3f04d069c06f519960162122687080ac68
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Aug 15 10:48:24 2014 +0200

    add a note about deprecated functionality
    
    Change-Id: Ic980e633f7c9cdcbb3a1b512d66bfd8279d16339

diff --git a/chart2/opengl/README.deprecated b/chart2/opengl/README.deprecated
new file mode 100644
index 0000000..a13de9a
--- /dev/null
+++ b/chart2/opengl/README.deprecated
@@ -0,0 +1,15 @@
+deprecated features
+
+GL_LIGHTING
+GL_TEXTURE_2D
+GL_POINT_SMOOTH
+GL_TEXTURE_WRAP_S
+GL_TEXTURE_WRAP_T
+
+
+GLSL
+
+texture*D
+varying
+attribute
+missing version string
commit 71e42eaeae93803d4f4f33df2d2eb3a3101062c3
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Aug 15 10:47:18 2014 +0200

    don't even try to create a shape for non existing values
    
    Change-Id: I0af9285c2fa0371607e9ec750bb07968244c44d8

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 0299b92..6359dc6 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -538,6 +538,9 @@ void GL3DBarChart::create3DShapes(const boost::ptr_vector<VDataSeries>& rDataSer
             }
 
             float nVal = rDataSeries.getYValue(nIndex);
+            if (rtl::math::isNan(nVal))
+                continue;
+
             float nXPos = nIndex * (BAR_SIZE_X + BAR_DISTANCE_X) + BAR_DISTANCE_X;
 
             glm::mat4 aScaleMatrix = glm::scale(glm::vec3(BAR_SIZE_X, BAR_SIZE_Y, float(nVal/nMaxVal)));