fogti/y16t
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix: missing leading coordinate bytes

Browse source
This commit is contained in:
Alain Zscheile 2023-01-04 09:17:59 +01:00
parent d09f3cf642
commit a13f2271da
3 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lib/db.c
View file

@ -162,11 +162,12 @@ int y16t_db_lookup(
typedef struct { typedef struct {
y16t_db_t db; y16t_db_t db;
const uint8_t *xy; const uint8_t *xy;
uint8_t oth;
int (*callback)(const uint8_t*, const uint8_t*, void*); int (*callback)(const uint8_t*, const uint8_t*, void*);
void *context; void *context;
} y16t_db_fectx_t; } y16t_db_fectx_t;
static int y16t_db_foreach_x3(uint32_t offset, void *context_) static int y16t_db_foreach_x3(uint8_t x1, uint32_t offset, void *context_)
{ {
if(!offset) return 0; if(!offset) return 0;
const y16t_db_fectx_t *context = context_; const y16t_db_fectx_t *context = context_;
@ -184,14 +185,18 @@ static int y16t_db_foreach_x3(uint32_t offset, void *context_)
if(memcmp(&buf[i], zeros, 44) == 0) if(memcmp(&buf[i], zeros, 44) == 0)
break; break;
if(memcmp(&buf[i + 14], xyrest, 14) == 0) { if(memcmp(&buf[i + 14], xyrest, 14) == 0) {
const int tmp2 = context->callback(&buf[i], &buf[i + 28], context->context); uint8_t x[16] = {0};
x[0] = context->oth;
x[1] = x1;
memcpy(&x[2], &buf[i], 14);
const int tmp2 = context->callback(x, &buf[i + 28], context->context);
if(tmp2) return tmp2; if(tmp2) return tmp2;
} }
} }
return 0; return 0;
} }
static int y16t_db_foreach_y3(uint32_t offset, void *context_) static int y16t_db_foreach_y3(uint8_t y1, uint32_t offset, void *context_)
{ {
if(!offset) return 0; if(!offset) return 0;
const y16t_db_fectx_t *context = context_; const y16t_db_fectx_t *context = context_;
@ -209,24 +214,30 @@ static int y16t_db_foreach_y3(uint32_t offset, void *context_)
if(memcmp(&buf[i], zeros, 44) == 0) if(memcmp(&buf[i], zeros, 44) == 0)
break; break;
if(memcmp(&buf[i], xyrest, 14) == 0) { if(memcmp(&buf[i], xyrest, 14) == 0) {
const int tmp2 = context->callback(&buf[i + 14], &buf[i + 28], context->context); uint8_t y[16] = {0};
y[0] = context->oth;
y[1] = y1;
memcpy(&y[2], &buf[i + 14], 14);
const int tmp2 = context->callback(y, &buf[i + 28], context->context);
if(tmp2) return tmp2; if(tmp2) return tmp2;
} }
} }
return 0; return 0;
} }
static int y16t_db_foreach_x2(uint32_t offset, void *context_) { static int y16t_db_foreach_x2(uint8_t x0, uint32_t offset, void *context_) {
const y16t_db_fectx_t *context = context_; y16t_db_fectx_t *context = context_;
if(!offset) return 0; if(!offset) return 0;
context->oth = x0;
const y16t_idx_t idx = { context->db, offset }; const y16t_idx_t idx = { context->db, offset };
return y16t_idx_foreach_x(idx, context->xy[1], return y16t_idx_foreach_x(idx, context->xy[1],
y16t_db_foreach_x3, context_); y16t_db_foreach_x3, context_);
} }
static int y16t_db_foreach_y2(uint32_t offset, void *context_) { static int y16t_db_foreach_y2(uint8_t y0, uint32_t offset, void *context_) {
const y16t_db_fectx_t *context = context_; y16t_db_fectx_t *context = context_;
if(!offset) return 0; if(!offset) return 0;
context->oth = y0;
const y16t_idx_t idx = { context->db, offset }; const y16t_idx_t idx = { context->db, offset };
return y16t_idx_foreach_y(idx, context->xy[1], return y16t_idx_foreach_y(idx, context->xy[1],
y16t_db_foreach_y3, context_); y16t_db_foreach_y3, context_);
@ -237,7 +248,7 @@ int y16t_db_foreach_x(
int (*callback)(const uint8_t*, const uint8_t*, void*), int (*callback)(const uint8_t*, const uint8_t*, void*),
void *context void *context
) { ) {
y16t_db_fectx_t fectx = { db, y, callback, context }; y16t_db_fectx_t fectx = { db, y, 0, callback, context };
const y16t_idx_t idx = { db, 0 }; const y16t_idx_t idx = { db, 0 };
return y16t_idx_foreach_x(idx, y[0], y16t_db_foreach_x2, (void*) &fectx); return y16t_idx_foreach_x(idx, y[0], y16t_db_foreach_x2, (void*) &fectx);
} }
@ -247,7 +258,7 @@ int y16t_db_foreach_y(
int (*callback)(const uint8_t*, const uint8_t*, void*), int (*callback)(const uint8_t*, const uint8_t*, void*),
void *context void *context
) { ) {
y16t_db_fectx_t fectx = { db, x, callback, context }; y16t_db_fectx_t fectx = { db, x, 0, callback, context };
const y16t_idx_t idx = { db, 0 }; const y16t_idx_t idx = { db, 0 };
return y16t_idx_foreach_y(idx, x[0], y16t_db_foreach_y2, (void*) &fectx); return y16t_idx_foreach_y(idx, x[0], y16t_db_foreach_y2, (void*) &fectx);
} }

