Skip to content

Commit fd4195e

Browse files
committed
decode: fixup FIELD.value_string and format
1 parent 53a717b commit fd4195e

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

src/dwg.spec

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6319,7 +6319,11 @@ DWG_OBJECT (FIELD)
63196319
SUBCLASS (AcDbField)
63206320
FIELD_T (id, 1);
63216321
FIELD_T (code, 2); // and code 3 for subsequent >255 chunks
6322-
// DXF { }
6322+
DXF {
6323+
PRE (R_2007a) {
6324+
FIELD_TV (format, 4);
6325+
}
6326+
}
63236327
FIELD_BL (num_childs, 90);
63246328
VALUEOUTOFBOUNDS (num_childs, 20000)
63256329
DXF {
@@ -6330,9 +6334,11 @@ DWG_OBJECT (FIELD)
63306334
DXF {
63316335
HANDLE_VECTOR (objects, num_objects, 5, 331);
63326336
}
6333-
//PRE (R_2007a) {
6334-
// FIELD_TV (format, 4);
6335-
//}
6337+
#ifndef IS_DXF
6338+
PRE (R_2007a) {
6339+
FIELD_TV (format, 4);
6340+
}
6341+
#endif
63366342
FIELD_BL (evaluation_option, 91);
63376343
FIELD_BL (filing_option, 92);
63386344
FIELD_BL (field_state, 94);
@@ -6345,7 +6351,7 @@ DWG_OBJECT (FIELD)
63456351
return error;
63466352

63476353
#ifndef IS_DXF
6348-
FIELD_T (value_string, 301); // TODO: and 9 for subsequent >255 chunks
6354+
FIELD_T (value_string, 301);
63496355
FIELD_BL (value_string_length, 98); //ODA bug TV
63506356
#endif
63516357

@@ -6363,8 +6369,10 @@ DWG_OBJECT (FIELD)
63636369
SET_PARENT_OBJ (childval[rcount1]);
63646370
END_REPEAT_BLOCK
63656371
END_REPEAT (childval)
6366-
FIELD_T (value_string, 301); // TODO: and 9 for subsequent >255 chunks
6367-
FIELD_BL (value_string_length, 98); //ODA bug TV
6372+
DXF {
6373+
FIELD_T (value_string, 301); // TODO: and 9 for subsequent >255 chunks
6374+
FIELD_BL (value_string_length, 98); //ODA bug TV
6375+
}
63686376

63696377
START_OBJECT_HANDLE_STREAM;
63706378
HANDLE_VECTOR (childs, num_childs, 3, 0);

0 commit comments

Comments
 (0)