Changeset: 2d9844960a5d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2d9844960a5d
Modified Files:
geom/monetdb5/geom.c
Branch: geo
Log Message:
changed format in sprint to the correct one for unsinged int
diffs (84 lines):
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -640,7 +640,7 @@ static str forceDimGeometry(GEOSGeometry
case wkbMultiPoint:
case wkbMultiLineString:
case wkbMultiPolygon:
- case wkbGeometryCollection:
+ case wkbGeometryCollection:
if((err = forceDimMultiGeometry(outGeometry,
geosGeometry, dim)) != MAL_SUCCEED){
str msg = createException(MAL, "geom.ForceDim",
"%s",err);
GDKfree(err);
@@ -973,7 +973,7 @@ static str segmentizeGeometry(GEOSGeomet
case wkbMultiPoint:
case wkbMultiLineString:
case wkbMultiPolygon:
- case wkbGeometryCollection:
+ case wkbGeometryCollection:
if((err = segmentizeMultiGeometry(outGeometry,
geosGeometry, sz)) != MAL_SUCCEED){
str msg = createException(MAL,
"geom.Segmentize", "%s",err);
GDKfree(err);
@@ -1261,7 +1261,7 @@ static str translateGeometry(GEOSGeometr
case wkbMultiPoint:
case wkbMultiLineString:
case wkbMultiPolygon:
- case wkbGeometryCollection:
+ case wkbGeometryCollection:
if((err = translateMultiGeometry(outGeometry,
geosGeometry, dx, dy, dz)) != MAL_SUCCEED){
str msg = createException(MAL,
"geom.Translate", "%s",err);
GDKfree(err);
@@ -1379,7 +1379,7 @@ static str dumpGeometriesSingle(BAT* idB
newPath =
(char*)GDKmalloc((pathLength+lvlDigitsNum+1)*sizeof(char));
strcpy(newPath, path);
- sprintf(newPath+pathLength, "%d", *lvl);
+ sprintf(newPath+pathLength, "%u", *lvl);
} else {
//remove the comma at the end of the path
pathLength--;
@@ -1415,7 +1415,7 @@ static str dumpGeometriesMulti(BAT* idBA
newPath =
(char*)GDKmalloc((pathLength+lvlDigitsNum+extraLength+1)*sizeof(char));
strcpy(newPath, path);
- lvlDigitsNum = sprintf(newPath+pathLength, "%d", lvl);
+ lvlDigitsNum = sprintf(newPath+pathLength, "%u", lvl);
strcpy(newPath+pathLength+lvlDigitsNum, extraStr);
//*secondLevel = 0;
@@ -1547,7 +1547,7 @@ static str dumpPointsPoint(BAT* idBAT, B
newPath = (char*)GDKmalloc((pathLength+lvlDigitsNum+1)*sizeof(char));
strcpy(newPath, path);
- sprintf(newPath+pathLength, "%d", *lvl);
+ sprintf(newPath+pathLength, "%u", *lvl);
BUNappend(idBAT,newPath,TRUE);
BUNappend(geomBAT,pointWKB,TRUE);
@@ -1617,7 +1617,7 @@ static str dumpPointsPolygon(BAT* idBAT,
newPath =
(char*)GDKmalloc((pathLength+lvlDigitsNum+extraLength+1)*sizeof(char));
strcpy(newPath, path);
- lvlDigitsNum = sprintf(newPath+pathLength, "%d", *lvl);
+ lvlDigitsNum = sprintf(newPath+pathLength, "%u", *lvl);
strcpy(newPath+pathLength+lvlDigitsNum, extraStr);
GDKfree(lvlStr);
@@ -1646,7 +1646,7 @@ static str dumpPointsPolygon(BAT* idBAT,
newPath =
(char*)GDKmalloc((pathLength+lvlDigitsNum+extraLength+1)*sizeof(char));
strcpy(newPath, path);
- lvlDigitsNum = sprintf(newPath+pathLength, "%d", *lvl);
+ lvlDigitsNum = sprintf(newPath+pathLength, "%u", *lvl);
strcpy(newPath+pathLength+lvlDigitsNum, extraStr);
GDKfree(lvlStr);
@@ -1684,7 +1684,7 @@ static str dumpPointsMultiGeometry(BAT*
newPath =
(char*)GDKmalloc((pathLength+lvlDigitsNum+extraLength+1)*sizeof(char));
strcpy(newPath, path);
- lvlDigitsNum = sprintf(newPath+pathLength, "%d", lvl);
+ lvlDigitsNum = sprintf(newPath+pathLength, "%u", lvl);
strcpy(newPath+pathLength+lvlDigitsNum, extraStr);
GDKfree(lvlStr);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
