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
28222961
Commit
28222961
authored
Oct 24, 2012
by
Dick Hollenbeck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix ownership issue in wxFFile vs. FILE_LINE_READER
parent
5634bc33
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
38 additions
and
38 deletions
+38
-38
dialog_select_one_pcb_layer.cpp
gerbview/dialogs/dialog_select_one_pcb_layer.cpp
+30
-30
kicad_plugin.cpp
pcbnew/kicad_plugin.cpp
+8
-8
No files found.
gerbview/dialogs/dialog_select_one_pcb_layer.cpp
View file @
28222961
pcbnew/kicad_plugin.cpp
View file @
28222961
...
@@ -983,7 +983,7 @@ void PCB_IO::format( MODULE* aModule, int aNestLevel ) const
...
@@ -983,7 +983,7 @@ void PCB_IO::format( MODULE* aModule, int aNestLevel ) const
void
PCB_IO
::
format
(
D_PAD
*
aPad
,
int
aNestLevel
)
const
void
PCB_IO
::
format
(
D_PAD
*
aPad
,
int
aNestLevel
)
const
throw
(
IO_ERROR
)
throw
(
IO_ERROR
)
{
{
std
::
string
shape
;
const
char
*
shape
;
switch
(
aPad
->
GetShape
()
)
switch
(
aPad
->
GetShape
()
)
{
{
...
@@ -996,7 +996,7 @@ void PCB_IO::format( D_PAD* aPad, int aNestLevel ) const
...
@@ -996,7 +996,7 @@ void PCB_IO::format( D_PAD* aPad, int aNestLevel ) const
THROW_IO_ERROR
(
wxString
::
Format
(
_
(
"unknown pad type: %d"
),
aPad
->
GetShape
()
)
);
THROW_IO_ERROR
(
wxString
::
Format
(
_
(
"unknown pad type: %d"
),
aPad
->
GetShape
()
)
);
}
}
std
::
string
type
;
const
char
*
type
;
switch
(
aPad
->
GetAttribute
()
)
switch
(
aPad
->
GetAttribute
()
)
{
{
...
@@ -1012,7 +1012,7 @@ void PCB_IO::format( D_PAD* aPad, int aNestLevel ) const
...
@@ -1012,7 +1012,7 @@ void PCB_IO::format( D_PAD* aPad, int aNestLevel ) const
m_out
->
Print
(
aNestLevel
,
"(pad %s %s %s"
,
m_out
->
Print
(
aNestLevel
,
"(pad %s %s %s"
,
m_out
->
Quotew
(
aPad
->
GetPadName
()
).
c_str
(),
m_out
->
Quotew
(
aPad
->
GetPadName
()
).
c_str
(),
type
.
c_str
(),
shape
.
c_str
()
);
type
,
shape
);
m_out
->
Print
(
0
,
" (at %s"
,
FMT_IU
(
aPad
->
GetPos0
()
).
c_str
()
);
m_out
->
Print
(
0
,
" (at %s"
,
FMT_IU
(
aPad
->
GetPos0
()
).
c_str
()
);
if
(
aPad
->
GetOrientation
()
!=
0.0
)
if
(
aPad
->
GetOrientation
()
!=
0.0
)
...
@@ -1502,7 +1502,7 @@ BOARD* PCB_IO::Load( const wxString& aFileName, BOARD* aAppendToMe, PROPERTIES*
...
@@ -1502,7 +1502,7 @@ BOARD* PCB_IO::Load( const wxString& aFileName, BOARD* aAppendToMe, PROPERTIES*
THROW_IO_ERROR
(
msg
);
THROW_IO_ERROR
(
msg
);
}
}
FILE_LINE_READER
reader
(
file
.
fp
(),
aFileName
);
FILE_LINE_READER
reader
(
file
.
fp
(),
aFileName
,
false
/* wxFFile owns fp */
);
m_parser
->
SetLineReader
(
&
reader
);
m_parser
->
SetLineReader
(
&
reader
);
m_parser
->
SetBoard
(
aAppendToMe
);
m_parser
->
SetBoard
(
aAppendToMe
);
...
...
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