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
be012cac
Commit
be012cac
authored
Jul 29, 2013
by
Maciej Suminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added initialization of variable, preventing unconditional jumps. Fixed typos in comments.
parent
ee1b8e2a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
5 deletions
+6
-5
gpu_manager.cpp
common/gal/opengl/gpu_manager.cpp
+1
-1
stroke_font.cpp
common/gal/stroke_font.cpp
+2
-2
view.cpp
common/view/view.cpp
+2
-0
gpu_manager.h
include/gal/opengl/gpu_manager.h
+0
-1
class_pad.cpp
pcbnew/class_pad.cpp
+1
-1
No files found.
common/gal/opengl/gpu_manager.cpp
View file @
be012cac
...
@@ -52,7 +52,7 @@ GPU_MANAGER* GPU_MANAGER::MakeManager( VERTEX_CONTAINER* aContainer )
...
@@ -52,7 +52,7 @@ GPU_MANAGER* GPU_MANAGER::MakeManager( VERTEX_CONTAINER* aContainer )
GPU_MANAGER
::
GPU_MANAGER
(
VERTEX_CONTAINER
*
aContainer
)
:
GPU_MANAGER
::
GPU_MANAGER
(
VERTEX_CONTAINER
*
aContainer
)
:
m_container
(
aContainer
),
m_shader
(
NULL
)
m_isDrawing
(
false
),
m_container
(
aContainer
),
m_shader
(
NULL
)
{
{
}
}
...
...
common/gal/stroke_font.cpp
View file @
be012cac
...
@@ -167,7 +167,7 @@ void STROKE_FONT::Draw( std::string aText, const VECTOR2D& aPosition, double aRo
...
@@ -167,7 +167,7 @@ void STROKE_FONT::Draw( std::string aText, const VECTOR2D& aPosition, double aRo
switch
(
m_horizontalJustify
)
switch
(
m_horizontalJustify
)
{
{
case
GR_TEXT_HJUSTIFY_CENTER
:
case
GR_TEXT_HJUSTIFY_CENTER
:
m_gal
->
Translate
(
VECTOR2D
(
-
textsize
.
x
/
2
,
0
)
);
m_gal
->
Translate
(
VECTOR2D
(
-
textsize
.
x
/
2
.0
,
0
)
);
break
;
break
;
case
GR_TEXT_HJUSTIFY_RIGHT
:
case
GR_TEXT_HJUSTIFY_RIGHT
:
...
@@ -187,7 +187,7 @@ void STROKE_FONT::Draw( std::string aText, const VECTOR2D& aPosition, double aRo
...
@@ -187,7 +187,7 @@ void STROKE_FONT::Draw( std::string aText, const VECTOR2D& aPosition, double aRo
switch
(
m_verticalJustify
)
switch
(
m_verticalJustify
)
{
{
case
GR_TEXT_VJUSTIFY_CENTER
:
case
GR_TEXT_VJUSTIFY_CENTER
:
m_gal
->
Translate
(
VECTOR2D
(
0
,
textsize
.
y
/
2
)
);
m_gal
->
Translate
(
VECTOR2D
(
0
,
textsize
.
y
/
2
.0
)
);
break
;
break
;
case
GR_TEXT_VJUSTIFY_TOP
:
case
GR_TEXT_VJUSTIFY_TOP
:
...
...
common/view/view.cpp
View file @
be012cac
...
@@ -474,6 +474,8 @@ struct VIEW::drawItem
...
@@ -474,6 +474,8 @@ struct VIEW::drawItem
{
{
GAL
*
gal
=
view
->
GetGAL
();
GAL
*
gal
=
view
->
GetGAL
();
// Obtain layers that are required to be enabled for drawing an item
// (eg. there is no point in drawing track labels, if the track is not visible)
aItem
->
ViewGetRequiredLayers
(
layers
,
layersCount
);
aItem
->
ViewGetRequiredLayers
(
layers
,
layersCount
);
// Conditions that have te be fulfilled for an item to be drawn
// Conditions that have te be fulfilled for an item to be drawn
...
...
include/gal/opengl/gpu_manager.h
View file @
be012cac
...
@@ -47,7 +47,6 @@ public:
...
@@ -47,7 +47,6 @@ public:
virtual
~
GPU_MANAGER
();
virtual
~
GPU_MANAGER
();
// TODO docs
/**
/**
* @brief Initializes everything needed to use vertex buffer objects (should be called when
* @brief Initializes everything needed to use vertex buffer objects (should be called when
* there is an OpenGL context available).
* there is an OpenGL context available).
...
...
pcbnew/class_pad.cpp
View file @
be012cac
...
@@ -793,7 +793,7 @@ void D_PAD::ViewGetRequiredLayers( int aLayers[], int& aCount ) const
...
@@ -793,7 +793,7 @@ void D_PAD::ViewGetRequiredLayers( int aLayers[], int& aCount ) const
}
}
else
else
{
{
// Rest
o
of pads have one soldermask layer and one description layer
// Rest of pads have one soldermask layer and one description layer
aCount
-=
2
;
aCount
-=
2
;
}
}
}
}
...
...
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