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
017fe9c4
Commit
017fe9c4
authored
Jan 23, 2013
by
Dick Hollenbeck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix compiler warnings with gcc 4.6.3 on x86_64 linux
parent
03ffc937
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
5 deletions
+12
-5
class_layer_box_selector.cpp
common/class_layer_box_selector.cpp
+1
-1
class_gbr_layer_box_selector.cpp
gerbview/class_gbr_layer_box_selector.cpp
+5
-3
class_pcb_layer_box_selector.cpp
pcbnew/class_pcb_layer_box_selector.cpp
+4
-1
printout_controler.cpp
pcbnew/printout_controler.cpp
+2
-0
No files found.
common/class_layer_box_selector.cpp
View file @
017fe9c4
...
...
@@ -78,7 +78,7 @@ int LAYER_BOX_SELECTOR::SetLayerSelection( int layer )
for
(
int
i
=
0
;
i
<
elements
;
i
++
)
{
if
(
GetClientData
(
i
)
==
(
void
*
)
layer
)
if
(
GetClientData
(
i
)
==
(
void
*
)
(
intptr_t
)
layer
)
{
if
(
GetSelection
()
!=
i
)
// Element (i) is not selected
{
...
...
gerbview/class_gbr_layer_box_selector.cpp
View file @
017fe9c4
...
...
@@ -48,8 +48,8 @@ void GBR_LAYER_BOX_SELECTOR::Resync()
for
(
int
layerid
=
0
;
layerid
<
LAYER_COUNT
;
layerid
++
)
{
wxBitmap
layerbmp
(
14
,
14
);
wxString
layername
;
wxBitmap
layerbmp
(
14
,
14
);
wxString
layername
;
if
(
!
IsLayerEnabled
(
layerid
)
)
continue
;
...
...
@@ -59,10 +59,11 @@ void GBR_LAYER_BOX_SELECTOR::Resync()
layername
=
GetLayerName
(
layerid
);
Append
(
layername
,
layerbmp
,
(
void
*
)
layerid
);
Append
(
layername
,
layerbmp
,
(
void
*
)
(
intptr_t
)
layerid
);
}
}
// Returns a color index from the layer id
EDA_COLOR_T
GBR_LAYER_BOX_SELECTOR
::
GetLayerColor
(
int
aLayerIndex
)
const
{
...
...
@@ -71,6 +72,7 @@ EDA_COLOR_T GBR_LAYER_BOX_SELECTOR::GetLayerColor( int aLayerIndex ) const
return
frame
->
GetLayerColor
(
aLayerIndex
);
}
// Returns the name of the layer id
wxString
GBR_LAYER_BOX_SELECTOR
::
GetLayerName
(
int
aLayerIndex
)
const
{
...
...
pcbnew/class_pcb_layer_box_selector.cpp
View file @
017fe9c4
...
...
@@ -77,10 +77,11 @@ void PCB_LAYER_BOX_SELECTOR::Resync()
if
(
m_layerhotkeys
&&
m_hotkeys
!=
NULL
)
layername
=
AddHotkeyName
(
layername
,
m_hotkeys
,
layerhk
[
layerid
],
IS_COMMENT
);
Append
(
layername
,
layerbmp
,
(
void
*
)
layerid
);
Append
(
layername
,
layerbmp
,
(
void
*
)
(
intptr_t
)
layerid
);
}
}
// Returns true if the layer id is enabled (i.e. is it should be displayed)
bool
PCB_LAYER_BOX_SELECTOR
::
IsLayerEnabled
(
int
aLayerIndex
)
const
{
...
...
@@ -91,6 +92,7 @@ bool PCB_LAYER_BOX_SELECTOR::IsLayerEnabled( int aLayerIndex ) const
return
board
->
IsLayerEnabled
(
aLayerIndex
);
}
// Returns a color index from the layer id
EDA_COLOR_T
PCB_LAYER_BOX_SELECTOR
::
GetLayerColor
(
int
aLayerIndex
)
const
{
...
...
@@ -101,6 +103,7 @@ EDA_COLOR_T PCB_LAYER_BOX_SELECTOR::GetLayerColor( int aLayerIndex ) const
return
board
->
GetLayerColor
(
aLayerIndex
);
}
// Returns the name of the layer id
wxString
PCB_LAYER_BOX_SELECTOR
::
GetLayerName
(
int
aLayerIndex
)
const
{
...
...
pcbnew/printout_controler.cpp
View file @
017fe9c4
...
...
@@ -319,6 +319,7 @@ void BOARD_PRINTOUT_CONTROLLER::DrawPage()
wxLogTrace
(
tracePrinting
,
wxT
(
"Logical origin: x=%d, y=%d"
),
offset
.
x
,
offset
.
y
);
#if defined(DEBUG)
wxRect
paperRect
=
GetPaperRectPixels
();
wxLogTrace
(
tracePrinting
,
wxT
(
"Paper rectangle: left=%d, top=%d, "
"right=%d, bottom=%d"
),
...
...
@@ -332,6 +333,7 @@ void BOARD_PRINTOUT_CONTROLLER::DrawPage()
wxLogTrace
(
tracePrinting
,
wxT
(
"Final device rectangle: left=%d, top=%d, "
"right=%d, bottom=%d
\n
"
),
devLeft
,
devTop
,
devRight
,
devBottom
);
#endif
g_DrawBgColor
=
WHITE
;
...
...
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