Skip to content

Commit 3628b43

Browse files
committed
dxf2shp cleanup:
* save block inserts in separate shape instead of expanding it once at the first insertion (also removes GPL-2 only code) * update dxflib to 3.7.5 (usable under GPL-2+)
1 parent ec0ab3f commit 3628b43

22 files changed

+7575
-7654
lines changed

debian/copyright

+2-10
Original file line numberDiff line numberDiff line change
@@ -293,22 +293,14 @@ Comment: The code is heavily based on Christopher Michaelis' DXF to
293293
Used for the Shapefile functionality.
294294
License: MIT
295295

296-
Files: src/plugins/dxf2shp_converter/getInsertions.h
297-
Copyright: Christopher Michaelis
298-
License: GPL-2
299-
300-
Files: src/plugins/dxf2shp_converter/getInsertions.cpp
301-
Copyright: Christopher Michaelis
302-
License: GPL-2+
303-
304296
Files: src/plugins/dxf2shp_converter/shapelib-1.2.10/*
305297
Copyright: 1999, 2001-2002, Frank Warmerdam
306298
License: MIT or LGPL-2+
307299

308300
Files: src/plugins/dxf2shp_converter/dxflib/src/*
309-
Copyright: 2001-2003, RibbonSoft
301+
Copyright: 2001-2013, RibbonSoft GmbH
310302
2001, Robert J. Campbell Jr
311-
License: GPL-2 or dxflib-Commercial-License
303+
License: GPL-2+ or dxflib-Commercial-License
312304

313305
Files: src/plugins/evis/*
314306
Copyright: 2007, American Museum of Natural History

src/plugins/dxf2shp_converter/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ SET (dxf2shpconverter_SRCS
66
dxf2shpconverter.cpp
77
dxf2shpconvertergui.cpp
88
builder.cpp
9-
getInsertions.cpp
109
dxflib/src/dl_dxf.cpp
1110
dxflib/src/dl_writer_ascii.cpp
1211
)

0 commit comments

Comments
 (0)