archive-gh-me/pointcloud
1
0
Fork 0
mirror of https://github.com/pgpointcloud/pointcloud.git synced 2025-12-08 20:36:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101 from mbredif/patch-2

Browse Source 
Enable valgrind checks in Travis, fix reported errors and leaks.
This commit is contained in:
Sandro Santilli 2016-03-05 15:55:06 +01:00
commit e6a8e062a9
4 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -2,7 +2,7 @@ language: c
before_install:
- sudo apt-get update
- sudo apt-get install -q postgresql-server-dev-9.3 libcunit1-dev
- sudo apt-get install -q postgresql-server-dev-9.3 libcunit1-dev valgrind
addons:
postgresql: "9.3" # for "installcheck"
@ -13,5 +13,6 @@ script:
- ./configure CFLAGS="-Wall -O2 -g"
- make
- make check
- valgrind --leak-check=full --error-exitcode=1 lib/cunit/cu_tester
- sudo make install
- make installcheck || { cat pgsql/regression.diffs && false; }

6
lib/cunit/cu_pc_bytes.c
View File

@ -523,9 +523,9 @@ test_uncompressed_filter()
CU_ASSERT_EQUAL(fpcb.bytes[0], 'c');
CU_ASSERT_EQUAL(fpcb.size, 4);
CU_ASSERT_EQUAL(fpcb.npoints, 4);
pc_bytes_free(fpcb);
// pc_bytes_free(epcb);
pc_bytes_free(fpcb);
pc_bitmap_free(map1);
// pc_bytes_free(epcb);
}

10
lib/pc_schema.c
View File

@ -402,6 +402,7 @@ pc_schema_from_xml(const char *xml_str, PCSCHEMA **schema)
xml_doc = xmlReadMemory(xml_ptr, xml_size, NULL, NULL, 0);
if ( ! xml_doc )
{
xmlCleanupParser();
pcwarn("unable to parse schema XML");
return PC_FAILURE;
}
@ -416,6 +417,7 @@ pc_schema_from_xml(const char *xml_str, PCSCHEMA **schema)
if( ! xpath_ctx )
{
xmlFreeDoc(xml_doc);
xmlCleanupParser();
pcwarn("unable to create new XPath context to read schema XML");
return PC_FAILURE;
}
@ -430,6 +432,7 @@ pc_schema_from_xml(const char *xml_str, PCSCHEMA **schema)
{
xmlXPathFreeContext(xpath_ctx);
xmlFreeDoc(xml_doc);
xmlCleanupParser();
pcwarn("unable to evaluate xpath expression \"%s\" against schema XML", xpath_str);
return PC_FAILURE;
}
@ -509,6 +512,7 @@ pc_schema_from_xml(const char *xml_str, PCSCHEMA **schema)
xmlXPathFreeObject(xpath_obj);
xmlXPathFreeContext(xpath_ctx);
xmlFreeDoc(xml_doc);
xmlCleanupParser();
pc_schema_free(s);
pcwarn("schema dimension at position \"%d\" is declared twice", d->position + 1, ndims);
return PC_FAILURE;
@ -528,7 +532,8 @@ pc_schema_from_xml(const char *xml_str, PCSCHEMA **schema)
xmlXPathFreeObject(xpath_obj);
xmlXPathFreeContext(xpath_ctx);
xmlFreeDoc(xml_doc);
pc_schema_free(s);
xmlCleanupParser();
pc_schema_free(s);
pcwarn("schema dimension states position \"%d\", but number of XML dimensions is \"%d\"", d->position + 1, ndims);
return PC_FAILURE;
}
@ -549,6 +554,7 @@ pc_schema_from_xml(const char *xml_str, PCSCHEMA **schema)
{
xmlXPathFreeContext(xpath_ctx);
xmlFreeDoc(xml_doc);
xmlCleanupParser();
pcwarn("unable to evaluate xpath expression \"%s\" against schema XML", xpath_metadata_str);
return PC_FAILURE;
}
@ -588,6 +594,7 @@ pc_schema_from_xml(const char *xml_str, PCSCHEMA **schema)
xmlXPathFreeContext(xpath_ctx);
xmlFreeDoc(xml_doc);
xmlCleanupParser();
return PC_SUCCESS;
}
@ -651,4 +658,3 @@ pc_schema_get_size(const PCSCHEMA *s)
{
return s->size;
}

