Merge pull request #1665 from Karry/opengl-fixes

Opengl fixes

Author: Framstag

libosmscout-map-opengl/include/osmscoutmapopengl/OpenGLMapData.h

@@ -105,12 +105,12 @@ namespace osmscout {
 
     void LoadVBO() {
       glBindBuffer(GL_ARRAY_BUFFER, vbo);
-      glBufferData(GL_ARRAY_BUFFER, sizeof(GLfloat) * vertices.size(), &vertices[0], GL_DYNAMIC_DRAW);
+      glBufferData(GL_ARRAY_BUFFER, sizeof(GLfloat) * vertices.size(), vertices.data(), GL_DYNAMIC_DRAW);
     }
 
     void LoadEBO() {
       glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ebo);
-      glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(GLfloat) * elements.size(), &elements[0], GL_DYNAMIC_DRAW);
+      glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(GLfloat) * elements.size(), elements.data(), GL_DYNAMIC_DRAW);
     }
 
   public:

libosmscout-map-opengl/src/osmscoutmapopengl/MapPainterOpenGL.cpp

@@ -247,6 +247,9 @@ namespace osmscout {
               if (fabs(p[i].GetLat() - p[j].GetLat()) < 0.000000001 &&
                   fabs(p[i].GetLon() - p[j].GetLon()) < 0.0000000001) {
                 p.erase(p.begin() + i);
+                if (i == p.size()) { // i was the last element
+                  break;
+                }
               }
             }
           }