[otb] 04/04: Drop spelling-errors.patch, applied upstream.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Tue May 10 19:29:35 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 9971da4870673b8fafb929b07aa65b5d63968fee
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue May 10 07:44:06 2016 +0200

    Drop spelling-errors.patch, applied upstream.
---
 debian/changelog                     |   1 -
 debian/patches/series                |   1 -
 debian/patches/spelling-errors.patch | 260 -----------------------------------
 3 files changed, 262 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a1ad3bb..33a4e6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,6 @@ otb (5.4.0+dfsg-1) UNRELEASED; urgency=medium
   * Extract upstream version for symbols from changelog.
   * Enable all hardening buildflags.
   * Add library package for libOTBIce.
-  * Add patch to fix spelling errors.
   * Update symbols for amd64 & i386.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 10 May 2016 07:41:32 +0200
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 38edaa7..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-spelling-errors.patch
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
deleted file mode 100644
index 8ed68fd..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,260 +0,0 @@
-Description: Fix spelling errors.
- ouptut           -> output
- catched          -> caught
- allows to <verb> -> allows <verb>ing
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://bugs.orfeo-toolbox.org/view.php?id=1211
-Applied-Upstream: https://git.orfeo-toolbox.org/otb.git/commit/7408396bb99b3aa450e4d62ed31b759a4cd1d5fc
-
---- a/Modules/Applications/AppClassification/test/CMakeLists.txt
-+++ b/Modules/Applications/AppClassification/test/CMakeLists.txt
-@@ -606,10 +606,10 @@ otb_test_application(NAME apTvClKMeansIm
-                              -maxit 10000
-                              -ct 0.0000001
-                              -rand 121212
--                             -out ${TEMP}/apTvClKMeansImageClassificationFilterOuptut.tif
-+                             -out ${TEMP}/apTvClKMeansImageClassificationFilterOutput.tif
-                      VALID   --compare-image ${NOTOL}
--                             ${OTBAPP_BASELINE}/apTvClKMeansImageClassificationFilterOuptut.tif
--                             ${TEMP}/apTvClKMeansImageClassificationFilterOuptut.tif )
-+                             ${OTBAPP_BASELINE}/apTvClKMeansImageClassificationFilterOutput.tif
-+                             ${TEMP}/apTvClKMeansImageClassificationFilterOutput.tif )
- 
- 
- #----------- TrainImagesClassifier TESTS ----------------
---- a/Modules/Applications/AppVectorDataTranslation/app/otbRasterization.cxx
-+++ b/Modules/Applications/AppVectorDataTranslation/app/otbRasterization.cxx
-@@ -73,7 +73,7 @@ private:
-     AddParameter(ParameterType_InputVectorData,  "in",   "Input vector dataset");
-     SetParameterDescription( "in", "The input vector dataset to be rasterized" );
- 
--    AddParameter(ParameterType_OutputImage,  "out",   "Ouptut image");
-+    AddParameter(ParameterType_OutputImage,  "out",   "Output image");
-     SetParameterDescription( "out", "An output image containing the rasterized vector dataset" );
- 
-     AddParameter(ParameterType_InputImage,  "im",   "Input reference image");
---- a/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.txx
-+++ b/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.txx
-@@ -154,7 +154,7 @@ NeighborhoodScalarProductFilter<TInputIm
-         angle -= CONST_PI;
-         }
- 
--      // Set the ouptut values
-+      // Set the output values
-       outputIt.Set(scalarMaxValue);
-       outputDirIt.Set(angle);
-       ++neighInputIt;
---- a/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.txx
-+++ b/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.txx
-@@ -265,7 +265,7 @@ OverlapSaveConvolutionImageFilter<TInput
-     norm = 1.0;
-     }
- 
--  // Fill the ouptut image
-+  // Fill the output image
-   outputIt.GoToBegin();
-   while (!outputIt.IsAtEnd())
-     {
---- a/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.txx
-+++ b/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.txx
-@@ -238,8 +238,8 @@ GridResampleImageFilter<TInputImage, TOu
-     }
- 
-   // Compute ReachableOutputRegion
--  // InputImage buffered region corresponds to a region of the ouptut
--  // image. Computing it beforehand allows to save IsInsideBuffer
-+  // InputImage buffered region corresponds to a region of the output
-+  // image. Computing it beforehand allows saving IsInsideBuffer
-   // calls in the interpolation loop
-   
-   // Compute the padding due to the interpolator
---- a/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h
-+++ b/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h
-@@ -198,7 +198,7 @@ public:
-   void SetOutputParametersFromImage(const ImageBaseType * image);
- 
-   /** Useful to set output parmaters form an existing image with type
--    * different from input or ouptut image
-+    * different from input or output image
-     */
-   template <class TImageType> void SetOutputParametersFromImage(const TImageType * image);
- 
---- a/Modules/Filtering/Projection/test/otbGenericRSTransformGenericTest.cxx
-+++ b/Modules/Filtering/Projection/test/otbGenericRSTransformGenericTest.cxx
-@@ -34,7 +34,7 @@ int otbGenericRSTransformGenericTest(int
- {
-   if(argc<14)
-     {
--    std::cerr<<"Usage: "<<argv[0]<<"input_point_x input_point_y output_point_x output_point_y input_projection_type[IMAGE, WKT, EPSG] input_projection_source output_projection_type[IMAGE, WKT, EPSG] output_projection_source input_distance[PHYSICAL, GEO] input_threshold output_distance[PHYSICAL, GEO] ouptut_threshold elevation_flag[NOELEV, AVERAGE, DEM] elevation_source";
-+    std::cerr<<"Usage: "<<argv[0]<<"input_point_x input_point_y output_point_x output_point_y input_projection_type[IMAGE, WKT, EPSG] input_projection_source output_projection_type[IMAGE, WKT, EPSG] output_projection_source input_distance[PHYSICAL, GEO] input_threshold output_distance[PHYSICAL, GEO] output_threshold elevation_flag[NOELEV, AVERAGE, DEM] elevation_source";
-     return EXIT_FAILURE;
-     }
- 
---- a/Modules/Learning/LearningBase/test/CMakeLists.txt
-+++ b/Modules/Learning/LearningBase/test/CMakeLists.txt
-@@ -28,11 +28,11 @@ otb_add_test(NAME leTvDecisionTreeWithRe
- 
- otb_add_test(NAME leTvKMeansImageClassificationFilter COMMAND otbLearningBaseTestDriver
-   --compare-image ${NOTOL}
--  ${BASELINE}/leKMeansImageClassificationFilterOuptut.hdr
--  ${TEMP}/leKMeansImageClassificationFilterOuptut.hdr
-+  ${BASELINE}/leKMeansImageClassificationFilterOutput.hdr
-+  ${TEMP}/leKMeansImageClassificationFilterOutput.hdr
-   otbKMeansImageClassificationFilter
-   ${INPUTDATA}/poupees_sub.png
--  ${TEMP}/leKMeansImageClassificationFilterOuptut.hdr
-+  ${TEMP}/leKMeansImageClassificationFilterOutput.hdr
-   2
-   0 0 0 0
-   255 255 255 255
---- a/Modules/Learning/SOM/test/CMakeLists.txt
-+++ b/Modules/Learning/SOM/test/CMakeLists.txt
-@@ -41,11 +41,11 @@ otb_add_test(NAME leTvSOM COMMAND otbSOM
- otb_add_test(NAME leTvSOMImageClassificationFilter COMMAND otbSOMTestDriver
-   --compare-image ${NOTOL}
-   ${BASELINE}/leSOMPoupeesClassified.hdr
--  ${TEMP}/leSOMImageClassificationFilterOuptut.hdr
-+  ${TEMP}/leSOMImageClassificationFilterOutput.hdr
-   otbSOMImageClassificationFilter
-   ${INPUTDATA}/poupees_sub.png
-   ${BASELINE}/leSOMPoupeesSubOutputMap1.hdr
--  ${TEMP}/leSOMImageClassificationFilterOuptut.hdr
-+  ${TEMP}/leSOMImageClassificationFilterOutput.hdr
-   )
- 
- otb_add_test(NAME leTvSOMActivationBuilder COMMAND otbSOMTestDriver
-@@ -112,11 +112,11 @@ otb_add_test(NAME leTvSOMClassifier COMM
- 
- otb_add_test(NAME leTvSOMbasedImageFilter COMMAND otbSOMTestDriver
-   --compare-image ${NOTOL}
--  ${BASELINE}/leSOMbasedImageFilterOuptut.hdr
--  ${TEMP}/leSOMbasedImageFilterOuptut.hdr
-+  ${BASELINE}/leSOMbasedImageFilterOutput.hdr
-+  ${TEMP}/leSOMbasedImageFilterOutput.hdr
-   otbSOMbasedImageFilterTest
-   ${INPUTDATA}/poupees_sub.png
-   ${BASELINE}/leSOMPoupeesSubOutputMap1.hdr
--  ${TEMP}/leSOMbasedImageFilterOuptut.hdr
-+  ${TEMP}/leSOMbasedImageFilterOutput.hdr
-   )
- 
---- a/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.txx
-+++ b/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.txx
-@@ -133,7 +133,7 @@ ImageMultiSegmentationToRCC8GraphFilter<
-   // Input image list pointer
-   InputImageListPointerType segList = this->GetInput();
- 
--  // Ouptut graph pointer
-+  // Output graph pointer
-   OutputGraphPointerType graph = this->GetOutput();
- 
-   // invert value vector
---- a/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.txx
-+++ b/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.txx
-@@ -179,7 +179,7 @@ void
- PolygonListToRCC8GraphFilter<TPolygonList, TOutputGraph>
- ::BeforeThreadedGenerateData()
- {
--  // Ouptut graph pointer
-+  // Output graph pointer
-   OutputGraphPointerType      graph = this->GetOutput();
-   PolygonListConstPointerType inputPtr = this->GetInput();
- 
-@@ -227,7 +227,7 @@ PolygonListToRCC8GraphFilter<TPolygonLis
- {
-   //std::cout<<"Starting thread "<<threadId <<" to work on range ["<<startIndex<<", "<<stopIndex<<"]"<<std::endl;
- 
--  // Ouptut graph pointer
-+  // Output graph pointer
-   OutputGraphPointerType      graph = this->GetOutput();
-   PolygonListConstPointerType inputPtr = this->GetInput();
- 
---- a/Modules/OBIA/RCC8/test/CMakeLists.txt
-+++ b/Modules/OBIA/RCC8/test/CMakeLists.txt
-@@ -53,10 +53,10 @@ otb_add_test(NAME srTvRCC8GraphIOEndToEn
- 
- otb_add_test(NAME srTvPolygonListToRCC8GraphFilter COMMAND otbRCC8TestDriver
-   --compare-ascii ${NOTOL}
--  ${BASELINE_FILES}/srTvPolygonListToRCC8GraphFilterOuptut.dot
--  ${TEMP}/srTvPolygonListToRCC8GraphFilterOuptut.dot
-+  ${BASELINE_FILES}/srTvPolygonListToRCC8GraphFilterOutput.dot
-+  ${TEMP}/srTvPolygonListToRCC8GraphFilterOutput.dot
-   otbPolygonListToRCC8GraphFilter
--  ${TEMP}/srTvPolygonListToRCC8GraphFilterOuptut.dot)
-+  ${TEMP}/srTvPolygonListToRCC8GraphFilterOutput.dot)
- 
- otb_add_test(NAME srTvRCC8VertexBase COMMAND otbRCC8TestDriver
-   otbRCC8VertexBase
---- a/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h
-+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h
-@@ -33,7 +33,7 @@ namespace otb
-  *
-  *  It uses the ITK registration framework locally for each point and thus
-  *  provides the flexibility of this framework. The parameters of each transform
-- *  are stored in the ouptut point set associated data. Optimizer, metric,
-+ *  are stored in the output point set associated data. Optimizer, metric,
-  *  interpolator and transform fixed parameters have to be set by the user.
-  *
-  *  This filters returns the pointset enriched with a set of value as PointData, in order of apparition :
-@@ -77,7 +77,7 @@ public:
-   typedef typename MovingImageType::Pointer   MovingImagePointerType;
-   typedef typename MovingImageType::PixelType MovingPixelType;
- 
--  /** Typedef for the input and ouptut point set */
-+  /** Typedef for the input and output point set */
-   typedef TPointSet                      PointSetType;
-   typedef typename PointSetType::Pointer PointSetPointerType;
- 
---- a/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.txx
-+++ b/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.txx
-@@ -284,7 +284,7 @@ StereoSensorModelToElevationFilter<TInpu
-   rsTransform->SetInputKeywordList(outputPtr->GetImageKeywordlist());
-   rsTransform->InstanciateTransform();
- 
--  // Fill ouptut
-+  // Fill output
-   itk::ImageRegionIteratorWithIndex<OutputImageType> outputIt(outputPtr, outputPtr->GetBufferedRegion());
- 
-   for(outputIt.GoToBegin(); !outputIt.IsAtEnd(); ++outputIt)
---- a/Modules/Applications/AppClassification/app/otbDSFuzzyModelEstimation.cxx
-+++ b/Modules/Applications/AppClassification/app/otbDSFuzzyModelEstimation.cxx
-@@ -414,7 +414,7 @@ private:
-       {
-       // An error has occurred in the optimization.
-       // Update the parameters
--      otbAppLogFATAL("ERROR: Exception Catched : "<< err.GetDescription() << std::endl
-+      otbAppLogFATAL("ERROR: Exception Caught : "<< err.GetDescription() << std::endl
-         << "numberOfIterations : " << m_Optimizer->GetOptimizer()->get_num_evaluations() << std::endl
-         << "Results : " << m_Optimizer->GetCurrentPosition() << std::endl);
-       }
---- a/Modules/Applications/AppSARDecompositions/app/otbSARDecompositions.cxx
-+++ b/Modules/Applications/AppSARDecompositions/app/otbSARDecompositions.cxx
-@@ -134,7 +134,7 @@ private:
-     SetParameterDescription("decomp.pauli","Pauli coherent decomposition");
-     
-     AddParameter(ParameterType_Group,"inco","Incoherent decompositions");
--    SetParameterDescription("inco","This group allows to set parameters related to the incoherent decompositions.");
-+    SetParameterDescription("inco","This group allows setting parameters related to the incoherent decompositions.");
-     
-     AddParameter(ParameterType_Int, "inco.kernelsize",   "Kernel size for spatial incoherent averaging.");
-     SetParameterDescription("inco.kernelsize", "Minute (0-59)");
---- a/Modules/Visualization/Ice/include/otbGlView.h
-+++ b/Modules/Visualization/Ice/include/otbGlView.h
-@@ -104,7 +104,7 @@ public:
-   void Initialize(unsigned int sx, unsigned int sy);
- 
-   /**
--   * This method allows to add a new actor (deriving from GlActor) to
-+   * This method allows adding a new actor (deriving from GlActor) to
-    * the GlView. The actor can be identified by an optional key. If
-    * not provided, and the default value is used, the method will
-    * generate a key to identify the actor. In both case, the key is
-@@ -132,7 +132,7 @@ public:
-   void ClearActors();
- 
-   /**
--   * This method allows to retrieve a pointer to the actor identified
-+   * This method allows retrieving a pointer to the actor identified
-    * by the given key.
-    * \param key The key identifying the actor to retrieve
-    * \return A pointer to the retrieved actor. This pointer will be

-- 
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