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
a8a35132
Commit
a8a35132
authored
Jun 20, 2008
by
kajtek1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed compiler warnings
parent
e5b61eb4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
14 deletions
+14
-14
zones_test_and_combine_areas.cpp
pcbnew/zones_test_and_combine_areas.cpp
+4
-4
PolyLine.cpp
polygon/PolyLine.cpp
+10
-10
No files found.
pcbnew/zones_test_and_combine_areas.cpp
View file @
a8a35132
...
@@ -719,8 +719,8 @@ int BOARD::CombineAreas( ZONE_CONTAINER* area_ref, ZONE_CONTAINER* area_to_combi
...
@@ -719,8 +719,8 @@ int BOARD::CombineAreas( ZONE_CONTAINER* area_ref, ZONE_CONTAINER* area_to_combi
bool
first
=
true
;
bool
first
=
true
;
while
(
booleng
->
PolygonHasMorePoints
()
)
while
(
booleng
->
PolygonHasMorePoints
()
)
{
{
int
x
=
booleng
->
GetPolygonXPoint
();
int
x
=
(
int
)
booleng
->
GetPolygonXPoint
();
int
y
=
booleng
->
GetPolygonYPoint
();
int
y
=
(
int
)
booleng
->
GetPolygonYPoint
();
if
(
first
)
if
(
first
)
{
{
first
=
false
;
first
=
false
;
...
@@ -779,8 +779,8 @@ int BOARD::CombineAreas( ZONE_CONTAINER* area_ref, ZONE_CONTAINER* area_to_combi
...
@@ -779,8 +779,8 @@ int BOARD::CombineAreas( ZONE_CONTAINER* area_ref, ZONE_CONTAINER* area_to_combi
}
}
while
(
booleng
->
PolygonHasMorePoints
()
)
while
(
booleng
->
PolygonHasMorePoints
()
)
{
{
int
x
=
booleng
->
GetPolygonXPoint
();
int
x
=
(
int
)
booleng
->
GetPolygonXPoint
();
int
y
=
booleng
->
GetPolygonYPoint
();
int
y
=
(
int
)
booleng
->
GetPolygonYPoint
();
area_ref
->
m_Poly
->
AppendCorner
(
x
,
y
);
area_ref
->
m_Poly
->
AppendCorner
(
x
,
y
);
}
}
...
...
polygon/PolyLine.cpp
View file @
a8a35132
...
@@ -83,8 +83,8 @@ int CPolyLine::NormalizeWithKbool( std::vector<CPolyLine*> * aExtraPolyList, boo
...
@@ -83,8 +83,8 @@ int CPolyLine::NormalizeWithKbool( std::vector<CPolyLine*> * aExtraPolyList, boo
hole_array
.
push_back
(
hole
);
hole_array
.
push_back
(
hole
);
while
(
m_Kbool_Poly_Engine
->
PolygonHasMorePoints
()
)
// store hole
while
(
m_Kbool_Poly_Engine
->
PolygonHasMorePoints
()
)
// store hole
{
{
int
x
=
m_Kbool_Poly_Engine
->
GetPolygonXPoint
();
int
x
=
(
int
)
m_Kbool_Poly_Engine
->
GetPolygonXPoint
();
int
y
=
m_Kbool_Poly_Engine
->
GetPolygonYPoint
();
int
y
=
(
int
)
m_Kbool_Poly_Engine
->
GetPolygonYPoint
();
hole
->
push_back
(
x
);
hole
->
push_back
(
x
);
hole
->
push_back
(
y
);
hole
->
push_back
(
y
);
}
}
...
@@ -99,8 +99,8 @@ int CPolyLine::NormalizeWithKbool( std::vector<CPolyLine*> * aExtraPolyList, boo
...
@@ -99,8 +99,8 @@ int CPolyLine::NormalizeWithKbool( std::vector<CPolyLine*> * aExtraPolyList, boo
bool
first
=
true
;
bool
first
=
true
;
while
(
m_Kbool_Poly_Engine
->
PolygonHasMorePoints
()
)
while
(
m_Kbool_Poly_Engine
->
PolygonHasMorePoints
()
)
{
// foreach point in the polygon
{
// foreach point in the polygon
int
x
=
m_Kbool_Poly_Engine
->
GetPolygonXPoint
();
int
x
=
(
int
)
m_Kbool_Poly_Engine
->
GetPolygonXPoint
();
int
y
=
m_Kbool_Poly_Engine
->
GetPolygonYPoint
();
int
y
=
(
int
)
m_Kbool_Poly_Engine
->
GetPolygonYPoint
();
if
(
first
)
if
(
first
)
{
{
first
=
false
;
first
=
false
;
...
@@ -121,8 +121,8 @@ int CPolyLine::NormalizeWithKbool( std::vector<CPolyLine*> * aExtraPolyList, boo
...
@@ -121,8 +121,8 @@ int CPolyLine::NormalizeWithKbool( std::vector<CPolyLine*> * aExtraPolyList, boo
bool
first
=
true
;
bool
first
=
true
;
while
(
m_Kbool_Poly_Engine
->
PolygonHasMorePoints
()
)
// read next external contour
while
(
m_Kbool_Poly_Engine
->
PolygonHasMorePoints
()
)
// read next external contour
{
{
int
x
=
m_Kbool_Poly_Engine
->
GetPolygonXPoint
();
int
x
=
(
int
)
m_Kbool_Poly_Engine
->
GetPolygonXPoint
();
int
y
=
m_Kbool_Poly_Engine
->
GetPolygonYPoint
();
int
y
=
(
int
)
m_Kbool_Poly_Engine
->
GetPolygonYPoint
();
if
(
first
)
if
(
first
)
{
{
first
=
false
;
first
=
false
;
...
@@ -225,8 +225,8 @@ int CPolyLine::AddPolygonsToBoolEng( Bool_Engine* aBooleng,
...
@@ -225,8 +225,8 @@ int CPolyLine::AddPolygonsToBoolEng( Bool_Engine* aBooleng,
{
{
while
(
m_Kbool_Poly_Engine
->
PolygonHasMorePoints
()
)
while
(
m_Kbool_Poly_Engine
->
PolygonHasMorePoints
()
)
{
{
int
x
=
m_Kbool_Poly_Engine
->
GetPolygonXPoint
();
int
x
=
(
int
)
m_Kbool_Poly_Engine
->
GetPolygonXPoint
();
int
y
=
m_Kbool_Poly_Engine
->
GetPolygonYPoint
();
int
y
=
(
int
)
m_Kbool_Poly_Engine
->
GetPolygonYPoint
();
aBooleng
->
AddPoint
(
x
,
y
);
aBooleng
->
AddPoint
(
x
,
y
);
count
++
;
count
++
;
}
}
...
@@ -293,8 +293,8 @@ int CPolyLine::MakeKboolPoly( int aStart_contour, int aEnd_contour, std::vector<
...
@@ -293,8 +293,8 @@ int CPolyLine::MakeKboolPoly( int aStart_contour, int aEnd_contour, std::vector<
{
{
while
(
m_Kbool_Poly_Engine
->
PolygonHasMorePoints
()
)
while
(
m_Kbool_Poly_Engine
->
PolygonHasMorePoints
()
)
{
{
int
x
=
m_Kbool_Poly_Engine
->
GetPolygonXPoint
();
int
x
=
(
int
)
m_Kbool_Poly_Engine
->
GetPolygonXPoint
();
int
y
=
m_Kbool_Poly_Engine
->
GetPolygonYPoint
();
int
y
=
(
int
)
m_Kbool_Poly_Engine
->
GetPolygonYPoint
();
booleng
->
AddPoint
(
x
,
y
);
booleng
->
AddPoint
(
x
,
y
);
}
}
...
...
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