diff --git a/Code/Common/otbDrawLineSpatialObjectListFilter.txx b/Code/Common/otbDrawLineSpatialObjectListFilter.txx index b5ca273edf6f945cc4f4b5b6ab6cd601a735386d..3ae2ce89277e788740770011b2c5eb9eac6f7585 100644 --- a/Code/Common/otbDrawLineSpatialObjectListFilter.txx +++ b/Code/Common/otbDrawLineSpatialObjectListFilter.txx @@ -185,7 +185,7 @@ DrawLineSpatialObjectListFilter<TInputImage, TOutput> /** Dimensions of the buffered region*/ typename OutputImageRegionType::SizeType size = outputRegionForThread->GetSize(); - typename OutputImageRegionType::IndexType start = outputRegionForThread->GetIndex(); + //typename OutputImageRegionType::IndexType start = outputRegionForThread->GetIndex(); /** Equation of the line (Begin, End)*/ double lengthSegment = -(*otherIndex)[1] + (*indexToCrop)[1]; @@ -207,7 +207,7 @@ DrawLineSpatialObjectListFilter<TInputImage, TOutput> { /** Dimensions of the buffered region*/ - typename OutputImageRegionType::SizeType size = outputRegionForThread->GetSize(); + //typename OutputImageRegionType::SizeType size = outputRegionForThread->GetSize(); typename OutputImageRegionType::IndexType start = outputRegionForThread->GetIndex(); return (*indexToCrop)[1] < static_cast<OutputIndexValueType>(start[1]); @@ -287,8 +287,8 @@ DrawLineSpatialObjectListFilter<TInputImage, TOutput> tempIndex = *indexToCrop; /** Dimensions of the buffered region*/ - typename OutputImageRegionType::SizeType size = outputRegionForThread->GetSize(); - typename OutputImageRegionType::IndexType start = outputRegionForThread->GetIndex(); + //typename OutputImageRegionType::SizeType size = outputRegionForThread->GetSize(); + //typename OutputImageRegionType::IndexType start = outputRegionForThread->GetIndex(); /** Equation of the line (Begin, End)*/ double slope = 0.; diff --git a/Code/FeatureExtraction/otbAddCarvingPathFilter.txx b/Code/FeatureExtraction/otbAddCarvingPathFilter.txx index a6e647392317499ec41926a7c0f44088bb10a71f..8b1724c69f37ef2738ecbdf510ddc314c6a858d9 100644 --- a/Code/FeatureExtraction/otbAddCarvingPathFilter.txx +++ b/Code/FeatureExtraction/otbAddCarvingPathFilter.txx @@ -207,17 +207,17 @@ AddCarvingPathFilter<TInputImage, TInputPath, TOutputImage> typename Superclass::OutputImagePointer outputPtr = this->GetOutput(); unsigned int dir0; - unsigned int dir1; + //unsigned int dir1; if (m_Direction == 0) { dir0 = 0; - dir1 = 1; + //dir1 = 1; } else { dir0 = 1; - dir1 = 0; + //dir1 = 0; } // we need to compute the output spacing, the output image size, and the diff --git a/Code/FeatureExtraction/otbParallelLinePathListFilter.txx b/Code/FeatureExtraction/otbParallelLinePathListFilter.txx index 6cb68fe809903fa064078067e06c360047fe64f2..d11525d56d13018bf1f8a4a5481e56e36b3473d4 100644 --- a/Code/FeatureExtraction/otbParallelLinePathListFilter.txx +++ b/Code/FeatureExtraction/otbParallelLinePathListFilter.txx @@ -254,9 +254,10 @@ ParallelLinePathListFilter<TPath> ::VerifyCommonDistanceCondition(VertexType v1, VertexType v2, VertexType v3, VertexType v4) { // Compute the length of each line - double length12 = 0., length34 = 0.; + double length12 = 0.; + // double length34 = 0.; length12 = sqrt(pow((v2[0] - v1[0]), 2) + pow((v2[1] - v1[1]), 2)); - length34 = sqrt(pow((v4[0] - v3[0]), 2) + pow((v4[1] - v3[1]), 2)); + //length34 = sqrt(pow((v4[0] - v3[0]), 2) + pow((v4[1] - v3[1]), 2)); // Set v1[0] to zero and align the y-axis of // the new coordinate system with line one (v1 and v2). diff --git a/Code/FeatureExtraction/otbRemoveCarvingPathFilter.txx b/Code/FeatureExtraction/otbRemoveCarvingPathFilter.txx index 3a9676fb0191951da16407ed09c114181a2f0b3b..026319e2fc68e1a57c434409ba0dcef15684ef70 100644 --- a/Code/FeatureExtraction/otbRemoveCarvingPathFilter.txx +++ b/Code/FeatureExtraction/otbRemoveCarvingPathFilter.txx @@ -172,17 +172,17 @@ RemoveCarvingPathFilter<TInputImage, TInputPath, TOutputImage> typename Superclass::OutputImagePointer outputPtr = this->GetOutput(); unsigned int dir0; - unsigned int dir1; + //unsigned int dir1; if (m_Direction == 0) { dir0 = 0; - dir1 = 1; + //dir1 = 1; } else { dir0 = 1; - dir1 = 0; + //dir1 = 0; } // we need to compute the output spacing, the output image size, and the diff --git a/Code/IO/otbGDALImageIO.cxx b/Code/IO/otbGDALImageIO.cxx index fbd6768cfa6c9562eb5bfc0192469d136974eb12..7f3affd8c5a53666e5bfc8dfddd2514dbeb70096 100644 --- a/Code/IO/otbGDALImageIO.cxx +++ b/Code/IO/otbGDALImageIO.cxx @@ -1607,9 +1607,7 @@ std::string GDALImageIO::GetGdalWriteImageFileName(const std::string& gdalDriver bool GDALImageIO::GDALInfoReportCorner(const char * /*corner_name*/, double x, double y, double& GeoX, double& GeoY) const { - const char *pszProjection; - double adfGeoTransform[6]; - + double adfGeoTransform[6]; bool IsTrue; /* -------------------------------------------------------------------- */ @@ -1617,12 +1615,8 @@ bool GDALImageIO::GDALInfoReportCorner(const char * /*corner_name*/, double x, d /* -------------------------------------------------------------------- */ if (m_Dataset->GetDataSet()->GetGeoTransform(adfGeoTransform) == CE_None) { - pszProjection = m_Dataset->GetDataSet()->GetProjectionRef(); - - GeoX = adfGeoTransform[0] + adfGeoTransform[1] * x - + adfGeoTransform[2] * y; - GeoY = adfGeoTransform[3] + adfGeoTransform[4] * x - + adfGeoTransform[5] * y; + GeoX = adfGeoTransform[0] + adfGeoTransform[1] * x + adfGeoTransform[2] * y; + GeoY = adfGeoTransform[3] + adfGeoTransform[4] * x + adfGeoTransform[5] * y; IsTrue = true; } diff --git a/Code/IO/otbOGRVectorDataIO.cxx b/Code/IO/otbOGRVectorDataIO.cxx index 883b77fa184179ef04070536c1f9cb844faee208..7a7c7f126d7964c8a7a015f0fa5a10ebaf5283b8 100644 --- a/Code/IO/otbOGRVectorDataIO.cxx +++ b/Code/IO/otbOGRVectorDataIO.cxx @@ -280,6 +280,8 @@ void OGRVectorDataIO::Write(const itk::DataObject* datag, char ** papszOptions) OGRIOHelper::Pointer IOConversion = OGRIOHelper::New(); layerKept = IOConversion->ProcessNodeWrite(inputRoot, m_DataSource, ogrCollection, ogrCurrentLayer, oSRS); + otbMsgDevMacro( << "layerKept " << layerKept ); + OGRDataSource::DestroyDataSource(m_DataSource); m_DataSource = NULL; diff --git a/Code/Radiometry/otbLuminanceToReflectanceImageFilter.h b/Code/Radiometry/otbLuminanceToReflectanceImageFilter.h index 6f492cb936b6c241d9850474c490316e7fc8534f..f07b1910b63a840a94c617dc2469f881512f98ee 100644 --- a/Code/Radiometry/otbLuminanceToReflectanceImageFilter.h +++ b/Code/Radiometry/otbLuminanceToReflectanceImageFilter.h @@ -279,8 +279,8 @@ protected: otb_6s_doublereal dsol = 0.; otb_6s_integer day = static_cast<otb_6s_integer>(m_Day); otb_6s_integer month = static_cast<otb_6s_integer>(m_Month); - int cr(0); - cr = otb_6s_varsol_(&day, &month, &dsol); + //int cr(0); + otb_6s_varsol_(&day, &month, &dsol); coefTemp = vcl_cos(m_ZenithalSolarAngle * CONST_PI_180) * static_cast<double>(dsol); } else diff --git a/Code/Simulation/otbSailModel.cxx b/Code/Simulation/otbSailModel.cxx index 7fc3c12f7b84954eeaeb29d3f1107814760b54e1..19e3923c0c9e38384cb197d0711f365884f013b7 100644 --- a/Code/Simulation/otbSailModel.cxx +++ b/Code/Simulation/otbSailModel.cxx @@ -264,7 +264,7 @@ SailModel double lambda, Es, Ed, Rsoil1, Rsoil2, rsoil0, rho, tau, PARdiro, PARdifo; double sigb, sigf, att, m2, m, sb, sf, vb, vf, w; - double tss, too, tsstoo, rdd, tdd, rsd, tsd, rdo, tdo, rso, rsos, rsod; + double tss, too, tsstoo, rdd, tdd, rsd, tsd, rdo, tdo, rsos, rsod; double rddt, rsdt, rdot, rsodt, rsost, rsot, dn; double e1, e2, rinf, rinf2, re, denom, J1ks, J2ks, J1ko, J2ko; double Ps, Qs, Pv, Qv, z, g1, g2, Tv1, Tv2, T1, T2, T3; @@ -321,7 +321,7 @@ SailModel tsd = 0; rdo = 0; tdo = 0; - rso = 0; + //rso = 0; rsos = 0; rsod = 0; @@ -415,7 +415,7 @@ SailModel // Single scattering contribution rsos = w*m_LAI*sumint; // Total canopy contribution - rso=rsos+rsod; + // rso=rsos+rsod; //Interaction with the soil dn=1.-rsoil0*rdd; diff --git a/Examples/FeatureExtraction/SURFExample.cxx b/Examples/FeatureExtraction/SURFExample.cxx index cf69e7599ecbbedb5529e1671d1eeb16d337c304..0e4e1a2a2e1ff2d7fd66bcecc68c9e4320e09e51 100644 --- a/Examples/FeatureExtraction/SURFExample.cxx +++ b/Examples/FeatureExtraction/SURFExample.cxx @@ -234,19 +234,20 @@ int main(int argc, char * argv[]) // // Software Guide : EndLatex -// Software Guide : BeginCodeSnippet - ImageType::SpacingType spacing = reader->GetOutput()->GetSpacing(); - ImageType::PointType origin = reader->GetOutput()->GetOrigin(); - OutputImageType::SizeType size = - outputImage->GetLargestPossibleRegion().GetSize(); -// Software Guide : EndCodeSnippet -// Software Guide : BeginLatex -// -// And we iterate through the SURF set: -// -// Software Guide : EndLatex + // Software Guide : BeginCodeSnippet + ImageType::SpacingType spacing = reader->GetOutput()->GetSpacing(); + ImageType::PointType origin = reader->GetOutput()->GetOrigin(); + //OutputImageType::SizeType size = outputImage->GetLargestPossibleRegion().GetSize(); + + // Software Guide : EndCodeSnippet + // Software Guide : BeginLatex + // + // And we iterate through the SURF set: + // + // Software Guide : EndLatex + + // Software Guide : BeginCodeSnippet -// Software Guide : BeginCodeSnippet while (pIt != filter->GetOutput()->GetPoints()->End()) { // Software Guide : EndCodeSnippet