Skip to content

Commit e73d171

Browse files
author
deseilligny
committed
Pb Compil integration
1 parent 2a9f9b8 commit e73d171

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

MMVII/include/MMVII_InstrumentalBlock.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,8 @@ class cIrbComp_TimeS : public cMemCheck
254254
friend cIrbComp_Block;
255255

256256
cIrbComp_TimeS (const cIrbComp_Block &);
257-
const cIrbComp_CamSet & SetCams() const; //< Accessor
257+
const cIrbComp_CamSet & SetCams() const; //< Accessor
258+
const cIrbComp_Block & CompBlock() const; //< Accessor
258259
private :
259260
cIrbComp_TimeS(const cIrbComp_TimeS&) = delete;
260261
const cIrbComp_Block & mCompBlock;

MMVII/src/BundleAdjustment/Bundle_LidarPhotogra.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ void cBA_LidarPhotogra::AddPatchCorrel
283283
*/
284284

285285
std::vector<tREAL8> aVTmp = aVMoy.ToStdVect(); // push first values of normalized patch
286-
size_t aK0Im = aVTmp.size();
286+
int aK0Im = aVTmp.size();
287287

288288
// push the initial values of Aj Bj
289289
for (const auto & aVRad : aListVRad)

MMVII/src/Instrumental/cInstrumentalBloc.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ cIrbComp_TimeS::cIrbComp_TimeS (const cIrbComp_Block & aCompBlock) :
3131
}
3232

3333
const cIrbComp_CamSet & cIrbComp_TimeS::SetCams() const {return mSetCams;}
34+
const cIrbComp_Block & cIrbComp_TimeS::CompBlock() const {return mCompBlock;}
3435

3536
/* *************************************************************** */
3637
/* */
@@ -324,7 +325,7 @@ class cAppli_EditBlockInstr : public cMMVII_Appli
324325
cCollecSpecArg2007 & ArgObl(cCollecSpecArg2007 & anArgObl) override;
325326
cCollecSpecArg2007 & ArgOpt(cCollecSpecArg2007 & anArgOpt) override;
326327

327-
std::vector<std::string> Samples() const ;
328+
std::vector<std::string> Samples() const override;
328329

329330
private :
330331
cPhotogrammetricProject mPhProj;

MMVII/src/Mappings/cManifold.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ template <const int DimM,const int DimE> class cManifold
3131
/// return TgSpace
3232
virtual tTgSp TgSpace(const tPtE &) const ;
3333
/// Given a point, gives an approximate value of the projection
34-
virtual tPtE ApproxProj(const tPtE &) const ;
35-
///
34+
virtual tPtE ApproxProj(const tPtE &) const = 0 ;
35+
/// Return the projection on the manifold, default iterative method
3636
virtual tPtE Proj(const tPtE &) const ;
3737
private :
3838
int mNbMap;

MMVII/src/UtiMaths/Polynoms.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ template <class Type> cPolynom<Type> cPolynom<Type>::RandomPolyg(size_t aDeg,c
355355
cPolynom<Type> aRes(aDeg);
356356

357357
for (size_t aD=0 ; aD<=aDeg ; aD++)
358-
aRes.mVCoeffs.at(aD) = RandUnif_C() * std::pow(aAmpl,-aD);
358+
aRes.mVCoeffs.at(aD) = RandUnif_C() * std::pow(aAmpl,-(int(aD)));
359359

360360
return aRes;
361361
}

0 commit comments

Comments
 (0)