lin-epics-modules/ADAndor
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor changes to avoid compiler warnings

Browse Source 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15599 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
This commit is contained in:
rivers
2012-12-03 22:02:24 +00:00
parent 962ad7401b
commit e47cc1df85
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ADApp/andorSrc/andorCCD.cpp
View File

@@ -1089,6 +1089,7 @@ void AndorCCD::dataTask(void)
epicsInt32 arrayCallbacks;
epicsInt32 sizeX, sizeY;
NDDataType_t dataType;
int itemp;
at_32 firstImage, lastImage;
at_32 validFirst, validLast;
size_t dims[2];
@@ -1131,7 +1132,7 @@ void AndorCCD::dataTask(void)
continue;
}
//Read some parameters
getIntegerParam(NDDataType, (epicsInt32*)&dataType);
getIntegerParam(NDDataType, &itemp); dataType = (NDDataType_t)itemp;
getIntegerParam(NDAutoSave, &autoSave);
getIntegerParam(NDArrayCallbacks, &arrayCallbacks);
getIntegerParam(NDArraySizeX, &sizeX);
@@ -1251,6 +1252,7 @@ void AndorCCD::saveDataFrame(int frameNumber)
char *errorString = NULL;
int fileFormat;
NDDataType_t dataType;
int itemp;
int FITSType=0;
char fullFileName[MAX_FILENAME_LEN];
char palFilePath[MAX_FILENAME_LEN];
@@ -1287,7 +1289,7 @@ void AndorCCD::saveDataFrame(int frameNumber)
"%s, SaveAsRaw(%s, 1)\n", functionName, fullFileName);
checkStatus(SaveAsRaw(fullFileName, 1));
} else if (fileFormat == AFFFITS) {
getIntegerParam(NDDataType, (epicsInt32*)&dataType);
getIntegerParam(NDDataType, &itemp); dataType = (NDDataType_t)itemp;
if (dataType == NDUInt16) FITSType=0;
else if (dataType== NDUInt32) FITSType=1;
asynPrint(this->pasynUserSelf, ASYN_TRACE_FLOW,