fix issue #150

adokter · Jul 28, 2020 · 4adfaa7 · 4adfaa7
1 parent e6f8908
commit 4adfaa7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/lib/librender.c b/lib/librender.c
@@ -765,7 +765,6 @@ PolarVolume_t* PolarVolume_selectScansByScanUse(PolarVolume_t* volume, vol2birdS
  * @return a polar scan
  */
 PolarScan_t* PolarVolume_getScanClosestToElevation_vol2bird(PolarVolume_t* volume, double elev){
-    int iScan;
     int nScans;
     double elevDifference = 1000;
     double elevDifferenceCandidate = 1000;
@@ -798,7 +797,7 @@ PolarScan_t* PolarVolume_getScanClosestToElevation_vol2bird(PolarVolume_t* volum
             scan = scanCandidate;
         }
     }
-        
+
     return(scan);
 }
 

diff --git a/lib/libvol2bird.c b/lib/libvol2bird.c
@@ -1947,6 +1947,7 @@ static int getListOfSelectedGates(PolarScan_t* scan, vol2birdScanUse_t scanUse,
 
 int vol2birdLoadClutterMap(PolarVolume_t* volume, char* file, float rangeMax){
     PolarVolume_t* clutVol = NULL;
+
     clutVol = vol2birdGetVolume(&file, 1, rangeMax,1);
 
     if(clutVol == NULL){
@@ -1983,8 +1984,12 @@ int vol2birdLoadClutterMap(PolarVolume_t* volume, char* file, float rangeMax){
         scan = PolarVolume_getScan(volume, iScan);
 
         // extract the cluttermap scan parameter closest in elevation
-        elev = PolarScan_getElangle(scan); 	
-        clutScan = PolarVolume_getScanClosestToElevation_vol2bird(clutVol,elev);
+        elev = PolarScan_getElangle(scan);
+
+        //FIXME: here PolarVolume_getScanClosestToElevation_vol2bird leads to a segmentation fault. It finds the correct scan, but
+        //any operation here on the pointer leads to segfault...
+        //clutScan = PolarVolume_getScanClosestToElevation_vol2bird(clutVol,elev);
+        clutScan = PolarVolume_getScanClosestToElevation(clutVol,elev,0);
         param = PolarScan_getParameter(clutScan,CLUTNAME);
 
         if(param == NULL){

diff --git a/src/vol2bird.c b/src/vol2bird.c
@@ -287,12 +287,12 @@ int main(int argc, char** argv) {
 
     volume = vol2birdGetVolume(fileIn, nInputFiles, 1000000,1);
     //volume = vol2birdGetVolume(fileIn, nInputFiles, alldata.misc.rCellMax,1);
-        
+
     if (volume == NULL) {
         fprintf(stderr,"Error: failed to read radar volume\n");
         return -1;
     }
-    
+
    // loading static clutter map upon request
     if (alldata.options.useClutterMap){
         int clutterSuccessful = vol2birdLoadClutterMap(volume, alldata.options.clutterMap,alldata.misc.rCellMax) == 0;