15
lib/idx.c
View file

@ -78,23 +78,24 @@ static int y16t_idx_foreach_inner(
y16t_idx_t idx, y16t_idx_t idx,
uint8_t x, uint8_t x,
uint8_t y, uint8_t y,
int (*callback)(uint32_t, void*), uint8_t oth,
int (*callback)(uint8_t, uint32_t, void*),
void *context void *context
) { ) {
uint32_t value = 0; uint32_t value = 0;
int tmp = y16t_idx_lookup(idx, x, y, &value); const int tmp = y16t_idx_lookup(idx, x, y, &value);
if(tmp < 0) return tmp; if(tmp < 0) return tmp;
return callback(ntohl(value), context); return callback(oth, ntohl(value), context);
} }
int y16t_idx_foreach_x( int y16t_idx_foreach_x(
y16t_idx_t idx, y16t_idx_t idx,
uint8_t y, uint8_t y,
int (*callback)(uint32_t, void*), int (*callback)(uint8_t, uint32_t, void*),
void *context void *context
) { ) {
for (uint16_t x = 0; x < 0xff; ++x) { for (uint16_t x = 0; x < 0xff; ++x) {
const int tmp = y16t_idx_foreach_inner(idx, x, y, callback, context); const int tmp = y16t_idx_foreach_inner(idx, x, y, x, callback, context);
if(tmp) return tmp; if(tmp) return tmp;
} }
@ -104,11 +105,11 @@ int y16t_idx_foreach_x(
int y16t_idx_foreach_y( int y16t_idx_foreach_y(
y16t_idx_t idx, y16t_idx_t idx,
uint8_t x, uint8_t x,
int (*callback)(uint32_t, void*), int (*callback)(uint8_t, uint32_t, void*),
void *context void *context
) { ) {
for (uint16_t y = 0; y < 0xff; ++y) { for (uint16_t y = 0; y < 0xff; ++y) {
const int tmp = y16t_idx_foreach_inner(idx, x, y, callback, context); const int tmp = y16t_idx_foreach_inner(idx, x, y, y, callback, context);
if(tmp) return tmp; if(tmp) return tmp;
} }

4
lib/y16t_idx.h
View file

@ -43,13 +43,13 @@ int y16t_idx_get_or_insert(
int y16t_idx_foreach_x( int y16t_idx_foreach_x(
y16t_idx_t idx, y16t_idx_t idx,
uint8_t y, uint8_t y,
int (*callback)(uint32_t, void*), int (*callback)(uint8_t, uint32_t, void*),
void *context void *context
); );
int y16t_idx_foreach_y( int y16t_idx_foreach_y(
y16t_idx_t idx, y16t_idx_t idx,
uint8_t χ, uint8_t χ,
int (*callback)(uint32_t, void*), int (*callback)(uint8_t, uint32_t, void*),
void *context void *context
); );