DXF: interpret INSERT blocks with row count or column count equal to …

…0 as 1
OSGeo · Jan 21, 2025 · 8056d2f · 8056d2f
1 parent 8221e12
commit 8056d2f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/autotest/ogr/ogr_dxf.py b/autotest/ogr/ogr_dxf.py
@@ -4129,17 +4129,15 @@ def test_ogr_dxf_write_MEASUREMENT(tmp_vsimem):
 ###############################################################################
 # Use case of https://github.com/OSGeo/gdal/issues/11591
 # Test reading a INSERT block whose column count is zero.
-# Not totally sure about the exact behavior we should do. Currently
-# the zero count is strictly honored and no geometry from the block will be
-# inserted into the regular geometries. LibreCAD 2.1.3 does the same thing
+# Interpretating it as 1, as AutoCAD does
 
 
 @gdaltest.enable_exceptions()
 def test_ogr_dxf_insert_col_count_zero():
 
     with ogr.Open("data/dxf/insert_only_col_count_zero.dxf") as ds:
         lyr = ds.GetLayer(0)
-        assert lyr.GetFeatureCount() == 0
+        assert lyr.GetFeatureCount() == 1
 
     with gdal.config_option("DXF_INLINE_BLOCKS", "NO"):
         with ogr.Open("data/dxf/insert_only_col_count_zero.dxf") as ds:

diff --git a/ogr/ogrsf_frmts/dxf/ogrdxflayer.cpp b/ogr/ogrsf_frmts/dxf/ogrdxflayer.cpp
@@ -3207,8 +3207,10 @@ bool OGRDXFLayer::TranslateINSERT()
 
     if (m_oInsertState.m_nRowCount == 0 || m_oInsertState.m_nColumnCount == 0)
     {
-        m_oInsertState.m_nRowCount = 0;
-        m_oInsertState.m_nColumnCount = 0;
+        // AutoCad doesn't allow setting to 0 in its UI, but interprets 0
+        // as 1 (but other software such as LibreCAD interpret 0 as 0)
+        m_oInsertState.m_nRowCount = 1;
+        m_oInsertState.m_nColumnCount = 1;
     }
 
     /* -------------------------------------------------------------------- */