FlapJackApps/libdivecomputer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace the header offset with the header size

Browse Source 
The Mares Genius dive header is no longer located at the end of the data
(after the dive profile), but at the start. Therefore we don't need the
offset to the dive header anymore. Replace with the size of the header
instead.
This commit is contained in:
Jef Driesen 2019-05-24 21:44:40 +02:00
parent 6fb09e05a4
commit e4c88a9309
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mares_iconhd_parser.c
View File

@ -54,8 +54,8 @@ struct mares_iconhd_parser_t {
unsigned int cached;
unsigned int mode;
unsigned int nsamples;
unsigned int footer;
unsigned int samplesize;
unsigned int headersize;
unsigned int settings;
unsigned int interval;
unsigned int samplerate;
@ -227,11 +227,14 @@ mares_iconhd_parser_cache (mares_iconhd_parser_t *parser)
}
}
// Limit the size to the actual length.
parser->base.size = length;
// Cache the data for later use.
parser->mode = mode;
parser->nsamples = nsamples;
parser->footer = length - headersize;
parser->samplesize = samplesize;
parser->headersize = headersize;
parser->settings = settings;
parser->interval = interval;
parser->samplerate = samplerate;
@ -266,8 +269,8 @@ mares_iconhd_parser_create (dc_parser_t **out, dc_context_t *context, unsigned i
parser->cached = 0;
parser->mode = AIR;
parser->nsamples = 0;
parser->footer = 0;
parser->samplesize = 0;
parser->headersize = 0;
parser->settings = 0;
parser->interval = 0;
parser->samplerate = 0;
@ -292,8 +295,8 @@ mares_iconhd_parser_set_data (dc_parser_t *abstract, const unsigned char *data,
parser->cached = 0;
parser->mode = AIR;
parser->nsamples = 0;
parser->footer = 0;
parser->samplesize = 0;
parser->headersize = 0;
parser->settings = 0;
parser->interval = 0;
parser->samplerate = 0;
@ -317,7 +320,7 @@ mares_iconhd_parser_get_datetime (dc_parser_t *abstract, dc_datetime_t *datetime
if (rc != DC_STATUS_SUCCESS)
return rc;
const unsigned char *p = abstract->data + parser->footer;
const unsigned char *p = abstract->data + abstract->size - parser->headersize;
if (parser->model == SMART) {
if (parser->mode == FREEDIVE) {
p += 0x20;
@ -356,7 +359,7 @@ mares_iconhd_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsi
if (rc != DC_STATUS_SUCCESS)
return rc;
const unsigned char *p = abstract->data + parser->footer;
const unsigned char *p = abstract->data + abstract->size - parser->headersize;
if (parser->model != SMART && parser->model != SMARTAPNEA && parser->model != SMARTAIR) {
p += 4;
}