- Added separate drivable motors for four circle H, K, L
- Added a listen mode to commandlog in order to support the batchEditor - Some small fixes to exe* for BatchEditor
This commit is contained in:
10
fomerge.c
10
fomerge.c
@ -488,12 +488,12 @@ static int *calculateSum(HistInt *data, int iDet, int iTime)
|
||||
int i, j, iIndex;
|
||||
int *sum = NULL;
|
||||
|
||||
sum = (int *)malloc(iDet*sizeof(int));
|
||||
sum = (int *)malloc(iTime*sizeof(int));
|
||||
if(!sum)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
memset(sum,0,iDet*sizeof(int));
|
||||
memset(sum,0,iTime*sizeof(int));
|
||||
|
||||
for(i = 0; i < iDet; i++)
|
||||
{
|
||||
@ -593,14 +593,14 @@ static int putElastic(SicsInterp *pSics, SConnection *pCon,
|
||||
/*
|
||||
copy sum to make compiler happy
|
||||
*/
|
||||
lSum = (long *)malloc(iDet*sizeof(long));
|
||||
lSum = (long *)malloc(iTime*sizeof(long));
|
||||
if(lSum == NULL)
|
||||
{
|
||||
SCWrite(pCon,"ERROR: out of memory in putElastc",eError);
|
||||
SCWrite(pCon,"ERROR: out of memory in putElastic",eError);
|
||||
free(sum);
|
||||
return NX_ERROR;
|
||||
}
|
||||
for(i = 0; i < iDet; i++)
|
||||
for(i = 0; i < iTime; i++)
|
||||
{
|
||||
lSum[i] = sum[i];
|
||||
}
|
||||
|
Reference in New Issue
Block a user