Skip to content

Commit 97c6f8e

Browse files
authored
Merge branch 'draft-1.4-R16' into issue-71-fix
2 parents 4c1ae81 + f2d24fa commit 97c6f8e

File tree

9 files changed

+294
-284
lines changed

9 files changed

+294
-284
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@ New to LAS? New to GitHub? Want to help? No problem!
2525
Learn how to sign up and contribute [here](https://github.com/ASPRSorg/LAS/wiki/Get-Involved).
2626

2727
[![Build Status](https://api.travis-ci.org/ASPRSorg/LAS.svg?branch=master)](https://travis-ci.org/ASPRSorg/LAS)
28+

source/01_intro.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ Summary of LAS 1.4 revisions (GitHub Issue numbers included when applicable):
118118
(`I-101 <https://github.com/ASPRSorg/LAS/issues/101>`_)
119119
* Added Official LAS Wiki section.
120120
(`I-101 <https://github.com/ASPRSorg/LAS/issues/71>`_)
121+
* Clarified source of min/max XYZ and ExtraByte values.
122+
(`I-89 <https://github.com/ASPRSorg/LAS/issues/89>`_)
123+
* More closely aligned data types with C99 definitions.
124+
(`I-115 <https://github.com/ASPRSorg/LAS/issues/115>`_)
121125

122126
For detailed information on changes in revisions R14 and newer, review the
123127
inline differencing provided on the `GitHub page <https://github.com/ASPRSorg/LAS>`_.
@@ -156,7 +160,7 @@ Conformance
156160
................................................................................
157161

158162
The data types used in the LAS format definition are conformant to the 1999
159-
ANSI C Language Specification (ANSI/ISO/IEC 9899:1999 ("C99").
163+
ANSI C Language Specification (ANSI/ISO/IEC 9899:1999 ("C99")).
160164

161165

162166
Authority

source/02.03_datatypes.sub

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,22 @@ Data Types
33

44
The following data types are used in the LAS format definition. Note that these
55
data types are conformant to the 1999 ANSI C Language Specification
6-
(ANSI/ISO/IEC 9899:1999 ("C99")).
7-
8-
* char (1 byte)
9-
* unsigned char (1 byte)
10-
* short (2 bytes)
11-
* unsigned short (2 bytes)
12-
* long (4 bytes)
13-
* unsigned long (4 bytes)
14-
* long long (8 bytes)
15-
* unsigned long long (8 bytes)
16-
* float (4 byte IEEE floating point format)
17-
* double (8 byte IEEE floating point format)
18-
* string (a variable series of 1 byte characters, ASCII encoded, null-terminated)
6+
(ANSI/ISO/IEC 9899:1999 ("C99")), as defined in the standard header
7+
``<stdint.h>``.
8+
9+
* int8_t (1 byte)
10+
* uint8_t (1 byte)
11+
* int16_t (2 bytes)
12+
* uint16_t (2 bytes)
13+
* int32_t (4 bytes)
14+
* uint32_t (4 bytes)
15+
* int64_t (8 bytes)
16+
* uint64_t (8 bytes)
17+
* float (4-byte ``binary32`` IEEE floating point format)
18+
* double (8-byte ``binary64`` IEEE floating point format)
19+
* string (a variable-length array of 1-byte characters, ASCII-encoded,
20+
null-terminated, contained in a fixed-length ``char`` array, where ``char``
21+
must be equivalent to either ``int8_t`` or ``uint8_t``)
1922

2023
.. warning::
2124

source/02.04_header.sub

Lines changed: 88 additions & 86 deletions
Large diffs are not rendered by default.

source/02.05_vlr.sub

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Variable Length Records (VLRs)
55

66
The Public Header Block can be followed by any number of Variable Length
77
Records (VLRs) so long as the total size does not make the start of the Point
8-
Record data inaccessible by an unsigned long ("Offset to Point Data" in the
8+
Record data inaccessible by a uint32_t ("Offset to Point Data" in the
99
Public Header Block). The number of VLRs is specified in the "Number of
1010
Variable Length Records" field in the Public Header Block. The Variable Length
1111
Records must be accessed sequentially since the size of each variable length
@@ -20,13 +20,13 @@ Record Header is 54 bytes in length.
2020
+----------------------------------+-------------------------+-------------+-----------+----------+
2121
| Item | Format | Byte Offset | Size | Required |
2222
+==================================+=========================+=============+===========+==========+
23-
| Reserved | unsigned short | 0 | 2 bytes | |
23+
| Reserved | uint16_t | 0 | 2 bytes | |
2424
+----------------------------------+-------------------------+-------------+-----------+----------+
2525
| User ID | char[16] | 2 | 16 bytes | yes |
2626
+----------------------------------+-------------------------+-------------+-----------+----------+
27-
| Record ID | unsigned short | 18 | 2 bytes | yes |
27+
| Record ID | uint16_t | 18 | 2 bytes | yes |
2828
+----------------------------------+-------------------------+-------------+-----------+----------+
29-
| Record Length After Header | unsigned short | 20 | 2 bytes | yes |
29+
| Record Length After Header | uint16_t | 20 | 2 bytes | yes |
3030
+----------------------------------+-------------------------+-------------+-----------+----------+
3131
| Description | char[32] | 22 | 32 bytes | |
3232
+----------------------------------+-------------------------+-------------+-----------+----------+

0 commit comments

Comments
 (0)