Changeset: b9ef8121cd12 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b9ef8121cd12
Modified Files:
sql/backends/monet5/vaults/lidar/lidar.c
Branch: Jun2016
Log Message:
print_lidar_header() & LIDARloadTable() use correct types and format strings
found by Intel icc compiler
diffs (97 lines):
diff --git a/sql/backends/monet5/vaults/lidar/lidar.c
b/sql/backends/monet5/vaults/lidar/lidar.c
--- a/sql/backends/monet5/vaults/lidar/lidar.c
+++ b/sql/backends/monet5/vaults/lidar/lidar.c
@@ -58,7 +58,7 @@ void print_lidar_header(FILE *file, LASH
unsigned int nVLR = 0;
int i = 0;
- char minor, major;
+ unsigned char minor, major;
pszSignature = LASHeader_GetFileSignature(header);
pszProjectId = LASHeader_GetProjectId(header);
@@ -83,12 +83,12 @@ void print_lidar_header(FILE *file, LASH
LASError_Print("File signature is not 'LASF'... aborting");
exit(1);
}
- fprintf(file, " Version: %d.%d\n", major, minor);
+ fprintf(file, " Version: %hhu.%hhu\n", major, minor);
- fprintf(file, " Source ID: %d\n",
+ fprintf(file, " Source ID: %hu\n",
LASHeader_GetFileSourceId(header) ) ;
- fprintf(file, " Reserved: %d\n",
+ fprintf(file, " Reserved: %hu\n",
LASHeader_GetReserved(header) );
fprintf(file, " Project ID/GUID: '%s'\n",
@@ -100,26 +100,26 @@ void print_lidar_header(FILE *file, LASH
fprintf(file, " Generating Software: '%s'\n",
pszSoftwareId);
- fprintf(file, " File Creation Day/Year: %d/%d\n",
+ fprintf(file, " File Creation Day/Year: %hu/%hu\n",
LASHeader_GetCreationDOY(header),
LASHeader_GetCreationYear(header));
- fprintf(file, " Header Size %d\n",
+ fprintf(file, " Header Size %hu\n",
LASHeader_GetHeaderSize(header));
- fprintf(file, " Offset to Point Data %d\n",
+ fprintf(file, " Offset to Point Data %u\n",
LASHeader_GetDataOffset(header));
- fprintf(file, " Number Var. Length Records %d\n",
+ fprintf(file, " Number Var. Length Records %u\n",
LASHeader_GetRecordsCount(header));
- fprintf(file, " Point Data Format %d\n",
+ fprintf(file, " Point Data Format %hhu\n",
LASHeader_GetDataFormatId(header));
- fprintf(file, " Point Data Record Length %d\n",
+ fprintf(file, " Point Data Record Length %hu\n",
LASHeader_GetDataRecordLength(header));
- fprintf(file, " Number of Point Records %d\n",
+ fprintf(file, " Number of Point Records %u\n",
LASHeader_GetPointRecordsCount(header));
fprintf(file, " Number of Points by Return %u %u %u %u %u\n",
@@ -177,7 +177,7 @@ void print_lidar_header(FILE *file, LASH
fprintf(file, " User: '%s' - Description: '%s'\n", pszVLRUser,
pszVLRDescription);
- fprintf(file, " ID: %d Length: %d\n\n", nVLRRecordId,
nVLRLength);
+ fprintf(file, " ID: %hu Length: %hu\n\n", nVLRRecordId,
nVLRLength);
MT_lock_set(&mt_lidar_lock);
LASVLR_Destroy(pVLR);
@@ -1013,16 +1013,16 @@ str LIDARloadTable(Client cntxt, MalBlkP
"X (raw) : %f (%ld)\n"
"Z (raw) : %f (%ld)\n"
"Z (raw) : %f (%ld)\n"
- "intensity : %d\n"
- "return number : %d\n"
- "number of returns : %d\n"
- "scan direction : %d\n"
- "flight line edge : %d\n"
- "scan flags : %d\n"
- "classification : %d\n"
+ "intensity : %hu\n"
+ "return number : %hu\n"
+ "number of returns : %hu\n"
+ "scan direction : %hu\n"
+ "flight line edge : %hu\n"
+ "scan flags : %hhu\n"
+ "classification : %hhu\n"
"time : %f\n"
- "scan angle rank : %d\n"
- "point source id : %d\n",
+ "scan angle rank : %hhd\n"
+ "point source id : %hu\n",
i, x, rawx, y, rawy, z, rawz,
intensity, returnno, noofreturns,
scandir, flightline, flags, class,
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