24
lib/pc_val.c
View File

@ -121,12 +121,12 @@ pc_double_from_ptr(const uint8_t *ptr, uint32_t interpretation)
return 0.0;
}
#define CLAMP(v,min,max,t) do { \
#define CLAMP(v,min,max,t,format) do { \
if ( v > max ) { \
pcwarn("Value %g truncated to %g to fit in "t, v, max); \
pcwarn("Value %g truncated to "format" to fit in "t, v, max); \
v = max; \
} else if ( val < min ) { \
pcwarn("Value %g truncated to %g to fit in "t, v, min); \
} else if ( v < min ) { \
pcwarn("Value %g truncated to "format" to fit in "t, v, min); \
v = min; \
} \
} while(0)
@ -139,7 +139,7 @@ pc_double_to_ptr(uint8_t *ptr, uint32_t interpretation, double val)
case PC_UINT8:
{
uint8_t v;
CLAMP(val, 0, UINT8_MAX, "uint8_t");
CLAMP(val, 0, UINT8_MAX, "uint8_t","%u");
v = (uint8_t)lround(val);
memcpy(ptr, &(v), sizeof(uint8_t));
break;
@ -147,7 +147,7 @@ pc_double_to_ptr(uint8_t *ptr, uint32_t interpretation, double val)
case PC_UINT16:
{
uint16_t v;
CLAMP(val, 0, UINT16_MAX, "uint16_t");
CLAMP(val, 0, UINT16_MAX, "uint16_t","%u");
v = (uint16_t)lround(val);
memcpy(ptr, &(v), sizeof(uint16_t));
break;
@ -155,7 +155,7 @@ pc_double_to_ptr(uint8_t *ptr, uint32_t interpretation, double val)
case PC_UINT32:
{
uint32_t v;
CLAMP(val, 0, UINT32_MAX, "uint32");
CLAMP(val, 0, UINT32_MAX, "uint32","%u");
v = (uint32_t)lround(val);
memcpy(ptr, &(v), sizeof(uint32_t));
break;
@ -163,7 +163,7 @@ pc_double_to_ptr(uint8_t *ptr, uint32_t interpretation, double val)
case PC_UINT64:
{
uint64_t v;
CLAMP(val, 0, UINT64_MAX, "uint64");
CLAMP(val, 0, UINT64_MAX, "uint64","%u");
v = (uint64_t)lround(val);
memcpy(ptr, &(v), sizeof(uint64_t));
break;
@ -171,7 +171,7 @@ pc_double_to_ptr(uint8_t *ptr, uint32_t interpretation, double val)
case PC_INT8:
{
int8_t v;
CLAMP(val, INT8_MIN, INT8_MAX, "int8");
CLAMP(val, INT8_MIN, INT8_MAX, "int8","%d");
v = (int8_t)lround(val);
memcpy(ptr, &(v), sizeof(int8_t));
break;
@ -179,7 +179,7 @@ pc_double_to_ptr(uint8_t *ptr, uint32_t interpretation, double val)
case PC_INT16:
{
int16_t v;
CLAMP(val, INT16_MIN, INT16_MAX, "int16");
CLAMP(val, INT16_MIN, INT16_MAX, "int16","%d");
v = (int16_t)lround(val);
memcpy(ptr, &(v), sizeof(int16_t));
break;
@ -187,7 +187,7 @@ pc_double_to_ptr(uint8_t *ptr, uint32_t interpretation, double val)
case PC_INT32:
{
int32_t v;
CLAMP(val, INT32_MIN, INT32_MAX, "int32");
CLAMP(val, INT32_MIN, INT32_MAX, "int32","%d");
v = (int32_t)lround(val);
memcpy(ptr, &(v), sizeof(int32_t));
break;
@ -195,7 +195,7 @@ pc_double_to_ptr(uint8_t *ptr, uint32_t interpretation, double val)
case PC_INT64:
{
int64_t v;
CLAMP(val, INT64_MIN, INT64_MAX, "int64");
CLAMP(val, INT64_MIN, INT64_MAX, "int64","%d");
v = (int64_t)lround(val);
memcpy(ptr, &(v), sizeof(int64_t));
break;