gerbview fixes

f8100747 · Brian F. G. Bidulock · Dick Hollenbeck · 0ebe9878 · f8100747 · f8100747
Commit f8100747 authored Sep 14, 2010 by Brian F. G. Bidulock Committed by Dick Hollenbeck Sep 14, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

rs274d.cpp gerbview/rs274d.cpp +1 -1

rs274x.cpp gerbview/rs274x.cpp +2 -2

No files found.
--- a/gerbview/rs274d.cpp
+++ b/gerbview/rs274d.cpp
@@ -1209,7 +1209,7 @@ bool GERBER::Execute_DCODE_Command( WinEDA_GerberFrame* frame,
                                pcb->m_Track.Append( track );
                                D( printf( "R:%p\n", track ); )
                                fillRoundFlashTRACK( track, dcode, activeLayer,
-                                                     m_CurrentPos, diameter, exposure );
+                                                     curPos, diameter, exposure );
                            }
                            break;


--- a/gerbview/rs274x.cpp
+++ b/gerbview/rs274x.cpp
@@ -537,9 +537,9 @@ bool GetEndOfBlock( char buff[GERBER_BUFZ], char*& text, FILE* gerber_file )

 static bool CheckForLineEnd(  char buff[GERBER_BUFZ], char*& text, FILE* fp  )
 {
-    while( *text == '\n' || !*text )
+    while( *text == '\n' || *text == '\r' || !*text )
    {
-        if( *text == '\n' )
+        if( *text == '\n' || *text == '\r' )
            ++text;

        if( !*text )