[ossim] 20/23: Update typo patches.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Wed Dec 16 17:28:24 UTC 2015


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository ossim.

commit 30ec4e6dae9365c51626c025762e2ed819611d63
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Dec 16 17:15:53 2015 +0100

    Update typo patches.
---
 debian/changelog                      |  1 +
 debian/patches/accommodate-typo.patch | 36 +++++++++++++++++++++++++++++++++++
 debian/patches/extension-typo.patch   | 36 +++++++++++++++++++++++++++++++++++
 debian/patches/output-typo.patch      | 33 ++++++++++++++++++++++++++++++++
 debian/patches/series                 |  2 ++
 debian/patches/unknown-typo.patch     | 11 +++++++++++
 6 files changed, 119 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index eba7cbe..aeddaa7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ ossim (1.8.20.2+ds-1) UNRELEASED; urgency=medium
   * Enable parallel builds.
   * Update ossim-core.install to include all binaries and their data.
   * Add shlibs file for libossim1.
+  * Update typo patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 16 Dec 2015 14:21:12 +0100
 
diff --git a/debian/patches/accommodate-typo.patch b/debian/patches/accommodate-typo.patch
new file mode 100644
index 0000000..8439eea
--- /dev/null
+++ b/debian/patches/accommodate-typo.patch
@@ -0,0 +1,36 @@
+Description: Fix 'accomodate' typo, replace with 'accommodate'.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/ossim/include/ossim/base/ossimGrect.h
++++ b/ossim/include/ossim/base/ossimGrect.h
+@@ -136,7 +136,7 @@ public:
+    inline ossimGrect combine(const ossimGrect& rect)const;
+ 
+    /**
+-    * Expands existing rect to accomodate argument point. If this object contains NaNs
++    * Expands existing rect to accommodate argument point. If this object contains NaNs
+     * (uninitialized), then the rect is set to 0-area with the arg point as both UL and LR --
+     * convenient for establishing bounds in a loop over collection of points. This method does not
+     * consider height.
+--- a/ossim/src/ossim/projection/ossimPpjFrameSensor.cpp
++++ b/ossim/src/ossim/projection/ossimPpjFrameSensor.cpp
+@@ -222,7 +222,7 @@ void ossimPpjFrameSensor::updateModel()
+                                        m_cameraPositionEllipsoid.lond()   + deltal,
+                                        m_cameraPositionEllipsoid.height() + computeParameterOffset(PARAM_ADJ_ALTITUDE_OFFSET));
+ 
+-   // TODO  Need to add correction matrix to accomodate orientation offsets.  It
++   // TODO  Need to add correction matrix to accommodate orientation offsets.  It
+    //       shouldn't be done in ECF frame.
+    // double r = ossim::degreesToRadians(m_roll  + computeParameterOffset(PARAM_ADJ_ROLL_OFFSET));
+    // double p = ossim::degreesToRadians(m_pitch + computeParameterOffset(PARAM_ADJ_PITCH_OFFSET) );
+--- a/ossim/src/ossim/util/ossimSlopeUtil.cpp
++++ b/ossim/src/ossim/util/ossimSlopeUtil.cpp
+@@ -89,7 +89,7 @@ void ossimSlopeUtil::addArguments(ossimA
+          "--lut <filename>",
+          "Specifies the optional lookup table filename for mapping the single-band output "
+          "image to an RGB. The LUT provided must be in the ossimIndexToRgbLutFilter format "
+-         "and should accomodate the output pixel range. This option forces remap to 8-bit, "
++         "and should accommodate the output pixel range. This option forces remap to 8-bit, "
+          "0-255 where 255 = 90 deg slope");
+    au->addCommandLineOption(
+          "--request-api",
diff --git a/debian/patches/extension-typo.patch b/debian/patches/extension-typo.patch
new file mode 100644
index 0000000..695c80c
--- /dev/null
+++ b/debian/patches/extension-typo.patch
@@ -0,0 +1,36 @@
+Description: Fix 'extention' typo, replace with 'extension'.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/ossim/include/ossim/imaging/ossimImageFileWriter.h
++++ b/ossim/include/ossim/imaging/ossimImageFileWriter.h
+@@ -179,7 +179,7 @@ public:
+     * Will write a world file.  The extension will be derived from the
+     * image extension.
+     *
+-    * Currently handles the following image extentions:
++    * Currently handles the following image extensions:
+     * 
+     * "tif" or "tiff" -> "tfw"
+     * "jpg" of "jpeg" -> "jpw"
+--- a/ossim/include/ossim/util/ossimChipperUtil.h
++++ b/ossim/include/ossim/util/ossimChipperUtil.h
+@@ -421,7 +421,7 @@ private:
+     * @brief Creates a new writer.
+     *
+     * This will use the writer option (-w or --writer), if present; else,
+-    * it will be derived from the output file extention.
++    * it will be derived from the output file extension.
+     *
+     * This will also set any writer properties passed in.
+     *
+--- a/ossim/src/ossim/util/ossimImageUtil.cpp
++++ b/ossim/src/ossim/util/ossimImageUtil.cpp
+@@ -1445,7 +1445,7 @@ void ossimImageUtil::usage(ossimArgument
+ 
+       << "\n\nExpanded command option variables:\n\n"
+       << "%{basename}        = filename without path\n"
+-      << "%{basename_no_ext} = filename without path and without extention\n"
++      << "%{basename_no_ext} = filename without path and without extension\n"
+       << "%{date}            = Expanded to current zulu time. Default format=yyyymmdd\n"
+       << "                     output format controlled by command0.strf_time_format key.\n"
+       << "%{dirname}         = path of filename\n"
diff --git a/debian/patches/output-typo.patch b/debian/patches/output-typo.patch
index 42734f4..f2b05ff 100644
--- a/debian/patches/output-typo.patch
+++ b/debian/patches/output-typo.patch
@@ -98,3 +98,36 @@ Author: Bas Couwenberg <sebastic at debian.org>
     // here
     //
     ossim_uint32 totalLength = getTotalTagLength();
+--- a/ossim/include/ossim/base/ossimFilename.h
++++ b/ossim/include/ossim/base/ossimFilename.h
+@@ -218,7 +218,7 @@ public:
+     * 
+     * @return True on success, false on error.
+     */
+-   bool copyFileTo(const ossimFilename& ouputFile) const;
++   bool copyFileTo(const ossimFilename& outputFile) const;
+ 
+    /**
+     * @brief Checks whether file name is relative or absolute.
+--- a/ossim/src/ossim/util/ossimChipperUtil.cpp
++++ b/ossim/src/ossim/util/ossimChipperUtil.cpp
+@@ -4210,7 +4210,7 @@ void ossimChipperUtil::getAreaOfInterest
+                rect = source->getBoundingRect(0);
+             }
+       
+-         } // if ( m_getOuputGeometry.valid() )
++         } // if ( m_getOutputGeometry.valid() )
+          else
+          {
+             // Should never happer...
+--- a/ossim/src/ossim/util/ossimEquationUtil.cpp
++++ b/ossim/src/ossim/util/ossimEquationUtil.cpp
+@@ -170,7 +170,7 @@ ossimEquationUtil::ossimEquationUtil(oss
+    m_usage.addCommandLineOption("-k <filename>", "keyword list to load from");
+    m_usage.addCommandLineOption("-w <type>", "Writer type (tiff_strip, jpeg, etc... see ossim-info --writers) (default=tiff_strip)");
+    m_usage.addCommandLineOption("--writer-prop <string>", "Adds a property to send to the writer. format is name=value");
+-   m_usage.addCommandLineOption("-t <filename>", "ouput a keyword list template");
++   m_usage.addCommandLineOption("-t <filename>", "output a keyword list template");
+ }
+ 
+ bool ossimEquationUtil::execute()
diff --git a/debian/patches/series b/debian/patches/series
index c12e1b7..c48f5d1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,5 @@ developed-typo.patch
 unknown-typo.patch
 message-typo.patch
 output-typo.patch
+accommodate-typo.patch
+extension-typo.patch
diff --git a/debian/patches/unknown-typo.patch b/debian/patches/unknown-typo.patch
index c304def..8bb8186 100644
--- a/debian/patches/unknown-typo.patch
+++ b/debian/patches/unknown-typo.patch
@@ -34,3 +34,14 @@ Author: Bas Couwenberg <sebastic at debian.org>
              << std::endl;
           return;
           
+--- a/ossim/src/ossim/support_data/ossimJ2kInfo.cpp
++++ b/ossim/src/ossim/support_data/ossimJ2kInfo.cpp
+@@ -216,7 +216,7 @@ std::ostream& ossimJ2kInfo::printUnknown
+    readUInt16(segmentLength, str);
+ 
+    std::string pfx = prefix;
+-   pfx += "unkown.";
++   pfx += "unknown.";
+ 
+    out.setf(std::ios_base::hex, std::ios_base::basefield);
+    out << pfx << "marker: 0x" << std::setfill('0') << std::setw(4)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ossim.git



More information about the Pkg-grass-devel mailing list