Merge branch 'master' into maverick

This commit is contained in:
2016-01-26 10:56:19 +01:00
116 changed files with 7295 additions and 1935 deletions

View File

@ -491,8 +491,8 @@ static int TASUBHeader(pScanData self)
start with the scan variables
*/
if (pTAS->iPOL >= 0) {
strcpy(pBueffel, "FORMT: (I4,I4,");
strcpy(pHeader, " PNT PAL");
strcpy(pBueffel, "FORMT: (I3,1X,I3,1X,");
strcpy(pHeader, " PNT PAL");
} else {
strcpy(pBueffel, "FORMT: (I4,1X,");
strcpy(pHeader, " PNT ");
@ -587,7 +587,7 @@ static int TASUBScanPoint(pScanData self, int iPoint)
write point number
*/
if (pTAS->iPOL >= 0) {
snprintf(pBueffel,sizeof(pBueffel)-1, "%3d %3d", iPoint + 1, pTAS->iPOL);
snprintf(pBueffel,sizeof(pBueffel)-1, "%3d %3d ", iPoint + 1, pTAS->iPOL);
} else {
snprintf(pBueffel,sizeof(pBueffel)-1, "%4d ", iPoint + 1);
}