diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-02-28 12:25:45 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-02-28 12:25:45 +0100 |
| commit | 4e73a4d47cd1287f6a5ac3bfc66dc024b0b268e4 (patch) | |
| tree | 70def4e281be863605a6c93d9ec51be7b6497c69 /include/llmr/util/pbf.hpp | |
| parent | ae3bd04171a671a877c3240ed505096186c280cc (diff) | |
| parent | 675b8eb1fef9e4fc99516b2fa64505107b1fa6bf (diff) | |
| download | qtlocation-mapboxgl-4e73a4d47cd1287f6a5ac3bfc66dc024b0b268e4.tar.gz | |
Merge branch 'master' into tessellation
Conflicts:
include/llmr/renderer/fill_bucket.hpp
src/renderer/fill_bucket.cpp
src/renderer/painter.cpp
Diffstat (limited to 'include/llmr/util/pbf.hpp')
| -rw-r--r-- | include/llmr/util/pbf.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/llmr/util/pbf.hpp b/include/llmr/util/pbf.hpp index 132cc14354..2e99cd91cb 100644 --- a/include/llmr/util/pbf.hpp +++ b/include/llmr/util/pbf.hpp @@ -20,7 +20,7 @@ struct pbf { struct unknown_field_type_exception : exception {}; struct end_of_buffer_exception : exception {}; - inline pbf(const unsigned char *data, uint32_t length); + inline pbf(const unsigned char *data, size_t length); inline pbf(); inline operator bool() const; @@ -49,7 +49,7 @@ struct pbf { uint32_t tag = 0; }; -pbf::pbf(const unsigned char *data, uint32_t length) +pbf::pbf(const unsigned char *data, size_t length) : data(data), end(data + length), value(0), |