Commit c4edb215 authored by charras's avatar charras
Browse files

Try to fix some issues (OSX crashes and build and seg fault under linux)

parent 4c001cd4

3d-viewer/3d_canvas.cpp

+10 −0
Original line number Original line Diff line number Diff line
@@ -63,18 +63,26 @@ END_EVENT_TABLE() 




/*************************************************************************/

/*************************************************************************/

Pcb3D_GLCanvas::Pcb3D_GLCanvas( WinEDA3D_DrawFrame* parent ) :

Pcb3D_GLCanvas::Pcb3D_GLCanvas( WinEDA3D_DrawFrame* parent ) :

#if wxCHECK_VERSION( 2, 9, 0 )

    wxGLCanvas( parent, -1, NULL, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE )

    wxGLCanvas( parent, -1, NULL, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE )

#else

    wxGLCanvas( parent, -1, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE )

#endif

/*************************************************************************/

/*************************************************************************/

{

{

    m_init   = FALSE;

    m_init   = FALSE;

    m_gllist = 0;

    m_gllist = 0;

    m_Parent = parent;

    m_Parent = parent;





#if wxCHECK_VERSION( 2, 9, 0 )

    // Explicitly create a new rendering context instance for this canvas.

    // Explicitly create a new rendering context instance for this canvas.

    m_glRC = new wxGLContext(this);

    m_glRC = new wxGLContext(this);





    // Make the new context current (activate it for use) with this canvas.

    // Make the new context current (activate it for use) with this canvas.

    SetCurrent(*m_glRC);

    SetCurrent(*m_glRC);

#else

    SetCurrent(NULL);

#endif

    DisplayStatus();

    DisplayStatus();

}

}
@@ -85,7 +93,9 @@ Pcb3D_GLCanvas::~Pcb3D_GLCanvas() 
{

{

    ClearLists();

    ClearLists();

    m_init = FALSE;

    m_init = FALSE;

#if wxCHECK_VERSION( 2, 9, 0 )

    delete m_glRC;

    delete m_glRC;

#endif

}

}

3d-viewer/3d_draw.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -46,7 +46,11 @@ static GLfloat Get3DLayerSide( int act_layer ); 
void Pcb3D_GLCanvas::Redraw( bool finish )

void Pcb3D_GLCanvas::Redraw( bool finish )

/******************************************/

/******************************************/

{

{

#if wxCHECK_VERSION( 2, 9, 0 )

    SetCurrent(*m_glRC);

    SetCurrent(*m_glRC);

#else

    SetCurrent(NULL);

#endif

    InitGL();

    InitGL();





    glMatrixMode( GL_MODELVIEW );    /* position viewer */

    glMatrixMode( GL_MODELVIEW );    /* position viewer */

3d-viewer/3d_viewer.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -79,7 +79,9 @@ public: 
private:

private:

    bool   m_init;

    bool   m_init;

    GLuint m_gllist;

    GLuint m_gllist;

#if wxCHECK_VERSION( 2, 9, 0 )

    wxGLContext* m_glRC;

    wxGLContext* m_glRC;

#endif





public:

public:

    Pcb3D_GLCanvas( WinEDA3D_DrawFrame *parent );

    Pcb3D_GLCanvas( WinEDA3D_DrawFrame *parent );

eeschema/class_netlist_object.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -119,13 +119,14 @@ NETLIST_OBJECT::NETLIST_OBJECT() 
    m_Label  = 0;                   /* For all labels:pointer on the text label */

    m_Label  = 0;                   /* For all labels:pointer on the text label */

}

}







// Copy constructor

// Copy constructor

NETLIST_OBJECT::NETLIST_OBJECT( NETLIST_OBJECT& aSource )

NETLIST_OBJECT::NETLIST_OBJECT( NETLIST_OBJECT& aSource )

{

{

    *this = aSource;

    m_Label  = NULL;        // set to null because some items are owner, so the delete operator can create problems

                            // if this member is copied here (if 2 different items are owner of the same object)

}

}







NETLIST_OBJECT::~NETLIST_OBJECT()

NETLIST_OBJECT::~NETLIST_OBJECT()

{

{

    /* NETLIST_OBJECT is owner of m_Label only if its type is

    /* NETLIST_OBJECT is owner of m_Label only if its type is

eeschema/netlist.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -740,7 +740,6 @@ static int ConvertBusToMembers( NETLIST_OBJECT_LIST& aNetItemBuffer, 
    {

    {

        NETLIST_OBJECT* new_label = new NETLIST_OBJECT( BusLabel );

        NETLIST_OBJECT* new_label = new NETLIST_OBJECT( BusLabel );

        NumItem++;

        NumItem++;



        /* Convertion du BusLabel en la racine du Label + le numero du fil */

        /* Convertion du BusLabel en la racine du Label + le numero du fil */

        BufLine = BusLabel.m_Label->Left( RootBusNameLength );

        BufLine = BusLabel.m_Label->Left( RootBusNameLength );

        BufLine << BusMember;

        BufLine << BusMember;