Skip to content

Commit

Permalink
refactor injson dynapi for inline arrays
Browse files Browse the repository at this point in the history
maybe the reason for the GH #851 readDWG crash.
simplifies a lot.
  • Loading branch information
rurban committed Oct 4, 2023
1 parent 33c5453 commit a76c16b
Show file tree
Hide file tree
Showing 9 changed files with 223 additions and 165 deletions.
66 changes: 33 additions & 33 deletions doc/dynapi.texi
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ BS, DXF 70
BS, DXF 70
@item MENU
TV, DXF 1
@item MENUEXT[46]
@item MENUEXT
RC
@item MIRRTEXT
B, DXF 70
Expand Down Expand Up @@ -707,7 +707,7 @@ RS
RL
@item flag_3d
RS
@item layer_colors[128]
@item layer_colors
RS
@item numentities
RS
Expand Down Expand Up @@ -923,15 +923,15 @@ struct _dwg_entity_3DSOLID*
BL
@item materials
Dwg_3DSOLID_material*
@item revision_guid[39]
@item revision_guid
RC, DXF 2
@item revision_major
BL
@item revision_minor1
BS
@item revision_minor2
BS
@item revision_bytes[9]
@item revision_bytes
RC
@item end_marker
BL
Expand Down Expand Up @@ -1939,15 +1939,15 @@ struct _dwg_entity_3DSOLID*
BL
@item materials
Dwg_3DSOLID_material*
@item revision_guid[39]
@item revision_guid
RC, DXF 2
@item revision_major
BL
@item revision_minor1
BS
@item revision_minor2
BS
@item revision_bytes[9]
@item revision_bytes
RC
@item end_marker
BL
Expand Down Expand Up @@ -2675,15 +2675,15 @@ struct _dwg_entity_3DSOLID*
BL
@item materials
Dwg_3DSOLID_material*
@item revision_guid[39]
@item revision_guid
RC, DXF 2
@item revision_major
BL
@item revision_minor1
BS
@item revision_minor2
BS
@item revision_bytes[9]
@item revision_bytes
RC
@item end_marker
BL
Expand Down Expand Up @@ -3200,15 +3200,15 @@ struct _dwg_entity_3DSOLID*
BL
@item materials
Dwg_3DSOLID_material*
@item revision_guid[39]
@item revision_guid
RC, DXF 2
@item revision_major
BL
@item revision_minor1
BS
@item revision_minor2
BS
@item revision_bytes[9]
@item revision_bytes
RC
@item end_marker
BL
Expand Down Expand Up @@ -3351,15 +3351,15 @@ struct _dwg_entity_3DSOLID*
BL
@item materials
Dwg_3DSOLID_material*
@item revision_guid[39]
@item revision_guid
RC, DXF 2
@item revision_major
BL
@item revision_minor1
BS
@item revision_minor2
BS
@item revision_bytes[9]
@item revision_bytes
RC
@item end_marker
BL
Expand Down Expand Up @@ -3832,15 +3832,15 @@ struct _dwg_entity_3DSOLID*
BL
@item materials
Dwg_3DSOLID_material*
@item revision_guid[39]
@item revision_guid
RC, DXF 2
@item revision_major
BL
@item revision_minor1
BS
@item revision_minor2
BS
@item revision_bytes[9]
@item revision_bytes
RC
@item end_marker
BL
Expand Down Expand Up @@ -4157,15 +4157,15 @@ struct _dwg_entity_3DSOLID*
BL
@item materials
Dwg_3DSOLID_material*
@item revision_guid[39]
@item revision_guid
RC, DXF 2
@item revision_major
BL
@item revision_minor1
BS
@item revision_minor2
BS
@item revision_bytes[9]
@item revision_bytes
RC
@item end_marker
BL
Expand Down Expand Up @@ -4691,8 +4691,8 @@ RC, DXF 70
struct _dwg_object_entity*
@item flag
RC, DXF 70
@item vertind[4]
BS
@item vertind
BS, DXF 71

@end vtable
@end indentedblock
Expand Down Expand Up @@ -5064,15 +5064,15 @@ struct _dwg_entity_3DSOLID*
BL
@item materials
Dwg_3DSOLID_material*
@item revision_guid[39]
@item revision_guid
RC, DXF 2
@item revision_major
BL
@item revision_minor1
BS
@item revision_minor2
BS
@item revision_bytes[9]
@item revision_bytes
RC
@item end_marker
BL
Expand Down Expand Up @@ -5721,7 +5721,7 @@ struct _dwg_VALUEPARAM*
BL, DXF 90
@item b1
B, DXF 70
@item workplane[3]
@item workplane
3BD
@item h1
H, DXF 360
Expand Down Expand Up @@ -5970,15 +5970,15 @@ struct _dwg_entity_3DSOLID*
BL
@item materials
Dwg_3DSOLID_material*
@item revision_guid[39]
@item revision_guid
RC
@item revision_major
BL
@item revision_minor1
BS
@item revision_minor2
BS
@item revision_bytes[9]
@item revision_bytes
RC
@item end_marker
BL
Expand Down Expand Up @@ -10344,8 +10344,8 @@ RC, DXF 72
RC, DXF 73
@item dashes
Dwg_LTYPE_dash*
@item dashes_r11[12]
RD
@item dashes_r11
RD, DXF 49
@item has_strings_area
B
@item strings_area
Expand Down Expand Up @@ -13064,7 +13064,7 @@ BL

@item parent
struct _dwg_object_ASSOCARRAYMODIFYACTIONBODY*
@item itemloc[3]
@item itemloc
BL

@end vtable
Expand Down Expand Up @@ -13112,7 +13112,7 @@ H
struct _dwg_abstractobject_ASSOCARRAYPARAMETERS*
@item class_version
BL, DXF 90
@item itemloc[3]
@item itemloc
BL
@item flags
BL
Expand Down Expand Up @@ -13600,7 +13600,7 @@ Dwg_AcDs_Search_IdIdx*

@item signature
RS
@item name[7]
@item name
RC
@item type
RCd
Expand All @@ -13620,7 +13620,7 @@ RL
RL
@item objdata_algn_offset
RL
@item padding[9]
@item padding
RC

@end vtable
Expand Down Expand Up @@ -14104,7 +14104,7 @@ BLd, DXF 94
BLd, DXF 91
@item e3
BLd, DXF 91
@item out_edge[5]
@item out_edge
BLd

@end vtable
Expand All @@ -14126,7 +14126,7 @@ BL, DXF 93
BLd, DXF 95
@item evalexpr
H, DXF 360
@item node[4]
@item node
BLd
@item active_cycles
B
Expand Down Expand Up @@ -15202,7 +15202,7 @@ RC
@indentedblock
@vtable @code

@item file_ID_string[12]
@item file_ID_string
RC
@item header_address
RLx
Expand Down Expand Up @@ -15246,7 +15246,7 @@ RLd
RL
@item crc32
RLx
@item padding[12]
@item padding
RC
@item section_type
RL
Expand Down
3 changes: 3 additions & 0 deletions src/dwg.spec
Original file line number Diff line number Diff line change
Expand Up @@ -1222,6 +1222,9 @@ DWG_ENTITY (VERTEX_PFACE_FACE)
FIELD_BS (vertind[2], 73);
FIELD_BS0 (vertind[3], 74);
}
#elif defined IS_JSON
FIELD_RC (flag, 0);
FIELD_VECTOR_INL (vertind, BS, 4, 71);
#else
//FIELD_VALUE (pt) = { 0.0, 0.0, 0.0 };
PRE (R_13b1)
Expand Down
Loading

0 comments on commit a76c16b

Please sign in to comment.