Gerbview: fix bug #1176538 (incorrect flashed items size, when defined by aperture macros)

6b0980d9 · jean-pierre charras · 172bbc8f · 6b0980d9
Commit 6b0980d9 authored May 18, 2013 by jean-pierre charras
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

rs274_read_XY_and_IJ_coordinates.cpp gerbview/rs274_read_XY_and_IJ_coordinates.cpp +4 -4

No files found.
--- a/gerbview/rs274_read_XY_and_IJ_coordinates.cpp
+++ b/gerbview/rs274_read_XY_and_IJ_coordinates.cpp
@@ -43,10 +43,10 @@ int scaletoIU( double aCoord, bool isMetric )
 {
    int ret;

-    if( isMetric )
-        ret = KiROUND( aCoord * IU_PER_MILS / 0.00254 );
-    else
-        ret = KiROUND( aCoord * IU_PER_MILS );
+    if( isMetric )  // gerber are units in mm
+        ret = KiROUND( aCoord * IU_PER_MM );
+    else            // gerber are units in inches
+        ret = KiROUND( aCoord * IU_PER_MILS * 1000.0);

    return ret;
 }