From 2ff5e1aaeb889c3546862d2da3346e344e64796f Mon Sep 17 00:00:00 2001
From: Wanderer Fan <wandererfan@gmail.com>
Date: Sun, 27 Feb 2022 14:15:55 -0500
Subject: [PATCH] [Import]Fix #6461 MEASUREMENT/INSUNITS

---
 src/Mod/Import/App/dxf.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Mod/Import/App/dxf.cpp b/src/Mod/Import/App/dxf.cpp
index 65d96bfb57..0645265a09 100644
--- a/src/Mod/Import/App/dxf.cpp
+++ b/src/Mod/Import/App/dxf.cpp
@@ -1772,7 +1772,13 @@ CDxfRead::~CDxfRead()
 
 double CDxfRead::mm( double value ) const
 {
-    if(m_measurement_inch)
+    //re #6461
+    //this if handles situation of malformed DXF file where
+    //MEASUREMENT specifies English units, but
+    //INSUNITS specifies millimeters or is not specified
+    //(millimeters is our default)
+    if(m_measurement_inch &&
+        (m_eUnits == eMillimeters))
     {
         value *= 25.4;
     }