[otb] 09/20: Drop patches, applied upstream.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sun May 1 13:57:26 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository otb.
commit 6941834f2f5a8170d7f565c9288c2961822f6641
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun May 1 00:35:54 2016 +0200
Drop patches, applied upstream.
---
debian/changelog | 1 +
...2-not-compatible-with-ITK-4.9-mantis-1142.patch | 52 -----
debian/patches/itk-4.8-4.9.patch | 59 -----
debian/patches/series | 3 -
debian/patches/spelling-errors.patch | 259 ---------------------
5 files changed, 1 insertion(+), 373 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index cf20ce6..748ecff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ otb (5.4.0~rc1+dfsg0-1) UNRELEASED; urgency=medium
* New upstream release candidate.
* Exclude documentation with problematic license terms.
* Add (build) dependencies for gl, glew & glfw.
+ * Drop patches, applied upstream.
-- Bas Couwenberg <sebastic at debian.org> Sun, 01 May 2016 00:18:10 +0200
diff --git a/debian/patches/0001-BUG-OTB-5.2-not-compatible-with-ITK-4.9-mantis-1142.patch b/debian/patches/0001-BUG-OTB-5.2-not-compatible-with-ITK-4.9-mantis-1142.patch
deleted file mode 100644
index 30d575b..0000000
--- a/debian/patches/0001-BUG-OTB-5.2-not-compatible-with-ITK-4.9-mantis-1142.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From c7b301d750c67f6e7b740ad5e085522a3c478ed9 Mon Sep 17 00:00:00 2001
-From: Manuel Grizonnet <manuel.grizonnet at cnes.fr>
-Date: Fri, 12 Feb 2016 09:34:31 +0100
-Subject: BUG: OTB 5.2 not compatible with ITK 4.9 (mantis 1142)
-Origin: https://git.orfeo-toolbox.org/otb.git/commit/c7b301d750c67f6e7b740ad5e085522a3c478ed9
-Bug: https://bugs.orfeo-toolbox.org/view.php?id=1142
-
----
- Modules/Core/Common/include/otbConfigurationManager.h | 4 ++--
- Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
---- a/Modules/Core/Common/include/otbConfigurationManager.h
-+++ b/Modules/Core/Common/include/otbConfigurationManager.h
-@@ -18,7 +18,7 @@
- #ifndef _otbConfigurationManager_h
- #define _otbConfigurationManager_h
-
--#include "itksys/FundamentalType.h"
-+#include "itk_kwiml.h"
-
- #include <string>
- #include <boost/cstdint.hpp>
-@@ -38,7 +38,7 @@ namespace otb
- class ConfigurationManager
- {
- public:
-- typedef ::itksysFundamentalType_UInt64 RAMValueType;
-+ typedef KWIML_INT_uint64_t RAMValueType;
-
- /**
- * DEMDirectory is a directory were DEM tiles are stored.
---- a/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
-+++ b/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
-@@ -19,7 +19,7 @@
- #define __otbPipelineMemoryPrintCalculator_h
-
- #include "itkProcessObject.h"
--#include "itksys/FundamentalType.h"
-+#include "itk_kwiml.h"
- #include <set>
-
- namespace otb
-@@ -75,7 +75,7 @@ public:
- typedef ProcessObjectType::Pointer ProcessObjectPointerType;
- typedef itk::DataObject DataObjectType;
- typedef DataObjectType::Pointer DataObjectPointerType;
-- typedef ::itksysFundamentalType_UInt64 MemoryPrintType;
-+ typedef KWIML_INT_uint64_t MemoryPrintType;
- typedef std::set<const ProcessObjectType *> ProcessObjectPointerSetType;
-
- /** Run-time type information (and related methods). */
diff --git a/debian/patches/itk-4.8-4.9.patch b/debian/patches/itk-4.8-4.9.patch
deleted file mode 100644
index 8a00f07..0000000
--- a/debian/patches/itk-4.8-4.9.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Description: Support both ITK 4.8 and ITK 4.9.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug: https://bugs.orfeo-toolbox.org/view.php?id=1142
-Applied-Upstream: https://git.orfeo-toolbox.org/otb.git/commit/e0884b46344bd3a25e12c55ade5fc8655d3b7153
-
---- a/Modules/Core/Common/include/otbConfigurationManager.h
-+++ b/Modules/Core/Common/include/otbConfigurationManager.h
-@@ -18,7 +18,13 @@
- #ifndef _otbConfigurationManager_h
- #define _otbConfigurationManager_h
-
-+#include "itkVersion.h"
-+
-+#if ITK_VERSION_MAJOR < 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR <= 8)
-+#include "itksys/FundamentalType.h"
-+#else
- #include "itk_kwiml.h"
-+#endif
-
- #include <string>
- #include <boost/cstdint.hpp>
-@@ -38,7 +44,11 @@ namespace otb
- class ConfigurationManager
- {
- public:
-+#if ITK_VERSION_MAJOR < 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR <= 8)
-+ typedef ::itksysFundamentalType_UInt64 RAMValueType;
-+#else
- typedef KWIML_INT_uint64_t RAMValueType;
-+#endif
-
- /**
- * DEMDirectory is a directory were DEM tiles are stored.
---- a/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
-+++ b/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
-@@ -19,7 +19,11 @@
- #define __otbPipelineMemoryPrintCalculator_h
-
- #include "itkProcessObject.h"
-+#if ITK_VERSION_MAJOR < 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR <= 8)
-+#include "itksys/FundamentalType.h"
-+#else
- #include "itk_kwiml.h"
-+#endif
- #include <set>
-
- namespace otb
-@@ -75,7 +79,11 @@ public:
- typedef ProcessObjectType::Pointer ProcessObjectPointerType;
- typedef itk::DataObject DataObjectType;
- typedef DataObjectType::Pointer DataObjectPointerType;
-+#if ITK_VERSION_MAJOR < 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR <= 8)
-+ typedef ::itksysFundamentalType_UInt64 MemoryPrintType;
-+#else
- typedef KWIML_INT_uint64_t MemoryPrintType;
-+#endif
- typedef std::set<const ProcessObjectType *> ProcessObjectPointerSetType;
-
- /** Run-time type information (and related methods). */
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0b7ba31..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-0001-BUG-OTB-5.2-not-compatible-with-ITK-4.9-mantis-1142.patch
-spelling-errors.patch
-itk-4.8-4.9.patch
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
deleted file mode 100644
index 4bff33a..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-Description: Fix spelling errors.
- convertion -> conversion
- differents -> different
- intepreted -> interpreted
- accross -> across
- mulitple -> multiple
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://bugs.orfeo-toolbox.org/view.php?id=1143
-Applied-Upstream: https://git.orfeo-toolbox.org/otb.git/commitdiff/390a553b05800aada9e6d9c1a120678640ec7a8d
-
---- a/Modules/Adapters/GdalAdapters/src/otbOGRGeometryWrapper.cxx
-+++ b/Modules/Adapters/GdalAdapters/src/otbOGRGeometryWrapper.cxx
-@@ -27,7 +27,7 @@
- #endif
-
- #ifdef _MSC_VER
--// warning convertion int -> bool
-+// warning conversion int -> bool
- #pragma warning ( disable : 4800 )
- #endif
- /*===========================================================================*/
---- a/Modules/Applications/AppSARPolarMatrixConvert/app/otbSARPolarMatrixConvert.cxx
-+++ b/Modules/Applications/AppSARPolarMatrixConvert/app/otbSARPolarMatrixConvert.cxx
-@@ -264,7 +264,7 @@ private:
-
-
-
-- AddParameter(ParameterType_Choice, "conv", "Convertion");
-+ AddParameter(ParameterType_Choice, "conv", "Conversion");
-
- //Monostatic case
-
---- a/Modules/Applications/AppVectorUtils/app/otbOSMDownloader.cxx
-+++ b/Modules/Applications/AppVectorUtils/app/otbOSMDownloader.cxx
-@@ -56,7 +56,7 @@ private:
- SetDocLongDescription("Generate a vector data from Open Street Map data. A DEM could be use. By default, the entire layer is downloaded, an image can be use as support for the OSM data. The application can provide also available classes in layers . This application required an Internet access. Information about the OSM project : http://www.openstreetmap.fr/");
- SetDocLimitations("None");
- SetDocAuthors("OTB-Team");
-- SetDocSeeAlso("Convertion");
-+ SetDocSeeAlso("Conversion");
-
- AddDocTag(Tags::Meta);
-
---- a/Modules/Core/Common/include/otbRGBAPixelConverter.h
-+++ b/Modules/Core/Common/include/otbRGBAPixelConverter.h
-@@ -30,7 +30,7 @@ namespace otb
- * \brief Convert an itk::RGBApixel<InternalType> into another pixel
- * type
- *
-- * To be usable, the desired convertion must be implemented through
-+ * To be usable, the desired conversion must be implemented through
- * partial specialisation mecanism.
- *
- *
---- a/Modules/Core/Common/include/otbVariableLengthVectorConverter.h
-+++ b/Modules/Core/Common/include/otbVariableLengthVectorConverter.h
-@@ -31,7 +31,7 @@ namespace otb
- * \class VariableLengthVectorConverter
- * \brief Convert any data container type into a VariableLengthVector.
- *
-- * To be usable, the desired convertion must be implemented through
-+ * To be usable, the desired conversion must be implemented through
- * partial specialisation mecanism.
- *
- *
---- a/Modules/Core/ImageBase/include/otbConvertPixelBuffer.h
-+++ b/Modules/Core/ImageBase/include/otbConvertPixelBuffer.h
-@@ -66,7 +66,7 @@ public:
- OutputPixelType* outputData , size_t size);
-
- protected:
-- /** Convertions related to complex */
-+ /** Conversions related to complex */
- static void ConvertGrayToComplex(InputPixelType * inputData,
- OutputPixelType * OutputData, size_t size);
-
---- a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.txx
-+++ b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.txx
-@@ -61,14 +61,14 @@ KullbackLeiblerSupervizedDistance<TInput
- typedef itk::ConstNeighborhoodIterator<
- typename ROIConversionType1::OutputImageType> ROIInputType1;
-
-- typename ROIConversionType1::Pointer convertion1 = ROIConversionType1::New();
-- convertion1->SetInputImage(img1);
-- convertion1->SetROIImage(imgROI);
-- convertion1->Update();
-+ typename ROIConversionType1::Pointer conversion1 = ROIConversionType1::New();
-+ conversion1->SetInputImage(img1);
-+ conversion1->SetROIImage(imgROI);
-+ conversion1->Update();
-
- if (m_CumROI1 != NULL) delete m_CumROI1;
-
-- m_CumROI1 = new CumulantsForEdgeworth<ROIInputType1> (convertion1->GetOutput());
-+ m_CumROI1 = new CumulantsForEdgeworth<ROIInputType1> (conversion1->GetOutput());
-
- if (!m_CumROI1->IsDataAvailable())
- {
-@@ -84,14 +84,14 @@ KullbackLeiblerSupervizedDistance<TInput
- typedef itk::ConstNeighborhoodIterator<
- typename ROIConversionType2::OutputImageType> ROIInputType2;
-
-- typename ROIConversionType2::Pointer convertion2 = ROIConversionType2::New();
-- convertion2->SetInputImage(img2);
-- convertion2->SetROIImage(imgROI);
-- convertion2->Update();
-+ typename ROIConversionType2::Pointer conversion2 = ROIConversionType2::New();
-+ conversion2->SetInputImage(img2);
-+ conversion2->SetROIImage(imgROI);
-+ conversion2->Update();
-
- if (m_CumROI2 != NULL) delete m_CumROI2;
-
-- m_CumROI2 = new CumulantsForEdgeworth<ROIInputType2> (convertion2->GetOutput());
-+ m_CumROI2 = new CumulantsForEdgeworth<ROIInputType2> (conversion2->GetOutput());
-
- if (!m_CumROI2->IsDataAvailable())
- {
---- a/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.txx
-+++ b/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.txx
-@@ -325,7 +325,7 @@ VectorDataProjectionFilter<TInputVectorD
- }
-
- /**
-- * GenerateData Performs the coordinate convertion for each element in the tree
-+ * GenerateData Performs the coordinate conversion for each element in the tree
- */
- template <class TInputVectorData, class TOutputVectorData>
- void
---- a/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.txx
-+++ b/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.txx
-@@ -132,7 +132,7 @@ VectorDataTransformFilter<TInputVectorDa
-
-
- /**
-- * GenerateData Performs the coordinate convertion for each element in the tree
-+ * GenerateData Performs the coordinate conversion for each element in the tree
- */
- template <class TInputVectorData, class TOutputVectorData >
- void
---- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.txx
-+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.txx
-@@ -74,7 +74,7 @@ VectorDataToVectorDataFilter<TInputVecto
- }
-
- /**
-- * GenerateData Performs the coordinate convertion for each element in the tree
-+ * GenerateData Performs the coordinate conversion for each element in the tree
- */
- template <class TInputVectorData, class TOutputVectorData>
- void
---- a/Modules/Applications/AppImageUtils/app/otbColorMapping.cxx
-+++ b/Modules/Applications/AppImageUtils/app/otbColorMapping.cxx
-@@ -22,7 +22,7 @@
- #include <fstream>
- #include <map>
-
--// Include differents method for color mapping
-+// Include different method for color mapping
- #include "otbChangeLabelImageFilter.h"
- #include "itkLabelToRGBImageFilter.h"
- #include "itkScalarToRGBColormapImageFilter.h"
---- a/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h
-+++ b/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h
-@@ -50,7 +50,7 @@ namespace otb
- * - Each change map is orthogonal to the others.
- *
- * This is a statistical method which can handle different modalities
-- * and even differents bands and number of bands between images.
-+ * and even different bands and number of bands between images.
- *
- * If numbers of bands in image 1 and 2 are equal, then change maps
- * are sorted by increasing correlation. If number of bands is
---- a/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h
-+++ b/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h
-@@ -592,7 +592,7 @@ protected:
-
- virtual void AfterThreadedGenerateData();
-
-- /** Allocates the outputs (need to be reimplemented since outputs have differents type) */
-+ /** Allocates the outputs (need to be reimplemented since outputs have different type) */
- virtual void AllocateOutputs();
-
- /** Constructor */
---- a/Modules/IO/TestKernel/src/otbTestHelper.cxx
-+++ b/Modules/IO/TestKernel/src/otbTestHelper.cxx
-@@ -545,7 +545,7 @@ int TestHelper::RegressionTestAsciiFile(
-
- //FIXME won't be intuitive for the non order case
- unsigned int numLineDiff = std::min(listStrDiffLineFileRef.size(), listStrDiffLineFileTest.size());
-- std::cout << "Nb lines differents : " << numLineDiff << std::endl;
-+ std::cout << "Nb lines different : " << numLineDiff << std::endl;
- for (unsigned int i = 0; i < numLineDiff; ++i)
- {
- std::cout << " -------------------------------" << std::endl;
---- a/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h
-+++ b/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h
-@@ -46,7 +46,7 @@ namespace otb {
- * The user can set an OutputPixelType as a burn vector via
- * AddBurnValue(OutputImagePixelType burnValuesPix). To have a
- * different color for each VectorData, use this method with
-- * differents burnValuesPix as many times as VectorDatas set.
-+ * different burnValuesPix as many times as VectorDatas set.
- * Again, the color will be duplicated if only one burnValuesPix
- * is set.
- *
---- a/Modules/Applications/AppProjection/app/otbGridBasedImageResampling.cxx
-+++ b/Modules/Applications/AppProjection/app/otbGridBasedImageResampling.cxx
-@@ -205,7 +205,7 @@ void DoExecute()
- // deformation grid, which is the only type handled by StreamingWarpImageFilter
- if(GetParameterString("grid.type") == "loc")
- {
-- GetLogger()->Info("Grid intepreted as a location grid.");
-+ GetLogger()->Info("Grid interpreted as a location grid.");
- m_ExtractX->SetInput(inGrid);
- m_ExtractX->SetChannel(1);
- m_BandMathX->SetNthInput(0,m_ExtractX->GetOutput(),"locX");
-@@ -222,7 +222,7 @@ void DoExecute()
- }
- else
- {
-- GetLogger()->Info("Grid intepreted as a deformation grid.");
-+ GetLogger()->Info("Grid interpreted as a deformation grid.");
- m_DisplacementFieldCaster->SetInput(inGrid);
- }
-
---- a/Modules/Applications/AppDescriptors/app/otbHomologousPointsExtraction.cxx
-+++ b/Modules/Applications/AppDescriptors/app/otbHomologousPointsExtraction.cxx
-@@ -88,7 +88,7 @@ private:
- " the first is the full mode where keypoints are extracted from the full extent of both images"
- " (please note that in this mode large image file are not supported). "
- "The second mode, called geobins, allows one to set-up spatial binning to get fewer points"
-- " spread accross the entire image. "
-+ " spread across the entire image. "
- "In this mode, the corresponding spatial bin in the second image is estimated using geographical"
- " transform or sensor modelling, and is padded according to the user defined precision. Last, in"
- " both modes the application can filter matches whose colocalisation in first image exceed this precision. "
-@@ -142,8 +142,8 @@ private:
- AddChoice("mode.full","Extract and match all keypoints (no streaming)");
- SetParameterDescription("mode.full","Extract and match all keypoints, loading both images entirely into memory");
-
-- AddChoice("mode.geobins","Search keypoints in small spatial bins regularly spread accross first image");
-- SetParameterDescription("mode.geobins","This method allows retrieving a set of tie points regulary spread accross image 1. Corresponding bins in image 2 are retrieved using sensor and geographical information if available. The first bin position takes into account the margin parameter. Bins are cropped to the largest image region shrinked by the margin parameter for both in1 and in2 images.");
-+ AddChoice("mode.geobins","Search keypoints in small spatial bins regularly spread across first image");
-+ SetParameterDescription("mode.geobins","This method allows retrieving a set of tie points regulary spread across image 1. Corresponding bins in image 2 are retrieved using sensor and geographical information if available. The first bin position takes into account the margin parameter. Bins are cropped to the largest image region shrinked by the margin parameter for both in1 and in2 images.");
-
- AddParameter(ParameterType_Int,"mode.geobins.binsize","Size of bin");
- SetParameterDescription("mode.geobins.binsize","Radius of the spatial bin in pixels");
---- a/Modules/Applications/AppStereo/app/otbStereoFramework.cxx
-+++ b/Modules/Applications/AppStereo/app/otbStereoFramework.cxx
-@@ -319,7 +319,7 @@ private:
-
- SetDocName("Stereo Framework");
- SetDocLongDescription("Compute the ground elevation with a stereo block matching algorithm "
-- "between one or mulitple stereo pair in sensor geometry. The output is projected in "
-+ "between one or multiple stereo pair in sensor geometry. The output is projected in "
- "desired geographic or cartographic map projection (UTM by default). The pipeline is made of the following steps:\n"
- "for each sensor pair :\n"
- "\t- compute the epipolar displacement grids from the stereo pair (direct and inverse)\n"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.git
More information about the Pkg-grass-devel
mailing list