apps/ossim-pixelflip/ossim-pixelflip.cpp

@@ -385,7 +385,7 @@ void usage()
       << "\nThis is a good Landsat7 edge fixer..."
       << "\n"
       << "\nIf mode is \"replace_full_targets\":"
-      << "\nTarget will be repaced only if all subpixels(bands) have the "
+      << "\nTarget will be replaced only if all subpixels(bands) have the "
       << "target."
       << "\n"
       << "\n Example:"

apps/ossim-plot-histo/ossim-plot-histo.cpp

@@ -89,7 +89,7 @@ void plotHistogram(const ossimFilename& histoFile, const ossimString& plotWith,
    ossim_uint32 band = 0;
    ossimRefPtr<ossimHistogram> histogram = h->getHistogram(band);
    int numBins = histogram->GetRes();
-   const float* x = histogram->GetVals();
+   const double* x = histogram->GetVals();
    const ossim_int64* y = histogram->GetCounts();
    for (int i=0; i<numBins; ++i)
    {

apps/ossim-rpcgen/ossim-rpcgen.cpp

@@ -41,7 +41,7 @@ int main(int argc, char* argv[])
          argumentParser.getApplicationName() + " takes an input image and generates a "
          "corresponding RPC geometry in a variety of formats. If a bounding box is specified, the "
          "default output filename (based on the input filename) will be appended with the bbox spec"
-         ", unless an output filename is explicitely provided.");
+         ", unless an output filename is explicitly provided.");
    au->setCommandLineUsage(
          argumentParser.getApplicationName() + " [options] <input-file> [<output-file>]");
    au->addCommandLineOption(

cmake/CMakeModules/FindJsonCpp.cmake

@@ -16,7 +16,7 @@ set(JSONCPP_FOUND "NO")
 set(OSSIM_HAS_JSONCPP 0)
 
 find_path( JSONCPP_INCLUDE_DIR json/json.h
-          PATHS /usr/include/jsoncpp )
+          PATHS "${CMAKE_INSTALL_PREFIX}" "/usr/include/jsoncpp" )
 
 find_library( JSONCPP_LIBRARY NAMES "jsoncpp")
 

debian/changelog

+ossim (2.7.2-1~exp1) experimental; urgency=medium
+
+  * Team upload.
+  * New upstream release.
+  * Drop spelling-errors.patch, applied upstream.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Tue, 09 Apr 2019 06:34:56 +0200
+
 ossim (2.7.1-1~exp1) experimental; urgency=medium
 
   * Team upload.

debian/patches/series

-spelling-errors.patch

debian/patches/spelling-errors.patch

