Merge branch 'master' of github.com:introlab/rtabmap into gtest

This commit is contained in:
matlabbe
2026-05-27 19:41:49 -07:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -4421,7 +4421,7 @@ bool Rtabmap::process(
} }
if(!_publishLastSignatureData) if(!_publishLastSignatureData)
{ {
lastSignatureData.sensorData().clearCompressedData(); lastSignatureData.sensorData().clearCompressedData(true, true, true, false);
lastSignatureData.sensorData().clearRawData(); lastSignatureData.sensorData().clearRawData();
} }
if(!_rawDataKept) if(!_rawDataKept)
+1 -1
View File
@@ -5607,7 +5607,7 @@ void PreferencesDialog::updateGlobalDescriptorVisibility()
void PreferencesDialog::updateAvailableMarkerDictionaries() void PreferencesDialog::updateAvailableMarkerDictionaries()
{ {
Qt::ItemFlags enableFlags = Qt::ItemIsEnabled | Qt::ItemIsSelectable; Qt::ItemFlags enableFlags = Qt::ItemFlags(Qt::ItemIsEnabled) | Qt::ItemIsSelectable;
for(int i=0;i<_ui->MarkerDictionary->count();++i) { for(int i=0;i<_ui->MarkerDictionary->count();++i) {
_ui->MarkerDictionary->setItemData(i, QVariant(static_cast<int>(enableFlags)), Qt::UserRole - 1); _ui->MarkerDictionary->setItemData(i, QVariant(static_cast<int>(enableFlags)), Qt::UserRole - 1);
} }