Merge remote-tracking branch 'upstream/3.4' into merge-3.4

alalek · alalek · commit 47d476e753eb · 2022-05-23T14:53:34.000Z
diff --git a/modules/surface_matching/src/pose_3d.cpp b/modules/surface_matching/src/pose_3d.cpp
@@ -273,7 +273,6 @@ int PoseCluster3D::readPoseCluster(FILE* f)
   status = fread(&id, sizeof(int), 1, f);
   status = fread(&numVotes, sizeof(int), 1, f);
   status = fread(&numPoses, sizeof(int), 1, f);
-  fclose(f);
 
   poseList.clear();
   poseList.resize(numPoses);
@@ -283,6 +282,7 @@ int PoseCluster3D::readPoseCluster(FILE* f)
     poseList[i]->readPose(f);
   }
 
+  fclose(f);
   return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,6 @@ int PoseCluster3D::readPoseCluster(FILE* f)`
`273`	`273`	`status = fread(&id, sizeof(int), 1, f);`
`274`	`274`	`status = fread(&numVotes, sizeof(int), 1, f);`
`275`	`275`	`status = fread(&numPoses, sizeof(int), 1, f);`
`276`		`- fclose(f);`
`277`	`276`
`278`	`277`	`poseList.clear();`
`279`	`278`	`poseList.resize(numPoses);`
`@@ -283,6 +282,7 @@ int PoseCluster3D::readPoseCluster(FILE* f)`
`283`	`282`	`poseList[i]->readPose(f);`
`284`	`283`	`}`
`285`	`284`
	`285`	`+ fclose(f);`
`286`	`286`	`return 0;`
`287`	`287`	`}`
`288`	`288`