-Description: Fix spelling errors.
- * Phillipines -> Philippines
- * availabe    -> available
- * Ammount     -> Amount
- * initilizing -> initializing
- * Unknow      -> Unknown
- * direcories  -> directories
- * Defualt     -> Default
- * prefered    -> preferred
- * repaced     -> replaced
- * explicitely -> explicitly
- * constrast   -> contrast
- * seperated   -> separated
- * avaliable   -> available
-Author: Bas Couwenberg <sebastic@debian.org>
-Forwarded: https://github.com/ossimlabs/ossim/pull/216
-Applied-Upstream: https://github.com/ossimlabs/ossim/commit/5a189edc8d20e60bdca9e321c272e78ef46a3077
-
---- a/src/base/ossimDatumFactory.inc
-+++ b/src/base/ossimDatumFactory.inc
-@@ -153,7 +153,7 @@ static ossimThreeParamDatumType threePar
- {"LCF", "L.C. 5 ASTRO 1961, Cayman Brac", "CC", 25, 25, 25, -81, -78, 18, 21, 42, 124, 147},
- {"LEH", "LEIGON, Ghana", "CD", 2, 3, 2, -9, 7, -1, 17, -130, 29, 364},
- {"LIB", "LIBERIA 1964", "CD", 15, 15, 15, -17, -1, -1, 14, -90, 40, 88},
--{"LUZ-A", "LUZON, Phillipines", "CC", 8, 11, 9, 115, 128, 3, 23, -133, -77, -51},
-+{"LUZ-A", "LUZON, Philippines", "CC", 8, 11, 9, 115, 128, 3, 23, -133, -77, -51},
- {"LUZ-B", "LUZON, Mindanao Island", "CC", 25, 25, 25, 120, 128, 4, 12, -133, -79, -72},
- {"MAS", "MASSAWA, Ethiopia", "BR", 25, 25, 25, 37, 53, 7, 25, 639, 405, 60},
- {"MER", "MERCHICH, Morocco", "CD", 5, 3, 3, -19, 5, 22, 42, 31, 146, 47},
---- a/src/imaging/ossimCcfTileSource.cpp
-+++ b/src/imaging/ossimCcfTileSource.cpp
-@@ -611,7 +611,7 @@ bool ossimCcfTileSource::setOutputBandLi
-                  << "\nOutput band number in list is greater than the "
-                  << "number of bands in the image source!"
-                  << "\noutputBandList[" << i << "]:  "
--                 << "\nHighest availabe band:  "
-+                 << "\nHighest available band:  "
-                  << (getNumberOfInputBands() - 1)
-                  << "\nError status has been set!  Returning..."
-                  << endl;
---- a/src/imaging/ossimGeneralRasterInfo.cpp
-+++ b/src/imaging/ossimGeneralRasterInfo.cpp
-@@ -72,7 +72,7 @@ SET_NULLS("set_fill_to_nulls_mode",
- 
- static const ossimKeyword
- PIXELS_TO_CHOP("pixels_to_chop",
--               "Ammount of pixels to chop from edge.");
-+               "Amount of pixels to chop from edge.");
- 
- static const ossimInterleaveTypeLut INTERLEAVE_TYPE_LUT;
- 
---- a/src/imaging/ossimImageChain.cpp
-+++ b/src/imaging/ossimImageChain.cpp
-@@ -1505,7 +1505,7 @@ void ossimImageChain::initialize()
-    {
-       if(traceDebug())
-       {
--         CLOG << "initilizing source: "
-+         CLOG << "initializing source: "
-               << imageChainList()[index]->getClassName()
-               << std::endl;
-       }
---- a/src/imaging/ossimImageSourceSequencer.cpp
-+++ b/src/imaging/ossimImageSourceSequencer.cpp
-@@ -388,7 +388,7 @@ ossimRefPtr<ossimImageData> ossimImageSo
-    {
-       if(traceDebug())
-       {
--         CLOG << "No input connection so returing NULL" << endl;
-+         CLOG << "No input connection so returning NULL" << endl;
-       }
-    }
-    if(traceDebug())
---- a/src/imaging/ossimTiffOverviewBuilder.cpp
-+++ b/src/imaging/ossimTiffOverviewBuilder.cpp
-@@ -1273,7 +1273,7 @@ bool ossimTiffOverviewBuilder::setInputS
-             setErrorStatus();
-             ossimNotify(ossimNotifyLevel_WARN)
-                << MODULE << " ERROR:"
--               << "\nUnknow pixel type:  "
-+               << "\nUnknown pixel type:  "
-                << (ossimScalarTypeLut::instance()->
-                    getEntryString(m_imageHandler->getOutputScalarType()))
-                << std::endl;
---- a/src/support_data/ossimTiffInfo.cpp
-+++ b/src/support_data/ossimTiffInfo.cpp
-@@ -334,7 +334,7 @@ std::ostream &ossimTiffInfo::print(std::
-          if (traceDebug())
-          {
-             ossimNotify(ossimNotifyLevel_WARN)
--                << MODULE << " FATAL error reading number of direcories."
-+                << MODULE << " FATAL error reading number of directories."
-                 << std::endl;
-          }
-          m_inputStream.reset();
-@@ -767,7 +767,7 @@ std::ostream &ossimTiffInfo::print(std::
-          if (traceDebug())
-          {
-             ossimNotify(ossimNotifyLevel_WARN)
--                << MODULE << " FATAL error reading number of direcories."
-+                << MODULE << " FATAL error reading number of directories."
-                 << std::endl;
-          }
-          return outStr;
---- a/src/util/ossimChipperUtil.cpp
-+++ b/src/util/ossimChipperUtil.cpp
-@@ -210,11 +210,11 @@ void ossimChipperUtil::addArguments(ossi
- 
-    au->addCommandLineOption("--central-meridian", "<central_meridian_in_decimal_degrees>\nNote if set this will be used for the central meridian of the projection.  This can be used to lock the utm zone.");
- 
--   au->addCommandLineOption("--color", "<r> <g> <b>\nhillshade option - Set the red, green and blue color values to be used with hillshade.\nThis option can be used with or without an image source for color.\nRange 0 to 255, Defualt r=255, g=255, b=255");
-+   au->addCommandLineOption("--color", "<r> <g> <b>\nhillshade option - Set the red, green and blue color values to be used with hillshade.\nThis option can be used with or without an image source for color.\nRange 0 to 255, Default r=255, g=255, b=255");
- 
-    au->addCommandLineOption("--color-table", "<color-table.kwl>\nhillshade or color-relief option - Keyword list containing color table for color-relief option.");
- 
--   au->addCommandLineOption("--contrast", "<constrast>\nApply constrast to input image(s). Valid range: -1.0 to 1.0");
-+   au->addCommandLineOption("--contrast", "<contrast>\nApply contrast to input image(s). Valid range: -1.0 to 1.0");
- 
-    au->addCommandLineOption("--cut-bbox-xywh", "<x>,<y>,<width>,<height>\nSpecify a comma separated bounding box.");
- 
-@@ -247,7 +247,7 @@ void ossimChipperUtil::addArguments(ossi
- 
-    au->addCommandLineOption("--exaggeration", "<factor>\nMultiplier for elevation values when computing surface normals. Has the effect of lengthening shadows for oblique lighting.\nRange: .0001 to 50000, Default = 1.0");
- 
--   au->addCommandLineOption("--fullres-xys", "<full res center x>,<full res center y>,<scale>[,<scale>]\nSpecify a full resolution x,y point (Used as pivot and center cut) and scale, comma seperated with no spaces.  If two scales are specified then first is x and second is y else x and y are set to equal scales");
-+   au->addCommandLineOption("--fullres-xys", "<full res center x>,<full res center y>,<scale>[,<scale>]\nSpecify a full resolution x,y point (Used as pivot and center cut) and scale, comma separated with no spaces.  If two scales are specified then first is x and second is y else x and y are set to equal scales");
- 
-    au->addCommandLineOption("-h or --help", "Display this help and exit.");
- 
-@@ -1890,7 +1890,7 @@ ossimRefPtr<ossimSingleImageChain> ossim
-             setupChainHistogram(ic);
-          }
- 
--         // Brightness constrast setup:
-+         // Brightness contrast setup:
-          if (hasBrightnesContrastOperation())
-          {
-             // Assumption bright contrast filter in chain:
-@@ -2076,7 +2076,7 @@ ossimRefPtr<ossimSingleImageChain> ossim
-          setupChainHistogram(ic, std::make_shared<ossimSrcRecord>(rec));
-       }
- 
--      // Brightness constrast setup:
-+      // Brightness contrast setup:
-       if (hasBrightnesContrastOperation())
-       {
-          // Assumption bright contrast filter in chain:
-@@ -2305,7 +2305,7 @@ void ossimChipperUtil::rotateMapToInput(
-       if (!mapProj)
-          throw ossimException("Output projection must be a map projection.");
-       if (m_imgLayer.size() != 1)
--         throw ossimException("Optimal rotation output requested but this feature is not avaliable for mosaics.");
-+         throw ossimException("Optimal rotation output requested but this feature is not available for mosaics.");
-       ossimRefPtr<ossimImageHandler> ih = m_imgLayer[0]->getImageHandler();
-       if (!ih)
-          throw ossimException("Null image handler encountered.");
---- a/src/util/ossimHillshadeTool.cpp
-+++ b/src/util/ossimHillshadeTool.cpp
-@@ -233,7 +233,7 @@ void ossimHillshadeTool::setUsage(ossimA
- 
-    // Add arguments.
-    au->addCommandLineOption("--azimuth", "<azimuth>\nLight source azimuth angle for bump shade.\nRange: 0 to 360, Default = 180.0");
--   au->addCommandLineOption("--color","<r> <g> <b>\nSet the red, green and blue color values to be used with hillshade.\nRange 0 to 255, Defualt r=255, g=255, b=255");
-+   au->addCommandLineOption("--color","<r> <g> <b>\nSet the red, green and blue color values to be used with hillshade.\nRange 0 to 255, Default r=255, g=255, b=255");
-    au->addCommandLineOption("--color-source","<file>\nSpecifies the image file to use as a color source instead of a fixed RGB value.");
-    au->addCommandLineOption("--elevation", "<elevation>\nhillshade option - Light source elevation angle for bumb shade.\nRange: 0 to 90, Default = 45.0");
- 
---- a/src/util/ossimHlzTool.cpp
-+++ b/src/util/ossimHlzTool.cpp
-@@ -104,7 +104,7 @@ void ossimHlzTool::setUsage(ossimArgumen
-          "Number of threads. Defaults to use single core. For engineering/debug purposes.");
-    au->addCommandLineOption("--use-slope",
-          "Slope is computed from the normal vector using neighboring posts instead of "
--         "least-squares fit to a plane (prefered). For engineering/debug purposes.");
-+         "least-squares fit to a plane (preferred). For engineering/debug purposes.");
- }
- 
- bool ossimHlzTool::initialize(ossimArgumentParser& ap)
---- a/apps/ossim-pixelflip/ossim-pixelflip.cpp
-+++ b/apps/ossim-pixelflip/ossim-pixelflip.cpp
-@@ -385,7 +385,7 @@ void usage()
-       << "\nThis is a good Landsat7 edge fixer..."
-       << "\n"
-       << "\nIf mode is \"replace_full_targets\":"
--      << "\nTarget will be repaced only if all subpixels(bands) have the "
-+      << "\nTarget will be replaced only if all subpixels(bands) have the "
-       << "target."
-       << "\n"
-       << "\n Example:"
---- a/apps/ossim-rpcgen/ossim-rpcgen.cpp
-+++ b/apps/ossim-rpcgen/ossim-rpcgen.cpp
-@@ -41,7 +41,7 @@ int main(int argc, char* argv[])
-          argumentParser.getApplicationName() + " takes an input image and generates a "
-          "corresponding RPC geometry in a variety of formats. If a bounding box is specified, the "
-          "default output filename (based on the input filename) will be appended with the bbox spec"
--         ", unless an output filename is explicitely provided.");
-+         ", unless an output filename is explicitly provided.");
-    au->setCommandLineUsage(
-          argumentParser.getApplicationName() + " [options] <input-file> [<output-file>]");
-    au->addCommandLineOption(
---- a/src/hdf5/ossimHdf5Tool.cpp
-+++ b/src/hdf5/ossimHdf5Tool.cpp
-@@ -221,7 +221,7 @@ void ossimHdf5Tool::loadImageFiles()
-    }
-    else
-    {
--      // Use explicitely-provided dataset names:
-+      // Use explicitly-provided dataset names:
-       handler = new ossimHdf5ImageHandler;
-       handler->addRenderable(m_imageDataPath);
-       handler->setFilename(ossimFilename(value));
---- a/src/util/ossimChipProcTool.cpp
-+++ b/src/util/ossimChipProcTool.cpp
-@@ -1111,7 +1111,7 @@ void ossimChipProcTool::initializeAOI()
-       // Geo-scaled projection needs to know the reference latitude:
-       if (m_geoScaled)
-       {
--         // The origin may have ben explicitely specified,or just use midpoint of AOI:
-+         // The origin may have ben explicitly specified,or just use midpoint of AOI:
-          ossimGpt origin;
-          if (!getProjectionOrigin(origin))
-             origin = m_aoiGroundRect.midPoint();
---- a/include/ossim/imaging/ossimSingleImageChain.h
-+++ b/include/ossim/imaging/ossimSingleImageChain.h
-@@ -473,7 +473,7 @@ public:
-    void setBrightnessContrastFlag(bool flag);
- 
-    /**
--    * @brief Get the brightness constrast flag.
-+    * @brief Get the brightness contrast flag.
-     * @return true or false.
-     */
-    bool getBrightnessContrastFlag() const;
---- a/share/ossim/templates/ossim_preferences_template
-+++ b/share/ossim/templates/ossim_preferences_template
-@@ -687,8 +687,8 @@ tfrd_iamp_file: $(OSSIM_INSTALL_PREFIX)/
- // allows on to specify configuration options and parsing for the hdf5 plugin
- // In this example we have only the Radiance file supported for VIIRS data
- // to get a listing of dataset use the ossim-info -d on any hdf5 dataset file
--// and look at the top for the dataset comma seperated list of dataset paths.
--// You can add a comma seperated list for renderable_datasets and only those will show
-+// and look at the top for the dataset comma separated list of dataset paths.
-+// You can add a comma separated list for renderable_datasets and only those will show
- // up in an ossim-info
- // 
- hdf5.options.max_recursion_level: 8

include/ossim/base/ossimHistogram.h

@@ -36,10 +36,15 @@ class OSSIMDLLEXPORT ossimHistogram : public ossimObject
 
   protected:
 
+   /**
+    * @brief Updates m_vmin and m_vmax. This will be the value for the first
+    * and last bin with a count in it.
+    */
+   void updateMinMax();
 
    virtual void deleteAll();
    
-    float * m_vals;            // histogram x array
+   double * m_vals;            // histogram x array
    // (value = midpoint of each bucket)
    ossim_int64* m_counts;   // histogram y array ie. count[i] is
                              // the number of pixels with value within range
@@ -47,17 +52,17 @@ class OSSIMDLLEXPORT ossimHistogram : public ossimObject
 
    int m_num;                 // number of indices
 
-    float m_delta;             // "Width" of each bucket on value axis
-    float m_vmin, m_vmax;        // Maximum and minimum values on plot
-    mutable float m_mean;               // Mean value of the distribution
-    mutable float m_standardDev;       //
+   double m_delta;             // "Width" of each bucket on value axis
+   double m_vmin, m_vmax;        // Maximum and minimum values on plot
+   mutable double m_mean;               // Mean value of the distribution
+   mutable double m_standardDev;       //
 
    //---
    // For counting nulls only.
    // Nulls counted separately, i.e. not stored in a m_counts bin, as they are
    // not used in any computations.
    //---
-    ossim_float64 m_nullValue;
+   double        m_nullValue;
    ossim_uint64  m_nullCount;
 
    //---
@@ -97,53 +102,79 @@ class OSSIMDLLEXPORT ossimHistogram : public ossimObject
       HISTOGRAM_FILL_DEFAULT    = 0,
       HISTOGRAM_FILL_THIN_PLATE = 1
    };
+
    // Constructors
    ossimHistogram();
-    ossimHistogram(int xres, float min, float max, float nullValue, ossimScalarType scalar);
-    // ossimHistogram(float*, float*, int);
+   ossimHistogram(int xres, double min, double max, double nullValue, ossimScalarType scalar);
+   // ossimHistogram(double*, double*, int);
    ossimHistogram(const ossimHistogram& his); // Copy constructor
-    ossimHistogram(const ossimHistogram*, float width); // Resampling constructor
+   ossimHistogram(const ossimHistogram*, double width); // Resampling constructor
 
    /**
     * Uses samples array to establish a histogram with numBins:
     */
-    ossimHistogram(const double* samples, ossim_uint32 size, ossim_uint32 numBins);
+   ossimHistogram(const double* samples,
+                  ossim_uint32 size,
+                  ossim_uint32 numBins);
+
+   virtual int GetIndex(double)const;
 
-    virtual int GetIndex(float)const;
    // Other histogram formation operations
-   ossimHistogram* fillInteriorEmptyBins(int type=HISTOGRAM_FILL_THIN_PLATE)const;
-    ossimHistogram* Scale(float scale_factor); // Scale Transformation
-    ossimHistogram* CumulativeGreaterThanEqual()const;// From density to cumulative
-    ossimHistogram* CumulativeLessThanEqual()const;// From density to cumulative
+
+   /**
+    * @brief Fill empty bins.
+    *
+    * This is used for code that does not like holes. The ossim-gui
+    * HistogramWidget being one of them.
+    *
+    * @param interiorOnly If true only bins between first bin with a
+    * count, and last bin with a count will be filled. If false, any
+    * bins with a zero count will be set to a count of one.
+    *
+    * @param type Fill type. Currently thin plate spline is the only
+    * type used regardless of setting.
+    *
+    * @return A new histogram from the this.
+    */
+   ossimHistogram* fillEmptyBins(bool interiorOnly,
+                                 int type=HISTOGRAM_FILL_THIN_PLATE)const;
+
+   ossimHistogram* Scale(double scale_factor); // Scale Transformation
+
+   // From density to cumulative
+   ossimHistogram* CumulativeGreaterThanEqual()const;
+   ossimHistogram* CumulativeLessThanEqual()const;
+
    //Suppress non-peak values.
    ossimHistogram* NonMaximumSupress(int radius = 1, bool cyclic = false);
-   void create(int xres, float val1, float val2);
-   void create(int bins, float minValue, float maxValue,
-               ossim_float64 nullValue, ossimScalarType scalar);
+
+   // void create(int xres, float val1, float val2);
+   void create(int bins, double minValue, double maxValue,
+               double nullValue, ossimScalarType scalar);
 
    // Attribute accessors
-    void UpCount(float newval, float occurences=1);
-    float GetCount(float uval)const;
-    float SetCount(float pixelval, float count);
+   void UpCount(double newval, double occurences=1);
+   double GetCount(double uval)const;
+   double SetCount(double pixelval, double count);
 
-    float GetMinVal()const;
-    float GetMaxVal()const;
-    float GetMaxCount()const;
+   double GetMinVal()const;
+   double GetMaxVal()const;
+   double GetMaxCount()const;
 
-    float GetRangeMin()const
+   double GetRangeMin()const
    {
       return m_vmin;
    }
-    float GetRangeMax()const
+   double GetRangeMax()const
    {
       return m_vmax;
    }
-    float * GetVals()
+   double * GetVals()
    {
       m_statsConsistent = 0; // Values might change.
       return m_vals; 
    }
-    const float * GetVals()const
+   const double * GetVals()const
    {
       m_statsConsistent = 0; // Values might change.
       return m_vals; 
@@ -164,55 +195,54 @@ class OSSIMDLLEXPORT ossimHistogram : public ossimObject
    int GetRes()const
    { return m_num; }
 
-    float GetBucketSize()const { return m_delta; }
+   double GetBucketSize()const { return m_delta; }
 
-    float * GetMinValAddr()
+   double * GetMinValAddr()
    { return m_vals+GetIndex(GetMinVal());  }
 
    ossim_int64 * GetMinCountAddr()
    { return m_counts+GetIndex(GetMinVal());  }
 
-    const float * GetMinValAddr()const
+   const double * GetMinValAddr()const
    { return m_vals+GetIndex(GetMinVal());  }
 
    const ossim_int64 * GetMinCountAddr()const
    { return m_counts+GetIndex(GetMinVal());  }
 
-    float ComputeArea(float low, float high)const;// bounded area
-    float ComputeArea()const;//total area
+   double ComputeArea(double low, double high)const;// bounded area
+   double ComputeArea()const;//total area
 
    /*!
     * Returns the fraction of accumulation up to and including "val" bucket
     * from min divided by the total accumulation.
     * returns OSSIM_FLT_NAN if "val" is not between GetMinVal and GetMaxVal.
     */
-    float getLowFractionFromValue(float val) const;
+   double getLowFractionFromValue(double val) const;
 
    /*!
     * Returns the fraction of accumulation down to and including "val" bucket
     * from max divided by the total accumulation.
     * returns OSSIM_FLT_NAN if "val" is not between GetMin() and GetMax().
     */
-    float getHighFractionFromValue(float val) const;
+   double getHighFractionFromValue(double val) const;
 
    //Find bounds that clip off a given percent of the area
-    float LowClipVal(float clip_fraction)const;
-    float HighClipVal(float clip_fraction)const;
+   double LowClipVal(double clip_fraction)const;
+   double HighClipVal(double clip_fraction)const;
 
-    float GetValFromIndex(ossim_uint32 idx)const;
-    float GetMinValFromIndex(ossim_uint32 idx)const;
-    float GetMaxValFromIndex(ossim_uint32 idx)const;
-    int GetValIndex(float val)const;
+   double GetValFromIndex(ossim_uint32 idx)const;
+   double GetMinValFromIndex(ossim_uint32 idx)const;
+   double GetMaxValFromIndex(ossim_uint32 idx)const;
+   int GetValIndex(double val)const;
 
-    float GetMean()const;
-    float GetStandardDev()const;
+   double GetMean()const;
+   double GetStandardDev()const;
 
    void Print()const;
    void Dump(char *)const;
    int  WritePlot(const char* fname)const;
    virtual ~ossimHistogram();
 
-
    virtual bool importHistogram(const ossimFilename& inputFile);
    virtual bool importHistogram(istream& in);
    virtual bool saveState(ossimKeywordlist& kwl,
@@ -225,8 +255,8 @@ class OSSIMDLLEXPORT ossimHistogram : public ossimObject
    ossimScalarType getScalarType() const;
    void setScalarType( ossimScalarType scalar );
 
-   const ossim_float64& getNullValue() const;
-   void setNullValue(const ossim_float64& nullValue);
+   const double& getNullValue() const;
+   void setNullValue(const double& nullValue);
    const ossim_uint64& getNullCount() const;
    void upNullCount( const ossim_uint64& count );
 

include/ossim/imaging/ossimAppFixedTileCache.h

@@ -67,6 +67,7 @@ public:
    const ossimIpt& getTileSize(ossimAppFixedCacheId cacheId);
 
    virtual void setMaxCacheSize(ossim_uint32 cacheSize);
+   virtual ossim_uint32 getMaxCacheSize() const { return theMaxCacheSize; }
 
 protected:
 //    struct ossimAppFixedCacheTileInfo

include/ossim/imaging/ossimHistogramRemapper.h

@@ -212,6 +212,20 @@ public:
    void setHighClipPoint(const ossim_float64& clip,
                          ossim_uint32 zero_based_band);
 
+   /**
+   * Sets the mid clip point.
+   *
+   * Notes on clip points:
+      * - If input chip source is mutiband this will set all band to same
+   *   percentage of clip.
+   */
+   void setMidPoint(const ossim_float64& value);
+
+   /**
+    * Sets the mid clip point for band.
+    */
+   void setMidPoint(const ossim_float64& value, ossim_uint32 zero_based_band);
+
    /**
     * Sets the min output value.
     * 
@@ -322,6 +336,26 @@ public:
     */
    ossim_float64 getHighClipPoint() const;
 
+   /**
+    * Returns the mid point for band
+    *
+    * Will return OSSIM_DBL_NAN if:
+    * - Band is out of range.
+    * - Connection is not complete.
+    * - Histogram has not been set.
+    */
+   ossim_float64 getMidPoint(ossim_uint32 zero_based_band) const;
+
+   /**
+    * Returns the mid clip point which is the average of all bands.
+    *
+    * Will return OSSIM_DBL_NAN if:
+    * - Band is out of range.
+    * - Connection is not complete.
+    * - Histogram has not been set.
+    */
+   ossim_float64 getMidPoint() const;
+
    /**
     * Returns the minimum output value for band.
     * 
@@ -521,6 +555,7 @@ private:
    mutable ossimRefPtr<ossimMultiResLevelHistogram>  theHistogram;
    vector<ossim_float64>         theNormalizedLowClipPoint;
    vector<ossim_float64>         theNormalizedHighClipPoint;
+   vector<ossim_float64>         theMidPoint;
    vector<ossim_float64>         theMinOutputValue;
    vector<ossim_float64>         theMaxOutputValue;
 

include/ossim/imaging/ossimImageData.h

@@ -654,8 +654,13 @@ public:
                                            ossim_float32* buf);
 
    virtual bool isWithin(ossim_int32 x, ossim_int32 y);
+
+   /** Sets the pixel at x,y to color value for all bands */
    virtual void setValue(ossim_int32 x, ossim_int32 y, ossim_float64 color);
 
+   /** Sets the pixel at x,y to color on specified band */
+   virtual void setValue(ossim_int32 x, ossim_int32 y, ossim_float64 color, ossim_uint32 band);
+
    virtual void loadBand(const void* src,
                          const ossimIrect& src_rect,
                          ossim_uint32 band);

include/ossim/imaging/ossimImageRenderer.h

@@ -252,10 +252,6 @@ private:
       ossimDpt m_VlrScale;
       ossimDpt m_VllScale;
 
-      ossimDpt m_ulRoundTripError;
-      ossimDpt m_urRoundTripError;
-      ossimDpt m_lrRoundTripError;
-      ossimDpt m_llRoundTripError;
 
       mutable ossimRefPtr<ossimImageViewTransform> m_transform;
       mutable const ossimPolyArea2d* m_viewBounds;
@@ -342,6 +338,7 @@ private:
 
    double                   m_averageViewToImageScale;
    double                   m_averageViewToImageRLevelScale;
+   static double            m_interpErrorThreshold;
 
    TYPE_DATA
 };

include/ossim/imaging/ossimSingleImageChain.h

@@ -473,7 +473,7 @@ public:
    void setBrightnessContrastFlag(bool flag);
 
    /**
-    * @brief Get the brightness constrast flag.
+    * @brief Get the brightness contrast flag.
     * @return true or false.
     */
    bool getBrightnessContrastFlag() const;

include/ossim/imaging/ossimTiffTileSource.h

@@ -251,6 +251,9 @@ protected:
    // Must be protected for derived ossimTerraSarTiffReader.
    TIFF* theTiffPtr;
 
+   /** Returns false if image is stripped, even though the input tile size is non-zero. In the case
+    * of stripped format, the image tile size is set to numColsInImage X numRowsPerStrip. */
+   virtual bool isImageTiled() const;
 
 private:
 
@@ -353,8 +356,6 @@ private:
    ossim_uint32         theBufferSize;
    ossimIrect           theBufferRect;
    ossim_uint32         theBufferRLevel;
-   ossim_uint32         theCurrentTileWidth;
-   ossim_uint32         theCurrentTileHeight;
 
    ossim_uint16         theSamplesPerPixel;
    ossim_uint16         theBitsPerSample;
@@ -378,10 +379,16 @@ private:
    std::vector<ossim_uint16> thePlanarConfig;
    std::vector<ossim_uint16> thePhotometric;
    std::vector<ossim_uint32> theRowsPerStrip;
-   std::vector<ossim_uint32> theImageTileWidth;
-   std::vector<ossim_uint32> theImageTileLength;
    std::vector<ossim_uint32> theImageDirectoryList;
 
+   /** theInputTileSize reflects the most efficient tiling scheme for reading from disk. If the
+    * image is tiled, then the output tile size will match the tiling on disk. If it is stripped,
+    * then the input "tile" size will be the size of the strip, while the output tile size will
+    * be different and equal to the ossim default tile size. Strips are cached internally to
+    * speed up output tiling. */
+   std::vector<ossimIpt>     theInputTileSize;
+   mutable ossimIpt          theOutputTileSize; // Formerly known as theCurrentTileWidth/Length
+
    ossim_uint32              theCurrentTiffRlevel;
    ossim_int32               theCompressionType;
    std::vector<ossim_uint32> theOutputBandList;

include/ossim/imaging/ossimVertexExtractor.h

@@ -145,8 +145,8 @@ protected:
    ossimFilename    theFilename;
    std::ofstream    theFileStream;
    vector<ossimIpt> theVertice;
-   ossim_int32*     theLeftEdge;
-   ossim_int32*     theRightEdge;
+   std::vector<ossim_int32>     theLeftEdge;
+   std::vector<ossim_int32>     theRightEdge;
 
    //! Disallow copy constructor and operator=
    ossimVertexExtractor(const ossimVertexExtractor&) : theLeftEdge(0), theRightEdge(0) {}

include/ossim/projection/ossimMapProjection.h

@@ -249,6 +249,12 @@ public:
    bool getElevationLookupFlag()const;
 
    const ossimMatrix4x4& getModelTransform() const { return theModelTransform; }
+
+   /**
+    * Sets the map-to-image rotation, scale and offset. In other words, converts easting, northing
+    * in meters to x, y pixels on the image. 
+    * @param transform
+    */
    void setModelTransform(const ossimMatrix4x4& transform);
 
    /**
@@ -290,7 +296,7 @@ protected:
     */
    virtual void updateTransform();
 
-   /** Extracts tiepoint and scale info from transform */
+   /** Extracts tiepoint, scale and rotation info from transform */
    virtual void updateFromTransform();
 
    virtual ~ossimMapProjection();

include/ossim/support_data/ossimGeoTiff.h

@@ -254,6 +254,14 @@ private:
     */
    bool hasOneBasedTiePoints() const;
 
+   /**
+    * In the case when tie points are not explicitely provided, this method assigns them given
+    * the image-model transform.
+    * @return true if properly assigned, false if not.
+    */
+   bool initTiePointsFromImageModelTransform();
+
+
    TIFF*                 theTiffPtr;
    ossim_uint32          theGeoKeyOffset;
    int                   theGeoKeyLength;

include/ossim/support_data/ossimQuickbirdRpcHeader.h

 #ifndef ossimQuickbirdRpcHeader_HEADER
 #define ossimQuickbirdRpcHeader_HEADER
-#include <iostream>
 
+#include <iostream>
 #include <ossim/base/ossimErrorStatusInterface.h>
-
 #include <ossim/base/ossimFilename.h>
+
 class OSSIM_DLL ossimQuickbirdRpcHeader : public ossimErrorStatusInterface
 {
 public:
@@ -48,7 +48,9 @@ public:
   }
   bool isGlobal()const;
   
-  ossimString theFilename;
+  bool parseXml();
+
+  ossimFilename theFilename;
 
   ossimString theSatId;
   ossimString theBandId;

include/ossim/vpfutil/vpftable.h

@@ -194,7 +194,7 @@ int is_vpf_null_double( double num );
 #define 	NULLCHAR	' '
 #define		NULLTEXT	" "
 #define		NULLSHORT	-MAXSHORT
-#define         NULLINT         -MAXLONG
+#define         NULLINT         -MAXINT
 #define		NULLDATE	"                    "
 /* #if UNIX */
 #define		NULLFLOAT	((float) quiet_nan (0))

share/ossim/templates/ossim_preferences_template

@@ -687,8 +687,8 @@ tfrd_iamp_file: $(OSSIM_INSTALL_PREFIX)/share/ossim/tfrd-tables/oamt.dat
 // allows on to specify configuration options and parsing for the hdf5 plugin
 // In this example we have only the Radiance file supported for VIIRS data
 // to get a listing of dataset use the ossim-info -d on any hdf5 dataset file
-// and look at the top for the dataset comma seperated list of dataset paths.
-// You can add a comma seperated list for renderable_datasets and only those will show
+// and look at the top for the dataset comma separated list of dataset paths.
+// You can add a comma separated list for renderable_datasets and only those will show
 // up in an ossim-info
 // 
 hdf5.options.max_recursion_level: 8