Skip to content

Commit a37db8b

Browse files
committed
Merge branch 'master' into Draft_1
2 parents ff1fc02 + 8ee771d commit a37db8b

7 files changed

Lines changed: 11 additions & 7 deletions

File tree

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
path = lib/c/ubj
99
url = https://github.com/fangq/ubj.git
1010
[submodule "lib/python/py-ubjson"]
11-
path = lib/python/py-ubjson
11+
path = lib/python/pybj
1212
url = https://github.com/fangq/py-ubjson.git
1313
branch = bjdata
1414
[submodule "lib/python/pyjdata"]

Binary_JData_Specification.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Binary JData: A portable interchange format for complex binary data
44
- **Status of this document**: Request for comments.
55
- **Maintainer**: Qianqian Fang <q.fang at neu.edu>
66
- **License**: Apache License, Version 2.0
7-
- **Version**: 0.5 (Draft 1)
7+
- **Version**: 1 (Draft 2 - work-in-progress)
88
- **Abstract**:
99

1010
> The Binary JData (BJData) Specification defines an efficient serialization
@@ -293,8 +293,10 @@ Numeric values in JSON:
293293
"int8": 16,
294294
"uint8": 255,
295295
"int16": 32767,
296+
"uint16": 32768,
296297
"int32": 2147483647,
297298
"int64": 9223372036854775807,
299+
"uint64": 9223372036854775808,
298300
"float32": 3.14,
299301
"float64": 113243.7863123,
300302
"huge1": "3.14159265358979323846",
@@ -308,9 +310,11 @@ In BJData (using block-notation):
308310
[{]
309311
[i][4][int8][i][16]
310312
[i][5][uint8][U][255]
311-
[i][5][int16][I]32767]
313+
[i][5][int16][I][32767]
314+
[i][6][uint16][u][32768]
312315
[i][5][int32][l][2147483647]
313316
[i][5][int64][L][9223372036854775807]
317+
[i][6][uint64][M][9223372036854775808]
314318
[i][7][float32][d][3.14]
315319
[i][7][float64][D][113243.7863123]
316320
[i][5][huge1][H][i][22][3.14159265358979323846]

lib/matlab/jsonlab

lib/python/py-ubjson

Lines changed: 0 additions & 1 deletion
This file was deleted.

lib/python/pybj

Submodule pybj added at 765b977

0 commit comments

Comments
 (0)