moved deprecated aliases to bottom of dataset.h
							parent
							
								
									75d5409d78
								
							
						
					
					
						commit
						aed74f79d7
					
				|  | @ -12,7 +12,9 @@ | |||
| /**
 | ||||
|  * @file dataset.h | ||||
|  * @date Jan 22, 2010 | ||||
|  * @author nikai, Luca Carlone | ||||
|  * @author Ni Kai | ||||
|  * @author Luca Carlone | ||||
|  * @author Varun Agrawal | ||||
|  * @brief utility functions for loading datasets | ||||
|  */ | ||||
| 
 | ||||
|  | @ -216,15 +218,6 @@ struct SfmData { | |||
|   } | ||||
| }; | ||||
| 
 | ||||
| /// Aliases for backwards compatibility
 | ||||
| #ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V4 | ||||
| typedef SfmMeasurement SfM_Measurement; | ||||
| typedef SiftIndex SIFT_Index; | ||||
| typedef SfmTrack SfM_Track; | ||||
| typedef SfmCamera SfM_Camera; | ||||
| typedef SfmData SfM_data; | ||||
| #endif | ||||
| 
 | ||||
| /**
 | ||||
|  * @brief This function parses a bundler output file and stores the data into a | ||||
|  * SfmData structure | ||||
|  | @ -307,4 +300,13 @@ GTSAM_EXPORT Values initialCamerasEstimate(const SfmData& db); | |||
|  */ | ||||
| GTSAM_EXPORT Values initialCamerasAndPointsEstimate(const SfmData& db); | ||||
| 
 | ||||
| /// Aliases for backwards compatibility
 | ||||
| #ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V4 | ||||
| typedef SfmMeasurement SfM_Measurement; | ||||
| typedef SiftIndex SIFT_Index; | ||||
| typedef SfmTrack SfM_Track; | ||||
| typedef SfmCamera SfM_Camera; | ||||
| typedef SfmData SfM_data; | ||||
| #endif | ||||
| 
 | ||||
| } // namespace gtsam
 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue