songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SEGFAULT Fix 

- corrected a pointer's issue.
This commit is contained in:
Maxime Gimeno 2015-07-29 09:10:26 +02:00
parent 8be7c27063
commit ed4663ace5
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Mesh_3/demo/Mesh_3/Scene_c3t3_item.cpp
View File

@ -184,7 +184,7 @@ void Scene_c3t3_item::compute_elements()
normal.resize(0);
color_triangles.resize(0);
draw_grid((float)complex_diag(this),v_grid);
draw_grid((float)complex_diag(this),&v_grid);
if(isEmpty())
return;
@ -542,7 +542,7 @@ void Scene_c3t3_item::initialize_buffers() const
vao[1].bind();
buffers[3].bind();
buffers[3].allocate(v_grid->data(), static_cast<int>(v_grid->size()*sizeof(float)));
buffers[3].allocate(v_grid.data(), static_cast<int>(v_grid.size()*sizeof(float)));
poly_vertexLocation[1] = rendering_program.attributeLocation("vertex");
rendering_program.enableAttributeArray(poly_vertexLocation[1]);
rendering_program.setAttributeBuffer(poly_vertexLocation[1],GL_FLOAT,0,3);
@ -673,7 +673,7 @@ Scene_c3t3_item::draw_edges(QGLViewer* viewer) const {
QColor color;
color.setRgbF(this->color().redF(), this->color().greenF(), this->color().blueF());
rendering_program_grid.setUniformValue(colorLocation[1], color);
gl.glDrawArrays(GL_LINES, 0, static_cast<GLsizei>(v_grid->size()/3));
gl.glDrawArrays(GL_LINES, 0, static_cast<GLsizei>(v_grid.size()/3));
rendering_program_grid.release();
vao[1].release();
}
@ -693,7 +693,6 @@ Scene_c3t3_item()
, data_item_(NULL)
, indices_()
{
v_grid = new std::vector<float>();
compile_shaders();
connect(frame, SIGNAL(modified()), this, SLOT(changed()));
c3t3_changed();

2
Mesh_3/demo/Mesh_3/Scene_c3t3_item.h
View File

@ -120,7 +120,7 @@ private:
std::vector<float> v_poly;
std::vector<float> normal;
std::vector<float> color_triangles;
std::vector<float> *v_grid;
std::vector<float> v_grid;