From c57c1e94d196ebfd239b93c41114ba3e8a59cc45 Mon Sep 17 00:00:00 2001
From: Lorenzo Marcantonio <l.marcantonio@logossrl.com>
Date: Sun, 5 May 2013 12:11:30 +0200
Subject: [PATCH] Fixed LAYER_NUM usage in the specctra code. A specctra layer
 is not a LAYER_NUM, so that's probably why it was difficult to use.

---
 pcbnew/specctra.cpp        | 2 +-
 pcbnew/specctra.h          | 2 +-
 pcbnew/specctra_export.cpp | 2 +-
 pcbnew/specctra_import.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pcbnew/specctra.cpp b/pcbnew/specctra.cpp
index 03e5193c91..080c37269a 100644
--- a/pcbnew/specctra.cpp
+++ b/pcbnew/specctra.cpp
@@ -99,7 +99,7 @@ void SPECCTRA_DB::buildLayerMaps( BOARD* aBoard )
 
 int SPECCTRA_DB::findLayerName( const std::string& aLayerName ) const
 {
-    for( LAYER_NUM i=FIRST_LAYER;  i<int(layerIds.size());  ++i )
+    for( int i=0;  i < int(layerIds.size());  ++i )
     {
         if( 0 == aLayerName.compare( layerIds[i] ) )
             return i;
diff --git a/pcbnew/specctra.h b/pcbnew/specctra.h
index 5e0a6d9417..819e5628cd 100644
--- a/pcbnew/specctra.h
+++ b/pcbnew/specctra.h
@@ -3743,7 +3743,7 @@ class SPECCTRA_DB : public SPECCTRA_LEXER
      *  or delete it.
      */
     PADSTACK* makeVia( int aCopperDiameter, int aDrillDiameter,
-                       LAYER_NUM aTopLayer, LAYER_NUM aBotLayer );
+                       int aTopLayer, int aBotLayer );
 
     /**
      * Function makeVia
diff --git a/pcbnew/specctra_export.cpp b/pcbnew/specctra_export.cpp
index a5560a8918..5e85cd9628 100644
--- a/pcbnew/specctra_export.cpp
+++ b/pcbnew/specctra_export.cpp
@@ -1851,7 +1851,7 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) throw( IO_ERROR )
                 wire->wire_type = T_protect;    // @todo, this should be configurable
 
                 LAYER_NUM kiLayer  = track->GetLayer();
-                LAYER_NUM pcbLayer = kicadLayer2pcb[kiLayer];
+                int pcbLayer = kicadLayer2pcb[kiLayer];
 
                 path = new PATH( wire );
 
diff --git a/pcbnew/specctra_import.cpp b/pcbnew/specctra_import.cpp
index 945bcd2fbc..78ad143edd 100644
--- a/pcbnew/specctra_import.cpp
+++ b/pcbnew/specctra_import.cpp
@@ -224,7 +224,7 @@ static wxPoint mapPt( const POINT& aPoint, UNIT_RES* aResolution )
 
 TRACK* SPECCTRA_DB::makeTRACK( PATH* aPath, int aPointIndex, int aNetcode ) throw( IO_ERROR )
 {
-    LAYER_NUM layerNdx = findLayerName( aPath->layer_id );
+    int layerNdx = findLayerName( aPath->layer_id );
 
     if( layerNdx == -1 )
     {