1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
|
diff -ura src/Modules/Core/Adapters/GdalAdapters/src/otbOGRFeatureWrapper.cxx src.new/Modules/Core/Adapters/GdalAdapters/src/otbOGRFeatureWrapper.cxx
--- src/Modules/Core/Adapters/GdalAdapters/src/otbOGRFeatureWrapper.cxx 2025-03-24 11:29:03.000000000 +0200
+++ src.new/Modules/Core/Adapters/GdalAdapters/src/otbOGRFeatureWrapper.cxx 2026-05-19 09:58:02.273516785 +0300
@@ -132,7 +132,7 @@
otb::ogr::FieldDefn otb::ogr::Feature::UncheckedGetFieldDefn(int index) const
{
- return FieldDefn(*m_Feature->GetFieldDefnRef(index));
+ return FieldDefn(const_cast <OGRFieldDefn &> (*m_Feature->GetFieldDefnRef(index)));
}
otb::ogr::FieldDefn otb::ogr::Feature::UncheckedGetFieldDefn(std::string const& name) const
@@ -174,7 +174,7 @@
OGRFeatureDefn& otb::ogr::Feature::UncheckedGetDefn() const
{
- return *m_Feature->GetDefnRef();
+ return const_cast <OGRFeatureDefn &> (*m_Feature->GetDefnRef());
}
/*===========================================================================*/
diff -ura src/Modules/Core/Adapters/GdalAdapters/src/otbOGRFieldWrapper.cxx src.new/Modules/Core/Adapters/GdalAdapters/src/otbOGRFieldWrapper.cxx
--- src/Modules/Core/Adapters/GdalAdapters/src/otbOGRFieldWrapper.cxx 2025-03-24 11:29:03.000000000 +0200
+++ src.new/Modules/Core/Adapters/GdalAdapters/src/otbOGRFieldWrapper.cxx 2026-05-19 09:58:02.273390698 +0300
@@ -98,7 +98,7 @@
/*=================================[ Field ]=================================*/
/*===========================================================================*/
-otb::ogr::Field::Field(otb::ogr::Feature& feature, int index) : m_Definition(*feature.ogr().GetFieldDefnRef(index)), m_Feature(feature.sptr()), m_index(index)
+otb::ogr::Field::Field(otb::ogr::Feature& feature, int index) : m_Definition(const_cast <OGRFieldDefn &> (*feature.ogr().GetFieldDefnRef(index))), m_Feature(feature.sptr()), m_index(index)
{
CheckInvariants();
}
diff -ura src/Modules/Core/Adapters/GdalAdapters/src/otbSpatialReference.cxx src.new/Modules/Core/Adapters/GdalAdapters/src/otbSpatialReference.cxx
--- src/Modules/Core/Adapters/GdalAdapters/src/otbSpatialReference.cxx 2025-03-24 11:29:03.000000000 +0200
+++ src.new/Modules/Core/Adapters/GdalAdapters/src/otbSpatialReference.cxx 2026-05-19 09:58:02.273213844 +0300
@@ -30,6 +30,7 @@
#include <sstream>
#include <stdexcept>
+#include <cassert>
namespace otb
{
diff -ura src/Modules/Core/IO/IOGDAL/src/otbGDALImageIO.cxx src.new/Modules/Core/IO/IOGDAL/src/otbGDALImageIO.cxx
--- src/Modules/Core/IO/IOGDAL/src/otbGDALImageIO.cxx 2025-03-24 11:29:03.000000000 +0200
+++ src.new/Modules/Core/IO/IOGDAL/src/otbGDALImageIO.cxx 2026-05-19 09:58:52.581512597 +0300
@@ -278,7 +278,7 @@
bool GDALImageIO::GetSubDatasetInfo(std::vector<std::string>& names, std::vector<std::string>& desc)
{
// Note: we assume that the subdatasets are in order : SUBDATASET_ID_NAME, SUBDATASET_ID_DESC, SUBDATASET_ID+1_NAME, SUBDATASET_ID+1_DESC
- char** papszMetadata;
+ CSLConstList papszMetadata;
papszMetadata = m_Dataset->GetDataSet()->GetMetadata("SUBDATASETS");
// Have we find some dataSet ?
@@ -436,7 +436,7 @@
{
// this happen in the case of a hdf file with SUBDATASETS
// Note: we assume that the datasets are in order
- char** papszMetadata;
+ CSLConstList papszMetadata;
papszMetadata = m_Dataset->GetDataSet()->GetMetadata("SUBDATASETS");
// TODO: we might want to keep the list of names somewhere, at least the number of datasets
std::vector<std::string> names;
@@ -741,7 +741,7 @@
if (m_NumberOfDimensions == 3)
m_Spacing[2] = 1;
- char** papszMetadata = dataset->GetMetadata(nullptr);
+ CSLConstList papszMetadata = dataset->GetMetadata(nullptr);
/* -------------------------------------------------------------------- */
/* Report general info. */
diff -ura src/Modules/Core/IO/IOGDAL/src/otbOGRIOHelper.cxx src.new/Modules/Core/IO/IOGDAL/src/otbOGRIOHelper.cxx
--- src/Modules/Core/IO/IOGDAL/src/otbOGRIOHelper.cxx 2025-03-24 11:29:03.000000000 +0200
+++ src.new/Modules/Core/IO/IOGDAL/src/otbOGRIOHelper.cxx 2026-05-19 09:58:02.273712063 +0300
@@ -213,7 +213,7 @@
{
if (ogr::IsFieldSetAndNotNull(feature, fieldNum))
{
- kwl.AddField(feature->GetFieldDefnRef(fieldNum), feature->GetRawFieldRef(fieldNum));
+ kwl.AddField(const_cast <OGRFieldDefn*> (feature->GetFieldDefnRef(fieldNum)), feature->GetRawFieldRef(fieldNum));
}
}
@@ -895,7 +895,7 @@
ogrFeature = OGRFeature::CreateFeature(ogrCurrentLayer->GetLayerDefn());
// ogrFeature->SetField("Name", dataNode->GetNodeId());
- ogrFeature->GetDefnRef()->SetGeomType(wkbMultiPoint);
+ const_cast<OGRFeatureDefn*>(ogrFeature->GetDefnRef())->SetGeomType(wkbMultiPoint);
ogrFeature->SetGeometry(ogrMultiPoint);
if (ogrCurrentLayer->CreateFeature(ogrFeature) != OGRERR_NONE)
@@ -916,7 +916,7 @@
ogrFeature = OGRFeature::CreateFeature(ogrCurrentLayer->GetLayerDefn());
// ogrFeature->SetField("Name", dataNode->GetNodeId());
- ogrFeature->GetDefnRef()->SetGeomType(wkbMultiLineString);
+ const_cast<OGRFeatureDefn*>(ogrFeature->GetDefnRef())->SetGeomType(wkbMultiLineString);
ogrFeature->SetGeometry(ogrMultiLineString);
if (ogrCurrentLayer->CreateFeature(ogrFeature) != OGRERR_NONE)
@@ -937,12 +937,12 @@
ogrFeature = OGRFeature::CreateFeature(ogrCurrentLayer->GetLayerDefn());
// ogrFeature->SetField("Name", dataNode->GetNodeId());
#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3,9,0)
- ogrFeature->GetDefnRef()->Unseal(true);
+ const_cast<OGRFeatureDefn*>(ogrFeature->GetDefnRef())->Unseal(true);
#endif
- ogrFeature->GetDefnRef()->SetGeomType(wkbMultiPolygon);
+ const_cast<OGRFeatureDefn*>(ogrFeature->GetDefnRef())->SetGeomType(wkbMultiPolygon);
ogrFeature->SetGeometry(ogrMultiPolygon);
#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3,9,0)
- ogrFeature->GetDefnRef()->Seal(true);
+ const_cast<OGRFeatureDefn*>(ogrFeature->GetDefnRef())->Seal(true);
#endif
if (ogrCurrentLayer->CreateFeature(ogrFeature) != OGRERR_NONE)
{
@@ -962,7 +962,7 @@
ogrFeature = OGRFeature::CreateFeature(ogrCurrentLayer->GetLayerDefn());
// ogrFeature->SetField("Name", dataNode->GetNodeId());
- ogrFeature->GetDefnRef()->SetGeomType(wkbGeometryCollection);
+ const_cast<OGRFeatureDefn*>(ogrFeature->GetDefnRef())->SetGeomType(wkbGeometryCollection);
ogrFeature->SetGeometry(ogrCollectionGeometry);
if (ogrCurrentLayer->CreateFeature(ogrFeature) != OGRERR_NONE)
@@ -1226,7 +1226,7 @@
OGRFeature* ogrFeature;
ogrFeature = OGRFeature::CreateFeature(ogrCurrentLayer->GetLayerDefn());
- ogrFeature->GetDefnRef()->SetGeomType(wkbMultiPoint);
+ const_cast<OGRFeatureDefn*>(ogrFeature->GetDefnRef())->SetGeomType(wkbMultiPoint);
ogrFeature->SetGeometry(ogrMultiPoint);
if (ogrCurrentLayer->CreateFeature(ogrFeature) != OGRERR_NONE)
@@ -1244,7 +1244,7 @@
OGRFeature* ogrFeature;
ogrFeature = OGRFeature::CreateFeature(ogrCurrentLayer->GetLayerDefn());
- ogrFeature->GetDefnRef()->SetGeomType(wkbMultiLineString);
+ const_cast<OGRFeatureDefn*>(ogrFeature->GetDefnRef())->SetGeomType(wkbMultiLineString);
ogrFeature->SetGeometry(ogrMultiLineString);
if (ogrCurrentLayer->CreateFeature(ogrFeature) != OGRERR_NONE)
@@ -1261,7 +1261,7 @@
OGRFeature* ogrFeature;
ogrFeature = OGRFeature::CreateFeature(ogrCurrentLayer->GetLayerDefn());
- ogrFeature->GetDefnRef()->SetGeomType(wkbMultiPolygon);
+ const_cast<OGRFeatureDefn*>(ogrFeature->GetDefnRef())->SetGeomType(wkbMultiPolygon);
ogrFeature->SetGeometry(ogrMultiPolygon);
if (ogrCurrentLayer->CreateFeature(ogrFeature) != OGRERR_NONE)
@@ -1278,7 +1278,7 @@
OGRFeature* ogrFeature;
ogrFeature = OGRFeature::CreateFeature(ogrCurrentLayer->GetLayerDefn());
- ogrFeature->GetDefnRef()->SetGeomType(wkbGeometryCollection);
+ const_cast<OGRFeatureDefn*>(ogrFeature->GetDefnRef())->SetGeomType(wkbGeometryCollection);
ogrFeature->SetGeometry(ogrCollectionGeometry);
if (ogrCurrentLayer->CreateFeature(ogrFeature) != OGRERR_NONE)
diff -ura src/Modules/Core/IO/IOGDAL/src/otbOGRVectorDataIO.cxx src.new/Modules/Core/IO/IOGDAL/src/otbOGRVectorDataIO.cxx
--- src/Modules/Core/IO/IOGDAL/src/otbOGRVectorDataIO.cxx 2025-03-24 11:29:03.000000000 +0200
+++ src.new/Modules/Core/IO/IOGDAL/src/otbOGRVectorDataIO.cxx 2026-05-19 09:58:02.273933206 +0300
@@ -102,7 +102,7 @@
DataTreePointerType tree = data->GetDataTree();
DataNodePointerType root = tree->GetRoot()->Get();
- OGRSpatialReference* oSRS = nullptr;
+ const OGRSpatialReference* oSRS = nullptr;
// We take the assumption that the spatial reference is common to all layers
oSRS = m_DataSource->GetLayer(0)->GetSpatialRef();
diff -ura src/Modules/Core/IO/TestKernel/src/otbTestHelper.cxx src.new/Modules/Core/IO/TestKernel/src/otbTestHelper.cxx
--- src/Modules/Core/IO/TestKernel/src/otbTestHelper.cxx 2025-03-24 11:29:03.000000000 +0200
+++ src.new/Modules/Core/IO/TestKernel/src/otbTestHelper.cxx 2026-05-19 09:58:02.274215157 +0300
@@ -2002,7 +2002,7 @@
{
for (int iField = 0; iField < feature->GetFieldCount(); iField++)
{
- OGRFieldDefn* poFDefn = feature->GetDefnRef()->GetFieldDefn(iField);
+ OGRFieldDefn* poFDefn = const_cast<OGRFieldDefn*>(feature->GetDefnRef()->GetFieldDefn(iField));
fprintf(fpOut, " %s (%s) = ", poFDefn->GetNameRef(), OGRFieldDefn::GetFieldTypeName(poFDefn->GetType()));
diff -ura src/Modules/Core/Metadata/src/otbCosmoImageMetadataInterface.cxx src.new/Modules/Core/Metadata/src/otbCosmoImageMetadataInterface.cxx
--- src/Modules/Core/Metadata/src/otbCosmoImageMetadataInterface.cxx 2025-03-24 11:29:03.000000000 +0200
+++ src.new/Modules/Core/Metadata/src/otbCosmoImageMetadataInterface.cxx 2026-05-19 09:58:46.476995460 +0300
@@ -50,7 +50,7 @@
std::vector<std::map<std::string, std::string> > metadataBands;
GDALDataset * dataset = static_cast<GDALDataset*>(GDALOpen(file.c_str(), GA_ReadOnly));
// Metadata for dataset
- char** papszMetadata = dataset->GetMetadata(nullptr);
+ CSLConstList papszMetadata = dataset->GetMetadata(nullptr);
for (int cpt = 0; papszMetadata[cpt] != nullptr; ++cpt)
{
std::string key, value;
|