diff --git a/doc/dynapi.texi b/doc/dynapi.texi index d2248fd70a..671e2228da 100644 --- a/doc/dynapi.texi +++ b/doc/dynapi.texi @@ -9739,7 +9739,7 @@ BL, DXF 92 @item up_dir 3BD, DXF 210 @item north_dir -3BD, DXF 12 +2RD, DXF 12 @item scale_est BL, DXF 95 @item user_scale_factor diff --git a/include/dwg.h b/include/dwg.h index 1e3559821f..70ad7d7fcd 100644 --- a/include/dwg.h +++ b/include/dwg.h @@ -4243,7 +4243,7 @@ typedef struct _dwg_object_GEODATA BITCODE_BD unit_scale_vert; BITCODE_BL units_value_vert; // enum 0-20 BITCODE_3BD up_dir; - BITCODE_3BD north_dir; + BITCODE_2RD north_dir; BITCODE_BL scale_est; /* None = 1, User specified scale factor = 2, Grid scale at reference point = 3, Prismodial = 4 */ BITCODE_BD user_scale_factor; diff --git a/src/dwg.spec b/src/dwg.spec index ccdafbd224..6b86e82cf4 100644 --- a/src/dwg.spec +++ b/src/dwg.spec @@ -6249,7 +6249,7 @@ DWG_OBJECT (GEODATA) FIELD_BL (units_value_vert, 92); // vert_units FIELD_3BD (up_dir, 210); // TODO compute if upgrading - FIELD_2RD (north_dir, 12); // obsolete: 1,1,1 + FIELD_2RD (north_dir, 12); // obsolete: 1,1 // Civil3D fields: FIELD_BL (scale_est, 95); // None = 1 (default: ScaleEstMethodUnity), // User defined = 2, Grid scale at reference point = 3, diff --git a/src/dynapi.c b/src/dynapi.c index 677f886e6f..a0ab16ea69 100644 --- a/src/dynapi.c +++ b/src/dynapi.c @@ -8123,7 +8123,7 @@ static const Dwg_DYNAPI_field _dwg_GEODATA_fields[] = { 0,0,0, 92 }, { "up_dir", "3BD", sizeof (BITCODE_3BD), OFF (struct _dwg_object_GEODATA, up_dir), 1,0,0, 210 }, - { "north_dir", "3BD", sizeof (BITCODE_3BD), OFF (struct _dwg_object_GEODATA, north_dir), + { "north_dir", "2RD", sizeof (BITCODE_2RD), OFF (struct _dwg_object_GEODATA, north_dir), 1,0,0, 12 }, { "scale_est", "BL", sizeof (BITCODE_BL), OFF (struct _dwg_object_GEODATA, scale_est), 0,0,0, 95 }, diff --git a/test/unit-testing/dynapi_test.c b/test/unit-testing/dynapi_test.c index 0f679bfaea..5e13cd4b2f 100644 --- a/test/unit-testing/dynapi_test.c +++ b/test/unit-testing/dynapi_test.c @@ -48623,12 +48623,12 @@ static int test_GEODATA (const Dwg_Object *obj) fail ("GEODATA.host_block [H]"); } { - BITCODE_3BD north_dir; + BITCODE_2RD north_dir; if (dwg_dynapi_entity_value (geodata, "GEODATA", "north_dir", &north_dir, NULL) - && !memcmp (&north_dir, &geodata->north_dir, sizeof (BITCODE_3BD))) + && !memcmp (&north_dir, &geodata->north_dir, sizeof (BITCODE_2RD))) pass (); else - fail ("GEODATA.north_dir [3BD]"); + fail ("GEODATA.north_dir [2RD]"); } { BITCODE_BD north_dir_angle_deg;