Skip to content

Commit 475674a

Browse files
committed
api: rename SecondHeader.dwg_version to dwg_versions
lo-byte dwg_version, high-byte maint_version
1 parent f7e48de commit 475674a

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

include/dwg.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11347,7 +11347,7 @@ typedef struct _dwg_secondheader
1134711347
BITCODE_RC version[11];
1134811348
BITCODE_RC is_maint;
1134911349
BITCODE_RC zero_one_or_three;
11350-
BITCODE_BS dwg_version;
11350+
BITCODE_BS dwg_versions; /* lo byte: dwg, hi: main */
1135111351
BITCODE_RS codepage;
1135211352
BITCODE_RC num_sections;
1135311353
Dwg_SecondHeader_Sections sections[7];

src/2ndheader.spec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ VERSIONS (R_13, R_2000) {
2727
FIELD_TFF (version, 11, 0);
2828
FIELD_RC (is_maint, 0);
2929
FIELD_RC (zero_one_or_three, 0);
30-
FIELD_BSx (dwg_version, 0);
30+
FIELD_BSx (dwg_versions, 0);
3131
DECODER {
32-
LOG_TRACE("=> header dwg_version: 0x%x\n", _obj->dwg_version & 0xFF);
33-
LOG_TRACE("=> header maint_version: 0x%x\n", (_obj->dwg_version >> 8) & 0xFF);
32+
LOG_TRACE("=> header dwg_version: 0x%x\n", _obj->dwg_versions & 0xFF);
33+
LOG_TRACE("=> header maint_version: 0x%x\n", (_obj->dwg_versions >> 8) & 0xFF);
3434
}
3535
FIELD_RS (codepage, 0);
3636
FIELD_BS (num_sections, 0);

src/encode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3144,7 +3144,7 @@ encode_objfreespace_2ndheader (Dwg_Data *restrict dwg, Bit_Chain *restrict dat)
31443144
}
31453145
_obj->is_maint = dwg->header.is_maint;
31463146
_obj->zero_one_or_three = dwg->header.zero_one_or_three;
3147-
_obj->dwg_version
3147+
_obj->dwg_versions
31483148
= (BITCODE_RS)(((BITCODE_RS)dwg->header.maint_version << 8)
31493149
| dwg->header.dwg_version);
31503150
_obj->codepage = dwg->header.codepage;

src/in_json.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4160,7 +4160,7 @@ json_SecondHeader (Bit_Chain *restrict dat, Dwg_Data *restrict dwg,
41604160
FIELD_TFF (version, 11, 0)
41614161
FIELD_RC (is_maint, 0)
41624162
FIELD_RC (zero_one_or_three, 0)
4163-
FIELD_BS (dwg_version, 0)
4163+
FIELD_BS (dwg_versions, 0)
41644164
FIELD_RS (codepage, 0)
41654165
FIELD_BS (num_sections, 0)
41664166
FIELD_BS (num_handles, 0)

0 commit comments

Comments
 (0)