Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
c4edb215
Commit
c4edb215
authored
Jul 20, 2009
by
charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Try to fix some issues (OSX crashes and build and seg fault under linux)
parent
4c001cd4
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
3 deletions
+19
-3
3d_canvas.cpp
3d-viewer/3d_canvas.cpp
+10
-0
3d_draw.cpp
3d-viewer/3d_draw.cpp
+4
-0
3d_viewer.h
3d-viewer/3d_viewer.h
+2
-0
class_netlist_object.cpp
eeschema/class_netlist_object.cpp
+3
-2
netlist.cpp
eeschema/netlist.cpp
+0
-1
No files found.
3d-viewer/3d_canvas.cpp
View file @
c4edb215
...
...
@@ -63,18 +63,26 @@ END_EVENT_TABLE()
/*************************************************************************/
Pcb3D_GLCanvas
::
Pcb3D_GLCanvas
(
WinEDA3D_DrawFrame
*
parent
)
:
#if wxCHECK_VERSION( 2, 9, 0 )
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_gllist
=
0
;
m_Parent
=
parent
;
#if wxCHECK_VERSION( 2, 9, 0 )
// Explicitly create a new rendering context instance for this canvas.
m_glRC
=
new
wxGLContext
(
this
);
// Make the new context current (activate it for use) with this canvas.
SetCurrent
(
*
m_glRC
);
#else
SetCurrent
(
NULL
);
#endif
DisplayStatus
();
}
...
...
@@ -85,7 +93,9 @@ Pcb3D_GLCanvas::~Pcb3D_GLCanvas()
{
ClearLists
();
m_init
=
FALSE
;
#if wxCHECK_VERSION( 2, 9, 0 )
delete
m_glRC
;
#endif
}
...
...
3d-viewer/3d_draw.cpp
View file @
c4edb215
...
...
@@ -46,7 +46,11 @@ static GLfloat Get3DLayerSide( int act_layer );
void
Pcb3D_GLCanvas
::
Redraw
(
bool
finish
)
/******************************************/
{
#if wxCHECK_VERSION( 2, 9, 0 )
SetCurrent
(
*
m_glRC
);
#else
SetCurrent
(
NULL
);
#endif
InitGL
();
glMatrixMode
(
GL_MODELVIEW
);
/* position viewer */
...
...
3d-viewer/3d_viewer.h
View file @
c4edb215
...
...
@@ -79,7 +79,9 @@ public:
private
:
bool
m_init
;
GLuint
m_gllist
;
#if wxCHECK_VERSION( 2, 9, 0 )
wxGLContext
*
m_glRC
;
#endif
public
:
Pcb3D_GLCanvas
(
WinEDA3D_DrawFrame
*
parent
);
...
...
eeschema/class_netlist_object.cpp
View file @
c4edb215
...
...
@@ -119,13 +119,14 @@ NETLIST_OBJECT::NETLIST_OBJECT()
m_Label
=
0
;
/* For all labels:pointer on the text label */
}
// Copy constructor
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 is owner of m_Label only if its type is
...
...
eeschema/netlist.cpp
View file @
c4edb215
...
...
@@ -740,7 +740,6 @@ static int ConvertBusToMembers( NETLIST_OBJECT_LIST& aNetItemBuffer,
{
NETLIST_OBJECT
*
new_label
=
new
NETLIST_OBJECT
(
BusLabel
);
NumItem
++
;
/* Convertion du BusLabel en la racine du Label + le numero du fil */
BufLine
=
BusLabel
.
m_Label
->
Left
(
RootBusNameLength
);
BufLine
<<
BusMember
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment