haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix my previous commit: I committed the wrong file

This commit is contained in:
jean-pierre charras 2016-05-28 21:51:35 +02:00
parent b7f863dc4c
commit ca0113ab65
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/gal/opengl/opengl_gal.cpp
View File

@ -146,10 +146,9 @@ OPENGL_GAL::~OPENGL_GAL()
glDeleteTextures( 1, &fontTexture ); glDeleteTextures( 1, &fontTexture );
isBitmapFontLoaded = false; isBitmapFontLoaded = false;
} }
#ifndef __WIN32__ // FIXME: crashes on W7 - 32 bits
delete OPENGL_GAL::glContext; delete OPENGL_GAL::glContext;
glContext = NULL; glContext = NULL;
#endif
} }
} }

5
pcbnew/pcb_painter.cpp
View File

@ -438,7 +438,6 @@ void PCB_PAINTER::draw( const VIA* aVia, int aLayer )
void PCB_PAINTER::draw( const D_PAD* aPad, int aLayer ) void PCB_PAINTER::draw( const D_PAD* aPad, int aLayer )
{ {
VECTOR2D position( aPad->GetPosition() );
PAD_SHAPE_T shape; PAD_SHAPE_T shape;
double m, n; double m, n;
double orientation = aPad->GetOrientation(); double orientation = aPad->GetOrientation();
@ -447,6 +446,8 @@ void PCB_PAINTER::draw( const D_PAD* aPad, int aLayer )
// Draw description layer // Draw description layer
if( IsNetnameLayer( aLayer ) ) if( IsNetnameLayer( aLayer ) )
{ {
VECTOR2D position( aPad->ShapePos() );
// Is anything that we can display enabled? // Is anything that we can display enabled?
if( m_pcbSettings.m_netNamesOnPads || m_pcbSettings.m_padNumbers ) if( m_pcbSettings.m_netNamesOnPads || m_pcbSettings.m_padNumbers )
{ {
@ -491,7 +492,7 @@ void PCB_PAINTER::draw( const D_PAD* aPad, int aLayer )
m_gal->SetIsFill( false ); m_gal->SetIsFill( false );
// Set the text position to the pad shape position (the pad position is not the best place) // Set the text position to the pad shape position (the pad position is not the best place)
VECTOR2D textpos( double( aPad->ShapePos().x ), double( aPad->ShapePos().y ) ); VECTOR2D textpos( 0.0, 0.0 );
// Divide the space, to display both pad numbers and netnames // Divide the space, to display both pad numbers and netnames
// and set the Y text position to display 2 lines // and set the Y text position to display 2 lines