diff --git a/Utilities/otbossim/include/ossim/base/ossimPolyLine.h b/Utilities/otbossim/include/ossim/base/ossimPolyLine.h
index 18d0dab285eb4943edc2d11b886be8fab355cb3e..742f1ff757c416403901cf6e54d8feb62f04075f 100644
--- a/Utilities/otbossim/include/ossim/base/ossimPolyLine.h
+++ b/Utilities/otbossim/include/ossim/base/ossimPolyLine.h
@@ -11,7 +11,7 @@
// LIMITATIONS: None.
//
//*****************************************************************************
-// $Id: ossimPolyLine.h 14789 2009-06-29 16:48:14Z dburken $
+// $Id: ossimPolyLine.h 15833 2009-10-29 01:41:53Z eshirschorn $
#ifndef ossimPolyLine_HEADER
#define ossimPolyLine_HEADER
@@ -69,7 +69,7 @@ public:
ossim_uint32 getNumberOfVertices()const
{
- return theVertexList.size();
+ return (ossim_uint32)theVertexList.size();
}
void getIntegerBounds(ossim_int32& minX,
diff --git a/Utilities/otbossim/include/ossim/base/ossimPolynom.h b/Utilities/otbossim/include/ossim/base/ossimPolynom.h
index 583ec23f32968f6d73ba6e1c2187ac8be4910e96..0482d0c11e599ebbac7b083ade5acd98a595c89b 100644
--- a/Utilities/otbossim/include/ossim/base/ossimPolynom.h
+++ b/Utilities/otbossim/include/ossim/base/ossimPolynom.h
@@ -617,7 +617,7 @@ LMSfit(const EXPT_SET& expset,
nullify();
//check size
- int nobs = obs_input.size();
+ int nobs = (int)obs_input.size();
if (nobs != (int)obs_output.size())
{
std::cerr<<"ossimPolynom::LMSfit ERROR observation input/output must have the same size"<<std::endl;
@@ -628,7 +628,7 @@ LMSfit(const EXPT_SET& expset,
std::cerr<<"ossimPolynom::LMSfit ERROR observation count is zero"<<std::endl;
return false;
}
- int ncoeff = expset.size();
+ int ncoeff = (int)expset.size();
if (ncoeff<=0)
{
std::cerr<<"ossimPolynom::LMSfit ERROR exponent count is zero"<<std::endl;
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimIgenGenerator.h b/Utilities/otbossim/include/ossim/imaging/ossimIgenGenerator.h
index e49d1b776524dcbb3c30de3a05b071740a27add1..6b6b1964a76664a9d076a0f514d4bb63511db268 100644
--- a/Utilities/otbossim/include/ossim/imaging/ossimIgenGenerator.h
+++ b/Utilities/otbossim/include/ossim/imaging/ossimIgenGenerator.h
@@ -5,7 +5,7 @@
// Author: Garrett Potts (gpotts@imagelinks.com)
//
//*************************************************************************
-// $Id: ossimIgenGenerator.h 9968 2006-11-29 14:01:53Z gpotts $
+// $Id: ossimIgenGenerator.h 15833 2009-10-29 01:41:53Z eshirschorn $
#ifndef ossimIgenGenerator_HEADER
#define ossimIgenGenerator_HEADER
#include <stack>
@@ -91,7 +91,7 @@ public:
ossim_uint32 getNumberOfSpecFiles()const
{
- return theSpecFileList.size();
+ return (ossim_uint32)theSpecFileList.size();
}
ossimFilename getSpecFilename(ossim_uint32 specFileIndex = 0)const
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimImageData.h b/Utilities/otbossim/include/ossim/imaging/ossimImageData.h
index 91481a0c42e930adf27df8d066b19b2bc51e7919..85ccb04893498cd36e052e01451e88bc17cafe1d 100644
--- a/Utilities/otbossim/include/ossim/imaging/ossimImageData.h
+++ b/Utilities/otbossim/include/ossim/imaging/ossimImageData.h
@@ -9,7 +9,7 @@
// Description: Container class for a tile of image data.
//
//*******************************************************************
-// $Id: ossimImageData.h 15798 2009-10-23 19:15:20Z gpotts $
+// $Id: ossimImageData.h 15833 2009-10-29 01:41:53Z eshirschorn $
#ifndef ossimImageData_HEADER
#define ossimImageData_HEADER
@@ -593,13 +593,13 @@ public:
* destination buffer is to be overwritten by the selected band of the
* source image data (no questions asked).
*
- * @note The src object should have at least the same number of bands as
- * the 'dest' buffer.
+ * @note: The 'dest' buffer should have at least the same number of bands
+ * as the 'src' object.
*
* Currently this routine is only implemented for il_type set to OSSIM_BSQ.
*
- * @param dest The destination buffer with at least the same number of bands
- * as the src (this) object.
+ * @param dest The destination buffer, which should have at least the
+ * same number of bands as the 'src' object.
* @param src_band The 0-based band of the source image data.
* @param dest_band The 0-based band of the dest buffer.
* @param dest_rect The rectangle of the destination buffer.
@@ -630,13 +630,13 @@ public:
* destination buffer is to be overwritten by the selected band of the
* source image data (no questions asked).
*
- * Note: The src object should have at least the same number of bands as
- * the 'dest' buffer.
+ * @note: The 'dest' buffer should have at least the same number of bands
+ * as the 'src' object.
*
* Currently this routine is only implemented for il_type set to OSSIM_BSQ.
*
- * @param dest The destination buffer with at least the same number of bands
- * as the src (this) object.
+ * @param dest The destination buffer, which should have at least the
+ * same number of bands as the 'src' object.
* @param src_band The 0-based band of the source image data.
* @param dest_band The 0-based band of the dest buffer.
* @param dest_rect The rectangle of the destination buffer.
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimImageHandler.h b/Utilities/otbossim/include/ossim/imaging/ossimImageHandler.h
index e411eb92ddd495329a617e48832576cf6e2077d8..1e2e39164cbcaa645efec2cbfae0c04339db91de 100644
--- a/Utilities/otbossim/include/ossim/imaging/ossimImageHandler.h
+++ b/Utilities/otbossim/include/ossim/imaging/ossimImageHandler.h
@@ -12,7 +12,7 @@
// derive from.
//
//********************************************************************
-// $Id: ossimImageHandler.h 15798 2009-10-23 19:15:20Z gpotts $
+// $Id: ossimImageHandler.h 15833 2009-10-29 01:41:53Z eshirschorn $
#ifndef ossimImageHandler_HEADER
#define ossimImageHandler_HEADER
@@ -549,7 +549,17 @@ public:
ossim_uint32 getStartingResLevel() const;
void setStartingResLevel(ossim_uint32 level);
-
+
+ /**
+ * Sets the supplementary directory
+ */
+ virtual void setSupplementaryDirectory(const ossimFilename& dir);
+
+ /**
+ * Returns the supplementary directory
+ */
+ virtual const ossimFilename& getSupplementaryDirectory()const;
+
protected:
@@ -592,6 +602,7 @@ protected:
ossimFilename theImageFile;
ossimFilename theOverviewFile;
+ ossimFilename theSupplementaryDirectory;
ossimRefPtr<ossimImageHandler> theOverview;
vector<ossimIpt> theValidImageVertices;
ossimImageMetaData theMetaData;
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimNitfWriterBase.h b/Utilities/otbossim/include/ossim/imaging/ossimNitfWriterBase.h
index f9c94253c1c1f64815ecc21e4615de1dbfc5d03a..0be96f8aebeb453a426db5c5344b89d0b3af1d61 100644
--- a/Utilities/otbossim/include/ossim/imaging/ossimNitfWriterBase.h
+++ b/Utilities/otbossim/include/ossim/imaging/ossimNitfWriterBase.h
@@ -27,7 +27,7 @@ class ossimProjection;
* @brief OSSIM nitf writer base class to hold methods common to
* all nitf writers.
*/
-class ossimNitfWriterBase : public ossimImageFileWriter
+class OSSIM_DLL ossimNitfWriterBase : public ossimImageFileWriter
{
public:
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimOverviewBuilderFactory.h b/Utilities/otbossim/include/ossim/imaging/ossimOverviewBuilderFactory.h
index f0987843f050ed990f06144aba71ce6bc88d582d..56b56c37c0d7b5dd6bdf6cdca255a0bf719042f3 100644
--- a/Utilities/otbossim/include/ossim/imaging/ossimOverviewBuilderFactory.h
+++ b/Utilities/otbossim/include/ossim/imaging/ossimOverviewBuilderFactory.h
@@ -7,7 +7,7 @@
// Description: The ossim overview builder factory.
//
//----------------------------------------------------------------------------
-// $Id: ossimOverviewBuilderFactory.h 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimOverviewBuilderFactory.h 15833 2009-10-29 01:41:53Z eshirschorn $
#ifndef ossimOverviewBuilderFactory_HEADER
#define ossimOverviewBuilderFactory_HEADER
@@ -37,7 +37,7 @@ public:
* @brief Creates a builder from a string. This should match a string from
* the getTypeNameList() method. Pure virtual.
*
- * @return Pointer to ossimOverviewBuilderInterface or NULL is not found
+ * @return Pointer to ossimOverviewBuilderBase or NULL is not found
* within registered factories.
*/
virtual ossimOverviewBuilderBase* createBuilder(
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimOverviewBuilderFactoryBase.h b/Utilities/otbossim/include/ossim/imaging/ossimOverviewBuilderFactoryBase.h
index 7adfc24ce5d82b414a2d40ab4c0e6f01e937c90a..94d385bbc1d93665ec12a27d257478b2c24b9788 100644
--- a/Utilities/otbossim/include/ossim/imaging/ossimOverviewBuilderFactoryBase.h
+++ b/Utilities/otbossim/include/ossim/imaging/ossimOverviewBuilderFactoryBase.h
@@ -7,7 +7,7 @@
// Description: The base class for overview builders.
//
//----------------------------------------------------------------------------
-// $Id: ossimOverviewBuilderFactoryBase.h 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimOverviewBuilderFactoryBase.h 15833 2009-10-29 01:41:53Z eshirschorn $
#ifndef ossimOverviewBuilderFactoryBase_HEADER
#define ossimOverviewBuilderFactoryBase_HEADER
@@ -36,7 +36,7 @@ public:
* @brief Creates a builder from a string. This should match a string from
* the getTypeNameList() method. Pure virtual.
*
- * @return Pointer to ossimOverviewBuilderInterface or NULL is not found
+ * @return Pointer to ossimOverviewBuilderBase or NULL is not found
* within registered factories.
*/
virtual ossimOverviewBuilderBase* createBuilder(const ossimString& typeName) const = 0;
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimOverviewBuilderFactoryRegistry.h b/Utilities/otbossim/include/ossim/imaging/ossimOverviewBuilderFactoryRegistry.h
index 9821c78b0e1559d7ab7c83734fdd239116cf3cc5..7502290018e27aeb95715d6b4f01ab2fab395608 100644
--- a/Utilities/otbossim/include/ossim/imaging/ossimOverviewBuilderFactoryRegistry.h
+++ b/Utilities/otbossim/include/ossim/imaging/ossimOverviewBuilderFactoryRegistry.h
@@ -7,7 +7,7 @@
// Description: The factory registry for overview builders.
//
//----------------------------------------------------------------------------
-// $Id: ossimOverviewBuilderFactoryRegistry.h 9930 2006-11-22 19:23:40Z dburken $
+// $Id: ossimOverviewBuilderFactoryRegistry.h 15833 2009-10-29 01:41:53Z eshirschorn $
#ifndef ossimOverviewBuilderFactoryRegistry_HEADER
#define ossimOverviewBuilderFactoryRegistry_HEADER
@@ -60,7 +60,7 @@ public:
/**
* @brief Creates a builder from a string. This should match a string from
* the getTypeNameList() method.
- * @return Pointer to ossimOverviewBuilderInterface or NULL is not found
+ * @return Pointer to ossimOverviewBuilderBase or NULL is not found
* within registered factories.
*/
ossimOverviewBuilderBase* createBuilder(const ossimString& typeName) const;
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimOverviewSequencer.h b/Utilities/otbossim/include/ossim/imaging/ossimOverviewSequencer.h
index 193595929d9ab65cb842926c3051caa52c4a3486..94d06bedf268f286072f6104b604eb527b33ce9b 100644
--- a/Utilities/otbossim/include/ossim/imaging/ossimOverviewSequencer.h
+++ b/Utilities/otbossim/include/ossim/imaging/ossimOverviewSequencer.h
@@ -7,7 +7,7 @@
// Description: Class definition for sequencer for building overview files.
//
//----------------------------------------------------------------------------
-// $Id: ossimOverviewSequencer.h 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimOverviewSequencer.h 15833 2009-10-29 01:41:53Z eshirschorn $
#ifndef ossimOverviewSequencer_HEADER
#define ossimOverviewSequencer_HEADER
@@ -132,7 +132,21 @@ public:
*/
void setResampleType(
ossimFilterResampler::ossimFilterResamplerType resampleType);
-
+
+ /**
+ * @return The index location of the current tile.
+ */
+ ossim_uint32 getCurrentTileNumber() const;
+
+ /**
+ * @brief Will set the internal pointers to the specified
+ * tile number. To get the data for this tile number and then
+ * to set up to the next tile in the sequence just call
+ * getNextTile.
+ * @param tileNumber The index location of the desired tile.
+ */
+ void setCurrentTileNumber( ossim_uint32 tileNumber );
+
protected:
/** virtual destructor */
virtual ~ossimOverviewSequencer();
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimTiffOverviewBuilder.h b/Utilities/otbossim/include/ossim/imaging/ossimTiffOverviewBuilder.h
index a78eba94e29a119224953f2bb2ad92d06b0fb915..27e385d351a67fda056e8164b99e64a5aaa532c8 100644
--- a/Utilities/otbossim/include/ossim/imaging/ossimTiffOverviewBuilder.h
+++ b/Utilities/otbossim/include/ossim/imaging/ossimTiffOverviewBuilder.h
@@ -11,7 +11,7 @@
// Contains class declaration for TiffOverviewBuilder.
//
//*******************************************************************
-// $Id: ossimTiffOverviewBuilder.h 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimTiffOverviewBuilder.h 15833 2009-10-29 01:41:53Z eshirschorn $
#ifndef ossimTiffOverviewBuilder_HEADER
#define ossimTiffOverviewBuilder_HEADER
@@ -133,7 +133,7 @@ public:
/**
* @brief Sets the input to the builder. Satisfies pure virtual from
- * ossimOverviewBuilderInterface.
+ * ossimOverviewBuilderBase.
*
* @param imageSource The input to the builder.
*
@@ -143,7 +143,7 @@ public:
/**
* @brief Sets the output filename.
- * Satisfies pure virtual from ossimOverviewBuilderInterface.
+ * Satisfies pure virtual from ossimOverviewBuilderBase.
* @param file The output file name.
*/
virtual void setOutputFile(const ossimFilename& file);
@@ -167,7 +167,7 @@ public:
/**
* @brief Sets the overview output type.
*
- * Satisfies pure virtual from ossimOverviewBuilderInterface.
+ * Satisfies pure virtual from ossimOverviewBuilderBase.
*
* Currently handled types are:
* "ossim_tiff_nearest" and "ossim_tiff_box"
@@ -181,20 +181,20 @@ public:
/**
* @brief Gets the overview type.
- * Satisfies pure virtual from ossimOverviewBuilderInterface.
+ * Satisfies pure virtual from ossimOverviewBuilderBase.
* @return The overview output type as a string.
*/
virtual ossimString getOverviewType() const;
/**
* @brief Method to populate class supported types.
- * Satisfies pure virtual from ossimOverviewBuilderInterface.
+ * Satisfies pure virtual from ossimOverviewBuilderBase.
* @param typeList List of ossimStrings to add to.
*/
virtual void getTypeNameList(std::vector<ossimString>& typeList)const;
/**
- * @biref Method to set properties.
+ * @brief Method to set properties.
* @param property Property to set.
*
* @note Currently supported property:
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimTiffTileSource.h b/Utilities/otbossim/include/ossim/imaging/ossimTiffTileSource.h
index 44a9dec9c84fa27cd7f4a723f18184ebd0b17da4..588df30a2932cd78cea703e7ebd3acc019350bfd 100644
--- a/Utilities/otbossim/include/ossim/imaging/ossimTiffTileSource.h
+++ b/Utilities/otbossim/include/ossim/imaging/ossimTiffTileSource.h
@@ -13,7 +13,7 @@
// ossimTiffTileSource is derived from ImageHandler which is derived from
// TileSource.
//*******************************************************************
-// $Id: ossimTiffTileSource.h 15825 2009-10-27 15:31:44Z dburken $
+// $Id: ossimTiffTileSource.h 15833 2009-10-29 01:41:53Z eshirschorn $
#ifndef ossimTiffTileSource_HEADER
#define ossimTiffTileSource_HEADER
@@ -252,7 +252,7 @@ private:
void setReadMethod();
- virtual void initializeBuffers();
+ virtual bool initializeBuffers();
/**
* Change tiff directory and sets theCurrentDirectory.
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimTileCache.h b/Utilities/otbossim/include/ossim/imaging/ossimTileCache.h
index 7e365e9600581568c58f88455e53b09fa75d2529..c370ab1063159c8ac4187c99f1636f2dd78f9f44 100644
--- a/Utilities/otbossim/include/ossim/imaging/ossimTileCache.h
+++ b/Utilities/otbossim/include/ossim/imaging/ossimTileCache.h
@@ -9,7 +9,7 @@
// Description: This file contains the cache algorithm
//
//***********************************
-// $Id: ossimTileCache.h 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimTileCache.h 15833 2009-10-29 01:41:53Z eshirschorn $
#ifndef DataCache_HEADER
#define DataCache_HEADER
@@ -61,7 +61,7 @@ public:
- virtual long numberOfItems()const{return theCache?theCache->size():0;}
+ virtual long numberOfItems()const{return theCache?(long)theCache->size():(long)0;}
virtual void display()const;
virtual ossim_uint32 sizeInBytes(){return theSizeInBytes;}
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimVirtualImageHandler.h b/Utilities/otbossim/include/ossim/imaging/ossimVirtualImageHandler.h
new file mode 100644
index 0000000000000000000000000000000000000000..12a88676b8d1da5ede89de04d3958eebad008bda
--- /dev/null
+++ b/Utilities/otbossim/include/ossim/imaging/ossimVirtualImageHandler.h
@@ -0,0 +1,292 @@
+//*******************************************************************
+//
+// License: See top level LICENSE.txt file.
+//
+// Author: Eric Hirschorn
+//
+// Description:
+//
+// Contains class declaration for ossimVirtualImageHandler.
+// ossimVirtualImageHandler is derived from ImageHandler which is
+// derived from ImageSource.
+//*******************************************************************
+// $Id: ossimVirtualImageHandler.h 14655 2009-06-05 11:58:56Z dburken $
+
+#ifndef ossimVirtualImageHandler_HEADER
+#define ossimVirtualImageHandler_HEADER
+
+#include <ossim/imaging/ossimImageHandler.h>
+#include <ossim/base/ossimIrect.h>
+#include <tiffio.h>
+
+class ossimImageData;
+
+class OSSIMDLLEXPORT ossimVirtualImageHandler : public ossimImageHandler
+{
+public:
+
+ enum ReadMethod
+ {
+ UNKNOWN,
+ READ_RGBA_U8_TILE,
+ READ_RGBA_U8_STRIP,
+ READ_RGBA_U8A_STRIP,
+ READ_SCAN_LINE,
+ READ_TILE
+ };
+
+ ossimVirtualImageHandler();
+
+ virtual ~ossimVirtualImageHandler();
+
+ virtual ossimString getLongName() const;
+ virtual ossimString getShortName() const;
+
+ /**
+ * Returns true if the image_file can be opened and is a valid tiff file.
+ */
+ virtual bool open( const ossimFilename& image_file );
+ virtual void close();
+ virtual bool isOpen()const;
+
+ /**
+ * Returns a pointer to a tile given an origin representing the upper left
+ * corner of the tile to grab from the image.
+ * Satisfies pure virtual from TileSource class.
+ */
+ virtual ossimRefPtr<ossimImageData> getTile( const ossimIrect& rect,
+ ossim_uint32 resLevel=0 );
+
+ /**
+ * Method to get a tile.
+ *
+ * @param result The tile to stuff. Note The requested rectangle in full
+ * image space and bands should be set in the result tile prior to
+ * passing. It will be an error if:
+ * result.getNumberOfBands() != this->getNumberOfOutputBands()
+ *
+ * @return true on success false on error. If return is false, result
+ * is undefined so caller should handle appropriately with makeBlank or
+ * whatever.
+ */
+ virtual bool getTile(ossimImageData& result, ossim_uint32 resLevel=0);
+
+ /**
+ * Returns the number of bands in the image.
+ * Satisfies pure virtual from ImageHandler class.
+ */
+ virtual ossim_uint32 getNumberOfInputBands() const;
+ virtual ossim_uint32 getNumberOfOutputBands () const;
+
+ /**
+ * Returns the number of lines in the image.
+ * Satisfies pure virtual from ImageHandler class.
+ */
+ virtual ossim_uint32 getNumberOfLines(ossim_uint32 resLevel = 0) const;
+
+ /**
+ * Returns the number of samples in the image.
+ * Satisfies pure virtual from ImageHandler class.
+ */
+ virtual ossim_uint32 getNumberOfSamples(ossim_uint32 resLevel = 0) const;
+
+ /**
+ * Returns the zero-based (relative) image rectangle for the reduced
+ * resolution data set (rrds) passed in. Note that rrds 0 is the highest
+ * resolution rrds.
+ */
+ virtual ossimIrect getImageRectangle(ossim_uint32 resLevel = 0) const;
+
+ /**
+ * Returns the number of reduced resolution data sets (rrds).
+ * Notes:
+ *
+ * - The full res image is counted as a data set so an image with no
+ * reduced resolution data set will have a count of one.
+ * - This method counts R0 as a res set even if it does not have one.
+ * This was done deliberately so as to not screw up code down the
+ * line.
+ */
+ virtual ossim_uint32 getNumberOfDecimationLevels() const;
+
+ /**
+ * Returns the output pixel type of the tile source.
+ */
+ virtual ossimScalarType getOutputScalarType() const;
+
+ /**
+ * Returns the width of the tiles within a frame file.
+ */
+ virtual ossim_uint32 getTileWidth() const;
+
+ /**
+ * Returns the height of the tiles within a frame file.
+ */
+ virtual ossim_uint32 getTileHeight() const;
+
+ /**
+ * Returns the width of the frame files.
+ */
+ virtual ossim_uint32 getFrameWidth() const;
+
+ /**
+ * Returns the height of the frame files.
+ */
+ virtual ossim_uint32 getFrameHeight() const;
+
+ /**
+ * Returns true if the virtual image has a copy of the
+ * highest resolution imagery from the source data.
+ */
+ bool hasR0() const;
+
+ virtual double getMinPixelValue( ossim_uint32 band=0 )const;
+ virtual double getMaxPixelValue( ossim_uint32 band=0 )const;
+
+ virtual bool isValidRLevel( ossim_uint32 resLevel ) const;
+
+ /**
+ * @return The tile width of the image or 0 if the image is not tiled.
+ * Note: this is not the same as the ossimImageSource::getTileWidth which
+ * returns the output tile width, which can be different than the
+ * internal image tile width on disk.
+ */
+ virtual ossim_uint32 getImageTileWidth() const;
+
+ /**
+ * @return The tile width of the image or 0 if the image is not tiled.
+ * Note: this is not the same as the ossimImageSource::getTileHeight which
+ * returns the output tile width which can be different than the internal
+ * image tile width on disk.
+ */
+ virtual ossim_uint32 getImageTileHeight() const;
+
+ virtual void setProperty( ossimRefPtr<ossimProperty> property );
+ virtual ossimRefPtr<ossimProperty> getProperty( const ossimString& name )const;
+ virtual void getPropertyNames( std::vector<ossimString>& propertyNames )const;
+
+ virtual std::ostream& print( std::ostream& os ) const;
+
+protected:
+
+ /**
+ * Returns true if no errors.
+ */
+ bool open();
+
+ bool allocateBuffer();
+
+ bool loadTile( const ossimIrect& clip_rect,
+ ossimImageData& result,
+ ossim_uint32 resLevel );
+
+ virtual bool initializeBuffers();
+
+ /**
+ * @brief validateMinNax Checks min and max to make sure they are not equal
+ * to the scalar type nan or double nan; sets to default min max if so.
+ */
+ void validateMinMax();
+
+ /**
+ * Retrieves the virtual image header info from a keywordlist.
+ *
+ * @param kwl A keywordlist where the header info is stored.
+ * @return true on success, false on error.
+ */
+ virtual bool loadHeaderInfo( const ossimKeywordlist& kwl );
+
+ /**
+ * Retrieves the virtual image -specific information for
+ * a single image entry from the keywordlist.
+ */
+ void loadNativeKeywordEntry( const ossimKeywordlist& kwl,
+ const ossimString& prefix );
+
+ /**
+ * Retrieves the geometry information for a single image entry
+ * from the keywordlist.
+ */
+ void loadGeometryKeywordEntry( const ossimKeywordlist& kwl,
+ const ossimString& prefix );
+
+ /**
+ * Retrieves general image information for a single image entry
+ * from the keywordlist.
+ */
+ void loadGeneralKeywordEntry( const ossimKeywordlist& kwl,
+ const ossimString& prefix );
+
+ /**
+ * Grab the null, min, and max values from the input keywordlist.
+ */
+ void loadMetaData( const ossimKeywordlist& kwl );
+
+ /**
+ * Opens a tiff file for a single output frame for reading.
+ *
+ * @param resLevel The zero-based resolution level of the frame
+ * @param row The zero-based row at which the frame is located
+ * @param col The zero-based column at which the frame is located
+ * @return true on success, false on error.
+ */
+ bool openTiff( int resLevel, int row, int col );
+
+ /**
+ * Close the currently open tiff file.
+ * @return true on success, false on error.
+ */
+ bool closeTiff();
+
+ /**
+ * Calculates and returns the number of tiles in x,y that a
+ * single frame of the virtual image contain.
+ *
+ * @return the number of tiles in x,y directions.
+ */
+ ossimIpt getNumberOfTilesPerFrame() const;
+
+ ossim_uint8* theBuffer;
+ ossim_uint32 theBufferSize;
+ ossimIrect theBufferRect;
+ ossim_uint8* theNullBuffer;
+ ossim_uint16 theSampleFormatUnit;
+ double theMaxSampleValue;
+ double theMinSampleValue;
+ ossim_uint16 theBitsPerSample;
+ ossim_uint32 theBytesPerPixel;
+ ossimFilename theImageSubdirectory;
+ ossimFilename theCurrentFrameName;
+ ossimString theVirtualWriterType;
+ ossimString theMajorVersion;
+ ossimString theMinorVersion;
+ ossim_uint16 theCompressType;
+ ossim_int32 theCompressQuality;
+ bool theOverviewFlag;
+ bool theOpenedFlag;
+ bool theR0isFullRes;
+ ossim_int16 theEntryIndex;
+ ossim_uint16 theResLevelStart;
+ ossim_uint16 theResLevelEnd;
+ ossim_uint16 theSamplesPerPixel;
+ ossim_uint16 theNumberOfResLevels;
+ ossim_uint16 thePlanarConfig;
+ ossimScalarType theScalarType;
+ vector<ossimIpt> theNumberOfFrames;
+ ReadMethod theReadMethod;
+ ossim_int32 theImageTileWidth;
+ ossim_int32 theImageTileLength;
+ ossim_int32 theImageFrameWidth;
+ ossim_int32 theImageFrameLength;
+ ossim_int32 theR0NumberOfLines;
+ ossim_int32 theR0NumberOfSamples;
+ ossim_uint16 thePhotometric;
+ TIFF* theTif;
+ ossimRefPtr<ossimImageData> theTile;
+ vector<ossim_uint32> theImageWidth;
+ vector<ossim_uint32> theImageLength;
+
+ TYPE_DATA
+};
+
+#endif
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimVirtualImageTiffWriter.h b/Utilities/otbossim/include/ossim/imaging/ossimVirtualImageTiffWriter.h
new file mode 100644
index 0000000000000000000000000000000000000000..cda45b89c0a770eeaa36227bc3cae464e5151734
--- /dev/null
+++ b/Utilities/otbossim/include/ossim/imaging/ossimVirtualImageTiffWriter.h
@@ -0,0 +1,191 @@
+//*******************************************************************
+//
+// License: LGPL
+//
+// See LICENSE.txt file in the top level directory for more details.
+//
+// Author: Eric Hirschorn
+//
+// Description:
+//
+// Contains class declaration for VirtualImageTiffWriter.
+//
+//*******************************************************************
+// $Id: ossimVirtualImageTiffWriter.h 11683 2007-09-07 17:25:30Z gpotts $
+#ifndef ossimVirtualImageTiffWriter_HEADER
+#define ossimVirtualImageTiffWriter_HEADER
+
+#include <ossim/base/ossimRefPtr.h>
+#include <ossim/projection/ossimMapProjectionInfo.h>
+#include <ossim/imaging/ossimVirtualImageWriter.h>
+
+class OSSIMDLLEXPORT ossimVirtualImageTiffWriter : public ossimVirtualImageWriter
+{
+public:
+
+ ossimVirtualImageTiffWriter( const ossimFilename& filename = ossimFilename(),
+ ossimImageHandler* inputSource = 0,
+ bool overviewFlag = false );
+
+ virtual ~ossimVirtualImageTiffWriter();
+
+ virtual void setOutputTileSize( const ossimIpt& tileSize );
+
+ virtual ossimIpt getOutputTileSize()const;
+
+ /**
+ * Sets the compression quality for use when using a compression type
+ * of COMPRESSION_JPEG.
+ *
+ * @param quality Range 1 to 100 with 100 being best quality.
+ */
+ virtual void setCompressionQuality( ossim_int32 quality );
+
+ /**
+ * Compression type can be JPEG, PACKBITS, or ZIP/DEFLATE
+ */
+ virtual void setCompressionType( const ossimString& type );
+
+ /**
+ * @brief Returns the overview type associated with the given
+ * filter resampler type.
+ *
+ * Called from ossimVirtualImageBuilder.
+ *
+ * Currently handled types are:
+ * "ossim_virtual_tiff_nearest" and "ossim_virtual_tiff_box"
+ *
+ * @param type a resampler filter type.
+ *
+ * @return the overview type.
+ */
+ static ossimString getOverviewType(
+ ossimFilterResampler::ossimFilterResamplerType type );
+
+ /**
+ * @brief Returns the filter resampler type associated with the given
+ * overview type.
+ *
+ * Called from ossimVirtualImageBuilder.
+ *
+ * Currently handled types are:
+ * "ossim_virtual_tiff_nearest" and "ossim_virtual_tiff_box"
+ *
+ * @param type This should be the string representing the type. This method
+ * will do nothing if type is not handled and return false.
+ *
+ * @return the filter resampler type.
+ */
+ static ossimFilterResampler::ossimFilterResamplerType
+ getResamplerType( const ossimString& type );
+
+ /**
+ * @brief Identifies whether or not the overview type is handled by
+ * this writer.
+ *
+ * Called from ossimVirtualImageBuilder.
+ *
+ * Currently handled types are:
+ * "ossim_virtual_tiff_nearest" and "ossim_virtual_tiff_box"
+ *
+ * @param type This should be the string representing the type. This method
+ * will do nothing if type is not handled and return false.
+ *
+ * @return true if type is handled, false if not.
+ */
+ static bool isOverviewTypeHandled( const ossimString& type );
+
+ /**
+ * @brief Method to populate class supported types.
+ * Called from ossimVirtualImageBuilder.
+ * @param typeList List of ossimStrings to add to.
+ */
+ static void getTypeNameList( std::vector<ossimString>& typeList );
+
+protected:
+
+ /**
+ * @brief Method to initialize output file name from image handler.
+ * @return true on success, false on error.
+ */
+ virtual bool initializeOutputFilenamFromHandler();
+
+ /**
+ * Set the metadata tags for the appropriate resLevel.
+ * Level zero is the full resolution image.
+ *
+ * @param rrds_level The current reduced res level.
+ * @param outputRect The dimensions (zero based) of res set.
+ */
+ virtual bool setTags( ossim_int32 resLevel,
+ const ossimIrect& outputRect ) const;
+
+ /**
+ * Opens a tiff file for a single output frame for writing.
+ *
+ * @param resLevel The zero-based resolution level of the frame
+ * @param row The zero-based row at which the frame is located
+ * @param col The zero-based column at which the frame is located
+ * @return true on success, false on error.
+ */
+ bool openTiff( int resLevel, int row, int col );
+
+ /**
+ * Close the currently open tiff file.
+ * @return true on success, false on error.
+ */
+ bool closeTiff();
+
+ /**
+ * Renames the current frame from the temporary name
+ * it carries during writing to the final name. I.e.
+ * the .tmp at the end of the name is removed.
+ */
+ void renameTiff();
+
+ /**
+ * Closes the current frame file.
+ */
+ void flushTiff();
+
+ /**
+ * Copy user-selected individual frames of the full resolution
+ * image data to the output virtual image.
+ * @return true on success, false on error.
+ */
+ virtual bool writeR0Partial();
+
+ /**
+ * Copy all of the full resolution image data to the output
+ * virtual image.
+ * @return true on success, false on error.
+ */
+ virtual bool writeR0Full();
+
+ /**
+ * Write user-selected individual frames of the reduced resolution
+ * image data to the output virtual image.
+ *
+ * @param resLevel The reduced resolution level to write.
+ * @return true on success, false on error.
+ */
+ virtual bool writeRnPartial( ossim_uint32 resLevel );
+
+ /**
+ * Write all of the reduced resolution image data at the given
+ * resolution level to the output virtual image.
+ *
+ * @param resLevel The reduced resolution level to write.
+ * @return true on success, false on error.
+ */
+ virtual bool writeRnFull( ossim_uint32 resLevel );
+
+ TIFF* theTif;
+ ossimRefPtr<ossimMapProjectionInfo> theProjectionInfo;
+ ossimFilename theCurrentFrameName;
+ ossimFilename theCurrentFrameNameTmp;
+
+TYPE_DATA
+};
+
+#endif /* End of "#ifndef ossimVirtualImageTiffWriter_HEADER" */
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimVirtualImageWriter.h b/Utilities/otbossim/include/ossim/imaging/ossimVirtualImageWriter.h
new file mode 100644
index 0000000000000000000000000000000000000000..4a87d3fc8f43db69b0da6bb61a8464aa0a77847f
--- /dev/null
+++ b/Utilities/otbossim/include/ossim/imaging/ossimVirtualImageWriter.h
@@ -0,0 +1,409 @@
+//*******************************************************************
+//
+// License: LGPL
+//
+// See LICENSE.txt file in the top level directory for more details.
+//
+// Author: Eric Hirschorn
+//
+// Description:
+//
+// Contains class declaration for ossimVirtualImageWriter
+//*******************************************************************
+// $Id: ossimVirtualImageWriter.h 11181 2007-06-07 19:57:14Z dburken $
+
+#ifndef ossimVirtualImageWriter_HEADER
+#define ossimVirtualImageWriter_HEADER
+
+#include <ossim/base/ossimFilename.h>
+#include <ossim/base/ossimOutputSource.h>
+#include <ossim/base/ossimProcessInterface.h>
+#include <ossim/base/ossimConnectableObjectListener.h>
+#include <ossim/imaging/ossimFilterResampler.h>
+#include <ossim/imaging/ossimImageSourceSequencer.h>
+
+class ossimImageHandler;
+class ossimStdOutProgress;
+
+#define OSSIM_DEFAULT_FRAME_HEIGHT ((ossim_int32)128)
+#define OSSIM_DEFAULT_FRAME_WIDTH ((ossim_int32)128)
+
+// Helper struct for organizing RPF frames.
+struct InputFrameInfo
+{
+ ossimFilename name;
+ ossim_uint32 entry;
+ ossim_uint32 row;
+ ossim_uint32 col;
+
+ // output frame indices
+ // calculated during execute()
+ std::vector<ossim_int32> xRangeMin;
+ std::vector<ossim_int32> xRangeMax;
+ std::vector<ossim_int32> yRangeMin;
+ std::vector<ossim_int32> yRangeMax;
+
+ bool isValid( ossim_uint32 resLevel=0 )
+ { return xRangeMin.size()>resLevel &&
+ xRangeMax.size()>resLevel &&
+ yRangeMin.size()>resLevel &&
+ yRangeMax.size()>resLevel;
+ }
+
+};
+
+/**
+ * Base class for writers of virtual images.
+ *
+ * There is normally one subclass of this class for each format supported
+ * for writing. This class works closely with the ossimVirtualOverviewBuilder
+ * class to provide it functionality for specific image formats. Format
+ * specific ossimVirtualImageWriters are normally instantiated by the
+ * ossimVirtualImageBuilder::setOverviewType() method.
+ * ossimVirtualImageWriters should not be directly instantiated by
+ * application code.
+ */
+class OSSIMDLLEXPORT ossimVirtualImageWriter : public ossimOutputSource,
+ public ossimProcessInterface,
+ public ossimConnectableObjectListener
+{
+public:
+
+ ossimVirtualImageWriter( const ossimFilename& filename = ossimFilename(),
+ ossimImageHandler* inputSource=0,
+ bool overviewFlag = false );
+
+ virtual ~ossimVirtualImageWriter();
+
+ /**
+ * Sets the output image tiling size if supported by the writer. If not
+ * supported this simply sets the sequencer(input) tile size.
+ */
+ virtual void setOutputTileSize( const ossimIpt& tileSize );
+
+ /**
+ * Number of pixels on a side of the output frames of the
+ * virtual image.
+ */
+ virtual void setOutputFrameSize( const ossimIpt& frameSize );
+
+ virtual void initialize();
+
+ virtual void setOutputImageType( ossim_int32 type );
+ virtual void setOutputImageType( const ossimString& type );
+ virtual ossim_int32 getOutputImageType() const;
+ virtual ossimString getOutputImageTypeString() const;
+
+ virtual void setOutputFile( const ossimFilename& file );
+ virtual const ossimFilename& getOutputFile()const;
+
+ virtual bool canConnectMyInputTo( ossim_int32 inputIndex,
+ const ossimConnectableObject* object )const;
+
+ /**
+ * @return Returns theAreaOfInterest.
+ */
+ virtual ossimIrect getAreaOfInterest() const;
+
+ virtual void setAreaOfInterest( const ossimIrect& inputAreaOfInterest );
+
+ /**
+ * Supports BOX or NEAREST NEIGHBOR.
+ * When indexed you should probably use nearest neighbor
+ */
+ void setResampleType( ossimFilterResampler::ossimFilterResamplerType t )
+ { theResampleType = t; }
+
+ ossimFilterResampler::ossimFilterResamplerType getResampleType() const
+ { return theResampleType; }
+
+ /**
+ * Sets the compression type to use when building virtual images.
+ */
+ virtual void setCompressionType( const ossimString& type ) = 0;
+
+ /**
+ * Sets the compression quality.
+ */
+ virtual void setCompressionQuality( ossim_int32 quality ) = 0;
+
+ /**
+ * @brief Method to return the flag that identifies whether or not the
+ * virtual image is an overview or not.
+ * @return The overview flag. If true the virtual image is an overview
+ * that contains missing resolution levels of another image.
+ */
+ bool getOverviewFlag() const;
+
+ /**
+ * @brief Method to set the flag that identifies whether or not the
+ * virtual image is an overview or not.
+ * @param flag The overview flag. If true the virtual image is an overview
+ * that contains missing resolution levels of another image.
+ */
+ void setOverviewFlag( bool flag );
+
+ /**
+ * @brief Method to return copy all flag.
+ * @return The copy all flag. If true all data will be written to the
+ * overview including R0.
+ */
+ bool getCopyAllFlag() const;
+
+ /**
+ * @brief Sets theCopyAllFlag.
+ * @param flag The flag. If true all data will be written to the
+ * overview including R0.
+ */
+ void setCopyAllFlag( bool flag );
+
+ /**
+ * @return ossimObject* to this object.
+ */
+ virtual ossimObject* getObject();
+
+ /**
+ * @return const ossimObject* to this object.
+ */
+ virtual const ossimObject* getObject() const;
+
+ /**
+ * Unused inherited function isOpen()
+ */
+ virtual bool isOpen() const { return false; }
+ /**
+ * Unused inherited function open()
+ */
+ virtual bool open() { return false; }
+ /**
+ * Unused inherited function close()
+ */
+ virtual void close() {}
+
+ /**
+ * @brief Sets the name of a frame for guiding a limited-scope virtual
+ * image update.
+ *
+ * @param name The name of an existing frame file of an RPF image.
+ */
+ void setDirtyFrame( const ossimString& name );
+
+ /**
+ * Manages the writing of the virtual image file.
+ * @return true on success, false on error.
+ */
+ virtual bool execute();
+
+protected:
+
+ /**
+ * Copy the full resolution image data to the output image.
+ * @return true on success, false on error.
+ */
+ virtual bool writeR0();
+
+ /**
+ * Write reduced resolution data set to the file.
+ * @return true on success, false on error.
+ */
+ virtual bool writeRn( ossim_uint32 resLevel );
+
+ /**
+ * Copy user-selected individual frames of the full resolution
+ * image data to the output virtual image.
+ * @return true on success, false on error.
+ */
+ virtual bool writeR0Partial() { return false; }
+
+ /**
+ * Copy all of the full resolution image data to the output
+ * virtual image.
+ * @return true on success, false on error.
+ */
+ virtual bool writeR0Full() { return false; }
+
+ /**
+ * Write user-selected individual frames of the reduced resolution
+ * image data to the output virtual image.
+ *
+ * @param resLevel The reduced resolution level to write.
+ * @return true on success, false on error.
+ */
+ virtual bool writeRnPartial( ossim_uint32 resLevel )
+ { return false; }
+
+ /**
+ * Write all of the reduced resolution image data at the given
+ * resolution level to the output virtual image.
+ *
+ * @param resLevel The reduced resolution level to write.
+ * @return true on success, false on error.
+ */
+ virtual bool writeRnFull( ossim_uint32 resLevel )
+ { return false; }
+
+ /**
+ * Set the metadata tags for the appropriate resLevel.
+ * Level zero is the full resolution image.
+ *
+ * @param outputRect The dimensions (zero based) of res set.
+ * @param rrds_level The current reduced res level.
+ */
+ virtual bool setTags( ossim_int32 resLevel,
+ const ossimIrect& outputRect ) const = 0;
+
+ /**
+ * @brief Method to initialize output file name from image handler.
+ * @return true on success, false on error.
+ */
+ virtual bool initializeOutputFilenamFromHandler() = 0;
+
+ /**
+ * @brief Gets the zero based final reduced resolution data set.
+ *
+ * @param startResLevel The starting reduced resolution level.
+ * @param bPartialBuild If true, do calculation assuming a partial build.
+ * @return the final reduced resolution data set 0 being full res.
+ */
+ virtual ossim_uint32 getFinalResLevel( ossim_uint32 startResLevel,
+ bool bPartialBuild=false ) const;
+
+ /**
+ * @brief Gets the zero based starting reduced resolution data set.
+ *
+ * @return the starting reduced resolution data set 0 being full res.
+ */
+ virtual ossim_uint32 getStartingResLevel() const;
+
+ /**
+ * Set the header info into a keywordlist after the output
+ * frames have been output from the start to end resolution
+ * levels.
+ *
+ * @param kwl A keywordlist where the header info is stored.
+ * @param begin The starting reduced resolution level.
+ * @param end The final reduced resolution level.
+ * @return true on success, false on error.
+ */
+ virtual bool saveHeaderInfo( ossimKeywordlist& kwl,
+ ossim_uint32 begin,
+ ossim_uint32 end );
+
+ /**
+ * Set the virtual image -specific information for
+ * a single image entry to the keywordlist.
+ */
+ void saveNativeKeywordEntry( ossimKeywordlist& kwl,
+ const ossimString& prefix,
+ ossim_uint32 resLevelBegin,
+ ossim_uint32 resLevelEnd ) const;
+
+ /**
+ * Set the geometry information for a single image entry
+ * to the keywordlist.
+ */
+ void saveGeometryKeywordEntry( ossimKeywordlist& kwl,
+ const ossimString& prefix );
+
+ /**
+ * Set general image information for a single image entry
+ * to the keywordlist.
+ */
+ void saveGeneralKeywordEntry( ossimKeywordlist& kwl,
+ const ossimString& prefix ) const;
+
+ /**
+ * @return true if the current entry of 'theImageHandler' represents
+ * an external overview.
+ */
+ bool isExternalOverview() const;
+
+ /**
+ * Calculates and returns the number of frames in x,y that the
+ * virtual image will contain at the requested resolution level.
+ *
+ * @param resLevel The reduced resolution level.
+ * @return the number of frames in the x,y directions.
+ */
+ ossimIpt getNumberOfOutputFrames( ossim_uint32 resLevel=0 ) const;
+
+ /**
+ * Calculates and returns the total number of frames that will be
+ * built at the requested resolution level.
+ *
+ * @param resLevel The reduced resolution level.
+ * @param bPartialBuild If true, do calculation assuming a partial build.
+ * @return the number of frames in the x,y directions.
+ */
+ ossim_int32 getNumberOfBuiltFrames( ossim_uint32 resLevel=0,
+ bool bPartialBuild=false ) const;
+
+ /**
+ * Calculates and returns the number of tiles in x,y that the
+ * output image will contain at the requested resolution level.
+ *
+ * @param resLevel The reduced resolution level.
+ * @return the number of tiles in the x,y directions.
+ */
+ ossimIpt getNumberOfOutputTiles( ossim_uint32 resLevel=0 ) const;
+
+ /**
+ * Calculates and returns the number of tiles in x,y that a
+ * single frame of the virtual image will contain.
+ *
+ * @return the number of tiles in x,y directions.
+ */
+ ossimIpt getNumberOfTilesPerOutputFrame() const;
+
+ /**
+ * Finds information about the RPF frame of the given name.
+ *
+ * @param name The name of an RPF frame file.
+ * @return a pointer to a InputFrameInfo struct.
+ */
+ InputFrameInfo* getInputFrameInfo( ossimFilename name ) const;
+
+ /**
+ * Returns true if the given output frame (frameX,frameY,resLevel)
+ * has already been generated by previous input RPF frames (i.e.
+ * at less than idx in theInputFrameInfoQueue).
+ */
+ bool isFrameAlreadyDone( ossim_uint32 idx, ossim_uint32 resLevel,
+ ossim_int32 frameX, ossim_int32 frameY ) const;
+
+ ossimFilename theOutputFile;
+ ossimFilename theOutputFileTmp;
+ ossimFilename theOutputSubdirectory;
+ ossimString theVirtualWriterType;
+ ossimString theOutputImageType;
+ ossimString theMajorVersion;
+ ossimString theMinorVersion;
+ ossim_uint16 theCompressType;
+ ossim_int32 theCompressQuality;
+ ossimIpt theOutputTileSize;
+ ossimIpt theOutputFrameSize;
+ ossimIpt theInputFrameSize;
+ ossim_int32 theBytesPerPixel;
+ ossim_int32 theBitsPerSample;
+ ossim_int32 theSampleFormat;
+ ossim_int32 theTileSizeInBytes;
+ std::vector<ossim_uint8> theNullDataBuffer;
+ ossimStdOutProgress* theProgressListener;
+ bool theCopyAllFlag;
+ bool theLimitedScopeUpdateFlag;
+ bool theOverviewFlag;
+ ossim_uint32 theCurrentEntry;
+ ossimMapProjection* theInputMapProjection;
+ std::vector<ossimFilename> theDirtyFrameList;
+ std::vector<InputFrameInfo*> theInputFrameInfoList;
+ std::vector<InputFrameInfo*> theInputFrameInfoQueue;
+ ossimFilterResampler::ossimFilterResamplerType theResampleType;
+ ossimRefPtr<ossimImageHandler> theImageHandler;
+ ossimRefPtr<ossimImageSourceSequencer> theInputConnection;
+ ossimRefPtr<ossimImageGeometry> theInputGeometry;
+ ossimRefPtr<ossimProjection> theInputProjection;
+ ossimIrect theAreaOfInterest;
+
+TYPE_DATA
+};
+#endif
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimVirtualOverviewBuilder.h b/Utilities/otbossim/include/ossim/imaging/ossimVirtualOverviewBuilder.h
new file mode 100644
index 0000000000000000000000000000000000000000..d984e2993b945f36efa737ad517e2590330b678a
--- /dev/null
+++ b/Utilities/otbossim/include/ossim/imaging/ossimVirtualOverviewBuilder.h
@@ -0,0 +1,215 @@
+//*******************************************************************
+//
+// License: LGPL
+//
+// See LICENSE.txt file in the top level directory for more details.
+//
+// Author: Eric Hirschorn
+//
+// Description:
+//
+// Contains class declaration for VirtualOverviewBuilder.
+//
+//*******************************************************************
+// $Id: ossimVirtualOverviewBuilder.h 14780 2009-06-25 19:32:32Z dburken $
+
+#ifndef ossimVirtualOverviewBuilder_HEADER
+#define ossimVirtualOverviewBuilder_HEADER
+
+#include <vector>
+#include <ossim/imaging/ossimFilterResampler.h>
+#include <ossim/imaging/ossimOverviewBuilderBase.h>
+
+class ossimImageHandler;
+class ossimFilename;
+class ossimConnectableObject;
+class ossimStdOutProgress;
+
+class OSSIM_DLL ossimVirtualOverviewBuilder : public ossimOverviewBuilderBase
+{
+public:
+
+ enum WriterType
+ {
+ WRITER_TYPE_TIFF,
+ WRITER_TYPE_UNKNOWN
+ };
+
+ /** default constructor */
+ ossimVirtualOverviewBuilder();
+
+ /** virtual destructor */
+ virtual ~ossimVirtualOverviewBuilder();
+
+ /**
+ * Supports BOX or NEAREST NEIGHBOR.
+ * When indexed you should probably use nearest neighbor
+ */
+ void setResampleType( ossimFilterResampler::ossimFilterResamplerType resampleType );
+
+ /**
+ * Builds overview file and sets "theOutputFile" to that of
+ * the overview_file.
+ *
+ * @param overview_file The overview file name to output.
+ *
+ * @param copy_all If set to true the entire image will be
+ * copied. This can be used to convert an image to a tiled tif.
+ *
+ * @return true on success, false on error.
+ */
+ bool buildOverview( const ossimFilename& overview_file,
+ bool copy_all=false );
+
+ /**
+ * Calls buildOverview. This method uses "theOutputFile" for the file
+ * name.
+ *
+ * If the copy_all flag is set the entire image will be copied. This can
+ * be used to convert an image to a tiled tif.
+ *
+ * @return true on success, false on error.
+ *
+ * @note If setOutputFile was not called the output name will be derived
+ * from the image name. If image was "foo.tif" the overview file will
+ * be "foo.ovr".
+ */
+ virtual bool execute();
+
+ /**
+ * @brief Method to return copy all flag.
+ * @return The copy all flag. If true all data will be written to the
+ * overview including R0.
+ */
+ bool getCopyAllFlag() const;
+
+ /**
+ * @brief Sets theCopyAllFlag.
+ * @param flag The flag. If true all data will be written to the
+ * overview including R0.
+ */
+ void setCopyAllFlag( bool flag );
+
+ /**
+ * @return ossimObject* to this object.
+ */
+ virtual ossimObject* getObject();
+
+ /**
+ * @return const ossimObject* to this object.
+ */
+ virtual const ossimObject* getObject() const;
+
+ /**
+ * @return The output filename. This will be derived from the image
+ * handlers filename unless the method buildOverview has been called which
+ * takes a filename.
+ */
+ ossimFilename getOutputFile() const;
+
+ /**
+ * @return true if input is an image handler.
+ */
+ virtual bool canConnectMyInputTo( ossim_int32 index,
+ const ossimConnectableObject* obj ) const;
+
+ /**
+ * @brief Sets the input to the builder. Satisfies pure virtual from
+ * ossimOverviewBuilderBase.
+ *
+ * @param imageSource The input to the builder.
+ * @return True on successful initialization, false on error.
+ */
+ virtual bool setInputSource( ossimImageHandler* imageSource );
+
+ /**
+ * @brief Sets the output filename.
+ * Satisfies pure virtual from ossimOverviewBuilderBase.
+ * @param file The output file name.
+ */
+ virtual void setOutputFile( const ossimFilename& file );
+
+ void setOutputTileSize( const ossimIpt& tileSize );
+
+ /*
+ * Number of pixels on a side of the output frames of the
+ * virtual overview.
+ */
+ void setOutputFrameSize( const ossimIpt& frameSize );
+
+ /**
+ * @brief Sets the overview output type.
+ *
+ * Satisfies pure virtual from ossimOverviewBuilderBase.
+ *
+ * @param type This should be the string representing the type. This method
+ * will do nothing if type is not handled and return false.
+ *
+ * @return true if type is handled, false if not.
+ */
+ virtual bool setOverviewType( const ossimString& type );
+
+ /**
+ * @brief Gets the overview type.
+ * Satisfies pure virtual from ossimOverviewBuilderBase.
+ * @return The overview output type as a string.
+ */
+ virtual ossimString getOverviewType() const;
+
+ /**
+ * @brief Method to populate class supported types.
+ * Satisfies pure virtual from ossimOverviewBuilderBase.
+ * @param typeList List of ossimStrings to add to.
+ */
+ virtual void getTypeNameList( std::vector<ossimString>& typeList )const;
+
+ /**
+ * @brief Method to set properties.
+ * @param prop Property to set.
+ *
+ * @note Currently supported property:
+ * name=levels, value should be list of levels separated by a comma with
+ * no spaces. Example: "2,4,8,16,32,64"
+ */
+ virtual void setProperty( ossimRefPtr<ossimProperty> prop );
+
+ /**
+ * @brief Method to populate the list of property names.
+ * @param propNames List to populate. This does not clear the list
+ * just adds to it.
+ */
+ virtual void getPropertyNames( std::vector<ossimString>& propNames )const;
+
+ /**
+ * @brief Sets the name of a frame for guiding a limited-scope virtual
+ * overview update.
+ *
+ * @param name The name of an existing frame file of an RPF image.
+ */
+ void setDirtyFrame( const ossimString& name );
+
+ static const char* OUTPUT_FRAME_SIZE_KW;
+
+private:
+
+ // Disallow these...
+ ossimVirtualOverviewBuilder( const ossimVirtualOverviewBuilder& source );
+ ossimVirtualOverviewBuilder& operator=( const ossimVirtualOverviewBuilder& rhs );
+
+ ossimRefPtr<ossimImageHandler> theImageHandler;
+ bool theOwnsImageHandlerFlag;
+ ossimFilename theOutputFile;
+ ossimIpt theOutputTileSize;
+ ossimIpt theOutputFrameSize;
+ ossimFilterResampler::ossimFilterResamplerType theResamplerType;
+ bool theCopyAllFlag;
+ ossimString theCompressType;
+ ossim_int32 theCompressQuality;
+ ossimStdOutProgress* theProgressListener;
+ WriterType theWriterType;
+ std::vector<ossimString> theDirtyFrameList;
+
+TYPE_DATA
+};
+
+#endif
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimVpfAnnotationFeatureInfo.h b/Utilities/otbossim/include/ossim/imaging/ossimVpfAnnotationFeatureInfo.h
index 4f9bf0cfa943a31c6dfec24463b689d9f63aa5ae..480f9e18212de45e7430f03878993aa60f82f1fa 100644
--- a/Utilities/otbossim/include/ossim/imaging/ossimVpfAnnotationFeatureInfo.h
+++ b/Utilities/otbossim/include/ossim/imaging/ossimVpfAnnotationFeatureInfo.h
@@ -1,13 +1,16 @@
//*******************************************************************
//
-// LICENSE: LGPL see top level license.txt
+// License: LGPL
+//
+// See LICENSE.txt file in the top level directory for more details.
//
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimVpfAnnotationFeatureInfo.h 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimVpfAnnotationFeatureInfo.h 15836 2009-10-30 12:29:09Z dburken $
#ifndef ossimVpfAnnotationFeatureInfo_HEADER
#define ossimVpfAnnotationFeatureInfo_HEADER
+#include <ossim/base/ossimRefPtr.h>
#include <ossim/base/ossimRgbVector.h>
#include <ossim/base/ossimString.h>
#include <ossim/base/ossimGeoPolygon.h>
@@ -170,13 +173,13 @@ protected:
ossimRgbVector theBrushColor;
ossimVpfCoverage theCoverage;
ossimDpt thePointRadius;
- int theThickness;
- bool theFillEnabledFlag;
- bool theEnabledFlag;
+ int theThickness;
+ bool theFillEnabledFlag;
+ bool theEnabledFlag;
ossimVpfAnnotationFeatureType theFeatureType;
ossimFontInformation theFontInformation;
- std::vector<ossimGeoAnnotationObject*> theAnnotationArray;
+ std::vector<ossimRefPtr<ossimGeoAnnotationObject> > theAnnotationArray;
void buildTxtFeature(const ossimFilename& table,
const ossimString& tableKey,
diff --git a/Utilities/otbossim/include/ossim/parallel/ossimOrthoIgen.h b/Utilities/otbossim/include/ossim/parallel/ossimOrthoIgen.h
index e31b1183ce0f9913fe98276fd71a7a6aedca14fc..58aeb2de75b6adfc2b0f973cb78ec5ec4c317191 100644
--- a/Utilities/otbossim/include/ossim/parallel/ossimOrthoIgen.h
+++ b/Utilities/otbossim/include/ossim/parallel/ossimOrthoIgen.h
@@ -1,4 +1,4 @@
-// $Id: ossimOrthoIgen.h 15785 2009-10-21 14:55:04Z dburken $
+// $Id: ossimOrthoIgen.h 15833 2009-10-29 01:41:53Z eshirschorn $
#ifndef ossimOrthoIgen_HEADER
#define ossimOrthoIgen_HEADER
#include <ossim/base/ossimObject.h>
@@ -124,6 +124,7 @@ protected:
ossimFilename theCombinerTemplate;
ossimFilename theAnnotationTemplate;
ossimFilename theWriterTemplate;
+ ossimFilename theSupplementaryDirectory;
ossimString theSlaveBuffers;
ossimOrthoIgen::OriginType theCutOriginType;
ossimDpt theCutOrigin;
diff --git a/Utilities/otbossim/include/ossim/support_data/ossimGeoTiff.h b/Utilities/otbossim/include/ossim/support_data/ossimGeoTiff.h
index bda548d26e012f905f53678a87ab3d7d766f6fdb..98ff881715c8fe764731a6dbd67ea1f5ab3b1c7b 100644
--- a/Utilities/otbossim/include/ossim/support_data/ossimGeoTiff.h
+++ b/Utilities/otbossim/include/ossim/support_data/ossimGeoTiff.h
@@ -9,7 +9,7 @@
// information.
//
//***************************************************************************
-// $Id: ossimGeoTiff.h 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimGeoTiff.h 15868 2009-11-06 22:30:38Z dburken $
#ifndef ossimGeoTiff_HEADER
#define ossimGeoTiff_HEADER 1
@@ -18,6 +18,7 @@
#include <ossim/base/ossimEndian.h>
#include <ossim/base/ossimString.h>
#include <ossim/projection/ossimMapProjectionInfo.h>
+#include <ossim/projection/ossimProjection.h>
#include <ossim/base/ossimRefPtr.h>
#include <vector>
@@ -29,6 +30,7 @@
class ossimFilename;
class ossimKeywordlist;
+class ossimProjection;
class ossimTieGptSet;
class OSSIM_DLL ossimGeoTiff : public ossimErrorStatusInterface
@@ -110,6 +112,23 @@ public:
static bool writeTags(TIFF* tiffOut,
const ossimRefPtr<ossimMapProjectionInfo> projectionInfo,
bool imagineNad27Flag=false);
+
+ /**
+ * @brief Writes a geotiff box to a buffer.
+ *
+ * This will write a degenerate GeoTIFF file to a temp file, copy file to
+ * the buffer and then delete the temp file.
+ *
+ * @param tmpFile The temporary filename.
+ * @param rect The output image rect.
+ * @param proj Pointer to output projection.
+ * @param buf The buffer to stuff with data.
+ * @return true on success, false on error.
+ */
+ static bool writeJp2GeotiffBox(const ossimFilename& tmpFile,
+ const ossimIrect& rect,
+ const ossimProjection* proj,
+ std::vector<ossim_uint8>& buf);
/**
* Reads tags.
diff --git a/Utilities/otbossim/include/ossim/support_data/ossimIkonosMetaData.h b/Utilities/otbossim/include/ossim/support_data/ossimIkonosMetaData.h
index 0ecece7ac2796ac55c7e9c240d5d1f4cc55d81c3..d6aae7b62bd7e44d84fbf78b9d701db679b69e98 100644
--- a/Utilities/otbossim/include/ossim/support_data/ossimIkonosMetaData.h
+++ b/Utilities/otbossim/include/ossim/support_data/ossimIkonosMetaData.h
@@ -9,7 +9,7 @@
// This class parses a Space Imaging Ikonos meta data file.
//
//********************************************************************
-// $Id: ossimIkonosMetaData.h 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimIkonosMetaData.h 15828 2009-10-28 13:11:31Z dburken $
#ifndef ossimIkonosMetaData_HEADER
#define ossimIkonosMetaData_HEADER
diff --git a/Utilities/otbossim/include/ossim/support_data/ossimRpfToc.h b/Utilities/otbossim/include/ossim/support_data/ossimRpfToc.h
index 1a111b916c1d00080046ca91a6f48bb8d91d0001..53591766b6855c54c91961128cbb505ff95f4a7f 100644
--- a/Utilities/otbossim/include/ossim/support_data/ossimRpfToc.h
+++ b/Utilities/otbossim/include/ossim/support_data/ossimRpfToc.h
@@ -7,7 +7,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimRpfToc.h 14535 2009-05-18 13:11:55Z dburken $
+// $Id: ossimRpfToc.h 15833 2009-10-29 01:41:53Z eshirschorn $
#ifndef osimRpfToc_HEADER
#define osimRpfToc_HEADER
@@ -49,13 +49,61 @@ public:
unsigned long getNumberOfEntries()const{return (ossim_uint32)theTocEntryList.size();}
const ossimRpfTocEntry* getTocEntry(unsigned long index)const;
- /*!
+ /**
* Returns -1 if not found.
*/
ossim_int32 getTocEntryIndex(const ossimRpfTocEntry* entry);
const ossimRpfHeader* getRpfHeader()const{return theRpfHeader;}
-
+
+ /**
+ * For the given entry index, this routine returns the number of
+ * frames that exist in the horizontal direction. If the entry index
+ * is invalid, 0 frames are returned.
+ *
+ * @param idx the entry index.
+ * @return number of frames in the horizontal direction
+ */
+ ossim_uint32 getNumberOfFramesHorizontal(ossim_uint32 idx)const;
+
+ /**
+ * For the given entry index, this routine returns the number of
+ * frames that exist in the vertical direction. If the entry index
+ * is invalid, 0 frames are returned.
+ *
+ * @param idx the entry index.
+ * @return number of frames in the vertical direction
+ */
+ ossim_uint32 getNumberOfFramesVertical(ossim_uint32 idx)const;
+
+ /**
+ * For the given entry index, frame row, and frame column, this
+ * routine returns the corresponding ossimRpfFrameEntry instance.
+ *
+ * @param entryIdx the entry index.
+ * @param row the frame row.
+ * @param col the frame col.
+ * @return true if successful
+ */
+ bool getRpfFrameEntry(ossim_uint32 entryIdx,
+ ossim_uint32 row,
+ ossim_uint32 col,
+ ossimRpfFrameEntry& result)const;
+
+ /**
+ * For the given entry index, frame row, and frame column, this
+ * routine returns the corresponding name of the frame image
+ * with respect to the location of the toc file.
+ *
+ * @param entryIdx the entry index.
+ * @param row the frame row.
+ * @param col the frame col.
+ * @return the name of the frame image
+ */
+ const ossimString getRelativeFramePath( ossim_uint32 entryIdx,
+ ossim_uint32 row,
+ ossim_uint32 col)const;
+
private:
void deleteAll();
void clearAll();
diff --git a/Utilities/otbossim/src/ossim/base/ossimAdjustableParameterInterface.cpp b/Utilities/otbossim/src/ossim/base/ossimAdjustableParameterInterface.cpp
index 51af222442da2671e13856d2473ff1ba48cc20c4..a07f941956b7b9740c0e2a20139d508ea6bf9e14 100644
--- a/Utilities/otbossim/src/ossim/base/ossimAdjustableParameterInterface.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimAdjustableParameterInterface.cpp
@@ -6,7 +6,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimAdjustableParameterInterface.cpp 9094 2006-06-13 19:12:40Z dburken $
+// $Id: ossimAdjustableParameterInterface.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <algorithm>
#include <ossim/base/ossimAdjustableParameterInterface.h>
#include <ossim/base/ossimKeywordNames.h>
@@ -40,7 +40,7 @@ void ossimAdjustableParameterInterface::newAdjustment(ossim_uint32 numberOfParam
theAdjustmentList[theAdjustmentList.size()-1].setDescription("Initial adjustment");
}
- theCurrentAdjustment = theAdjustmentList.size() - 1;
+ theCurrentAdjustment = (ossim_uint32)theAdjustmentList.size() - 1;
}
@@ -100,7 +100,7 @@ void ossimAdjustableParameterInterface::resetAdjustableParameters(bool notify)
setCurrentAdjustment(saveCurrent);
- eraseAdjustment(theAdjustmentList.size()-1, false);
+ eraseAdjustment((ossim_uint32)theAdjustmentList.size()-1, false);
if(notify)
{
@@ -120,7 +120,7 @@ void ossimAdjustableParameterInterface::copyAdjustment(ossim_uint32 idx, bool no
if(idx == theCurrentAdjustment)
{
- theCurrentAdjustment = theAdjustmentList.size() - 1;
+ theCurrentAdjustment = (ossim_uint32)theAdjustmentList.size() - 1;
}
if(notify)
{
@@ -204,7 +204,7 @@ void ossimAdjustableParameterInterface::eraseAdjustment(ossim_uint32 idx, bool n
}
else
{
- theCurrentAdjustment = theAdjustmentList.size() - 1;
+ theCurrentAdjustment = (ossim_uint32)theAdjustmentList.size() - 1;
}
}
@@ -643,7 +643,7 @@ void ossimAdjustableParameterInterface::getAdjustment(ossim_uint32 idx, ossimAdj
ossim_uint32 ossimAdjustableParameterInterface::getNumberOfAdjustments()const
{
- return theAdjustmentList.size();
+ return (ossim_uint32)theAdjustmentList.size();
}
ossim_uint32 ossimAdjustableParameterInterface::getCurrentAdjustmentIdx()const
diff --git a/Utilities/otbossim/src/ossim/base/ossimAdjustmentInfo.cpp b/Utilities/otbossim/src/ossim/base/ossimAdjustmentInfo.cpp
index 48d0558c9b8d9dc19a51cf86e283d11a0e9449b9..e71a10e269634d36c2ac635f8ae977473d256cd6 100644
--- a/Utilities/otbossim/src/ossim/base/ossimAdjustmentInfo.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimAdjustmentInfo.cpp
@@ -6,7 +6,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimAdjustmentInfo.cpp 9094 2006-06-13 19:12:40Z dburken $
+// $Id: ossimAdjustmentInfo.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/base/ossimAdjustmentInfo.h>
#include <ossim/base/ossimKeywordNames.h>
@@ -71,7 +71,7 @@ void ossimAdjustmentInfo::setNumberOfAdjustableParameters(ossim_uint32 numberOfA
ossim_uint32 ossimAdjustmentInfo::getNumberOfAdjustableParameters()const
{
- return theParameterList.size();
+ return (ossim_uint32)theParameterList.size();
}
ossimString ossimAdjustmentInfo::getDescription()const
diff --git a/Utilities/otbossim/src/ossim/base/ossimCommon.cpp b/Utilities/otbossim/src/ossim/base/ossimCommon.cpp
index c2c021a0ea908ac5b9bf4144fc81d733f515c0a8..d324af311237b98dc9cf7dd6031e803bc57ca892 100644
--- a/Utilities/otbossim/src/ossim/base/ossimCommon.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimCommon.cpp
@@ -9,7 +9,7 @@
// Description: Common file for global functions.
//
//*************************************************************************
-// $Id: ossimCommon.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimCommon.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <sstream>
@@ -659,22 +659,22 @@ void ossim::lexQuotedTokens(const std::string& str,
else
{
unbalancedQuotes = true;
- end = str.length();
+ end = (int)str.length();
}
}
else if (str[start] == closeQuote)
{
unbalancedQuotes = true;
- end = str.length();
+ end = (int)str.length();
}
else
{
- end = str.find_first_of(whitespace, start);
+ end = (int)str.find_first_of(whitespace, start);
tokens.push_back(str.substr(start, end-start));
}
- start = str.find_first_not_of(whitespace, end);
+ start = (ossim_uint32)str.find_first_not_of(whitespace, end);
}
}
diff --git a/Utilities/otbossim/src/ossim/base/ossimConnectableContainer.cpp b/Utilities/otbossim/src/ossim/base/ossimConnectableContainer.cpp
index 037a3cef2247a785a9d9e5f8f07184430681cd4b..dfefbcbc8fcdfc6efec2d90046b67b67e84d0346 100644
--- a/Utilities/otbossim/src/ossim/base/ossimConnectableContainer.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimConnectableContainer.cpp
@@ -6,7 +6,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimConnectableContainer.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimConnectableContainer.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <algorithm>
#include <stack>
@@ -582,9 +582,9 @@ bool ossimConnectableContainer::addAllObjects(std::map<ossimId,
ossimString regExpression = ossimString("^(") + copyPrefix + "object[0-9]+.)";
std::vector<ossimString> keys =
kwl.getSubstringKeyList( regExpression );
- long numberOfSources = keys.size();
+ long numberOfSources = (long)keys.size();
- int offset = (copyPrefix+"object").size();
+ int offset = (int)(copyPrefix+"object").size();
int idx = 0;
std::vector<int> theNumberList(numberOfSources);
for(idx = 0; idx < (int)theNumberList.size();++idx)
@@ -682,7 +682,7 @@ bool ossimConnectableContainer::connectAllObjects(const std::map<ossimId, std::v
if(currentObject)
{
- long upperBound = (*iter).second.size();
+ long upperBound = (long)(*iter).second.size();
for(long index = 0; index < upperBound; ++index)
{
ossimConnectableObject* inputObject = findObject((*iter).second[index]);
diff --git a/Utilities/otbossim/src/ossim/base/ossimConnectionEvent.cpp b/Utilities/otbossim/src/ossim/base/ossimConnectionEvent.cpp
index 585197dcf79ebeaa779f93e45dd9d2cf340b7c25..98924dd9820b3f2db7fb7ed7ea553b6a057f89b1 100644
--- a/Utilities/otbossim/src/ossim/base/ossimConnectionEvent.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimConnectionEvent.cpp
@@ -6,7 +6,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimConnectionEvent.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimConnectionEvent.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/base/ossimConnectionEvent.h>
@@ -76,12 +76,12 @@ ossimConnectionEvent::ossimConnectionDirectionType ossimConnectionEvent::getDire
ossim_uint32 ossimConnectionEvent::getNumberOfNewObjects()const
{
- return theNewObjectList.size();
+ return (ossim_uint32)theNewObjectList.size();
}
ossim_uint32 ossimConnectionEvent::getNumberOfOldObjects()const
{
- return theOldObjectList.size();
+ return (ossim_uint32)theOldObjectList.size();
}
ossimConnectableObject* ossimConnectionEvent::getOldObject(ossim_uint32 i)
diff --git a/Utilities/otbossim/src/ossim/base/ossimContainerProperty.cpp b/Utilities/otbossim/src/ossim/base/ossimContainerProperty.cpp
index 69d349da88903ab5d2852d7a5b5bbe66c0e7df32..de5ba5a3f6b0601e01ab652ee50580a81a7d3b76 100644
--- a/Utilities/otbossim/src/ossim/base/ossimContainerProperty.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimContainerProperty.cpp
@@ -5,7 +5,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimContainerProperty.cpp 12969 2008-06-03 17:17:43Z gpotts $
+// $Id: ossimContainerProperty.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/base/ossimContainerProperty.h>
#include <ossim/base/ossimStringProperty.h>
@@ -163,7 +163,7 @@ void ossimContainerProperty::valueToString(ossimString& valueResult)const
ossim_uint32 ossimContainerProperty::getNumberOfProperties()const
{
- return theChildPropertyList.size();
+ return (ossim_uint32)theChildPropertyList.size();
}
ossimRefPtr<ossimProperty> ossimContainerProperty::getProperty(ossim_uint32 idx)
diff --git a/Utilities/otbossim/src/ossim/base/ossimDate.cpp b/Utilities/otbossim/src/ossim/base/ossimDate.cpp
index d969ab8f3bc7dad4dc35b154c60dbd887fd3f197..b0ad8b9580ef79f882080c05eb2483bd48394778 100644
--- a/Utilities/otbossim/src/ossim/base/ossimDate.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimDate.cpp
@@ -7,7 +7,7 @@
// Author: Garrett Potts
//
//----------------------------------------------------------------------------
-// $Id: ossimDate.cpp 15067 2009-08-12 15:14:27Z dburken $
+// $Id: ossimDate.cpp 15853 2009-11-04 19:37:46Z gpotts $
#include <ossim/base/ossimDate.h>
#include <iomanip>
@@ -104,11 +104,11 @@ int ossimLocalTm::isValid (void) const
31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
};
- return (tm_year > 0 &&
- tm_mon >= 0 && tm_mon < 12 &&
- tm_mday > 0 && tm_mday <= maxd[tm_mon] &&
- tm_wday < 7 && tm_yday < 367 &&
- tm_sec < 60 && tm_min < 60 && tm_hour < 24);
+ return ((tm_year > 0) &&
+ (tm_mon >= 0) && (tm_mon < 12) &&
+ (tm_mday > 0) && (tm_mday <= maxd[tm_mon]) &&
+ (tm_wday < 7) && (tm_yday < 367) &&
+ (tm_sec < 60) && (tm_min < 60) && (tm_hour < 24));
}
void ossimLocalTm::now()
{
diff --git a/Utilities/otbossim/src/ossim/base/ossimDms.cpp b/Utilities/otbossim/src/ossim/base/ossimDms.cpp
index 4d9a6c474eb2ba7ac0b3bc63de44104c8f712b72..bc5112710f3ae163193c46b74cf2ea887af818a7 100644
--- a/Utilities/otbossim/src/ossim/base/ossimDms.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimDms.cpp
@@ -8,7 +8,7 @@
//
// Contains class definition for Degrees Minutes Seconds (ossimDms)
//*******************************************************************
-// $Id: ossimDms.cpp 14482 2009-05-12 11:42:38Z gpotts $
+// $Id: ossimDms.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <cmath>
#include <cstring> /* for strcpy */
@@ -368,7 +368,7 @@ ossimString ossimDms::toString(const ossimString& formatString)const
theIntDegs = static_cast<int>( std::abs(theDegrees) );
ossimString temp = ossimString::toString(theIntDegs);
ossimString prefix;
- d_s -= temp.length();
+ d_s -= (int)temp.length();
while(d_s > 0)
{
prefix += '0';
diff --git a/Utilities/otbossim/src/ossim/base/ossimDoubleGridProperty.cpp b/Utilities/otbossim/src/ossim/base/ossimDoubleGridProperty.cpp
index 9fb1ed0dfcd0213de79f77da1fd59dc60a75b9a4..53ae4dfb758fdc897261ffe71861d6d7c465188b 100644
--- a/Utilities/otbossim/src/ossim/base/ossimDoubleGridProperty.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimDoubleGridProperty.cpp
@@ -143,7 +143,7 @@ ossim_uint32 ossimDoubleGridProperty::getNumberOfCols()const
{
if(getNumberOfRows())
{
- return theValues[0].size();
+ return (ossim_uint32)theValues[0].size();
}
return 0;
}
diff --git a/Utilities/otbossim/src/ossim/base/ossimFilename.cpp b/Utilities/otbossim/src/ossim/base/ossimFilename.cpp
index 4dfd5458cefcffe0455c144997cdf367ad2f0e24..63d3dc5e9284e0f75db3f368d5e890673e22bac9 100644
--- a/Utilities/otbossim/src/ossim/base/ossimFilename.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimFilename.cpp
@@ -7,7 +7,7 @@
// Description: This class provides manipulation of filenames.
//
//*************************************************************************
-// $Id: ossimFilename.cpp 14886 2009-07-15 15:40:50Z gpotts $
+// $Id: ossimFilename.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/ossimConfig.h> /* to pick up platform defines */
@@ -499,7 +499,7 @@ ossimFilename ossimFilename::expand() const
ossimFilename finalResult;
const char* tempPtr = result.c_str();
ossim_int32 startIdx = -1;
- ossim_int32 resultSize = result.size();
+ ossim_int32 resultSize = (ossim_uint32)result.size();
ossim_int32 scanIdx = 0;
while(scanIdx < resultSize)
{
diff --git a/Utilities/otbossim/src/ossim/base/ossimFilenameProperty.cpp b/Utilities/otbossim/src/ossim/base/ossimFilenameProperty.cpp
index 59371abe50fd1f661477c73f3ec72245f5aaad50..5b3db2c222805d6091143088384535f6aa878f12 100644
--- a/Utilities/otbossim/src/ossim/base/ossimFilenameProperty.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimFilenameProperty.cpp
@@ -5,7 +5,7 @@
// Author: Garrett Potts (gpotts@imagelinks.com)
//
//*************************************************************************
-// $Id: ossimFilenameProperty.cpp 9963 2006-11-28 21:11:01Z gpotts $
+// $Id: ossimFilenameProperty.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/base/ossimFilenameProperty.h>
RTTI_DEF1(ossimFilenameProperty, "ossimFilenameProperty", ossimProperty);
@@ -80,7 +80,7 @@ void ossimFilenameProperty::clearFilterList()
ossim_uint32 ossimFilenameProperty::getNumberOfFilters()const
{
- return theFilterList.size();
+ return (ossim_uint32)theFilterList.size();
}
void ossimFilenameProperty::setFilter(ossim_uint32 idx,
diff --git a/Utilities/otbossim/src/ossim/base/ossimGeoPolygon.cpp b/Utilities/otbossim/src/ossim/base/ossimGeoPolygon.cpp
index cb3a4e1b6ade1e78029eb9c43f173936b93d4c5f..70facf92ac6e661bd2fc427dfbbded56829c845e 100644
--- a/Utilities/otbossim/src/ossim/base/ossimGeoPolygon.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimGeoPolygon.cpp
@@ -6,7 +6,7 @@
// AUTHOR: Garrett Potts
//
//*****************************************************************************
-// $Id: ossimGeoPolygon.cpp 13686 2008-10-07 02:13:52Z gpotts $
+// $Id: ossimGeoPolygon.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ostream>
#include <sstream>
@@ -188,7 +188,7 @@ void ossimGeoPolygon::stretchOut(ossimGeoPolygon& newPolygon,
newPolygon[0].height(theVertexList[i].height());
newPolygon[0].datum(datum);
- newPolygon[theVertexList.size()-1] = newPolygon[0];
+ newPolygon[(int)theVertexList.size()-1] = newPolygon[0];
}
}
}
@@ -199,7 +199,7 @@ double ossimGeoPolygon::area()const
double area = 0;
ossim_uint32 i=0;
ossim_uint32 j=0;
- ossim_uint32 size = theVertexList.size();
+ ossim_uint32 size = (ossim_uint32)theVertexList.size();
for (i=0;i<size;i++)
{
diff --git a/Utilities/otbossim/src/ossim/base/ossimGeoref.cpp b/Utilities/otbossim/src/ossim/base/ossimGeoref.cpp
index a71fa9f9a5e67fa7ffc2f21e1c5507446ac8fbaf..7670aef0605c2a82d60b3f15e71fddd4977a06e6 100644
--- a/Utilities/otbossim/src/ossim/base/ossimGeoref.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimGeoref.cpp
@@ -255,7 +255,7 @@ long ossimGeoref::Convert_GEOREF_To_Geodetic (char *georef,
origin_long = (double)LONGITUDE_LOW;
origin_lat = (double)LATITUDE_LOW;
- georef_length = strlen(georef);
+ georef_length = (long)strlen(georef);
if ((georef_length < GEOREF_MINIMUM) || (georef_length > GEOREF_MAXIMUM)
|| ((georef_length % 2) != 0))
{
diff --git a/Utilities/otbossim/src/ossim/base/ossimHistogram.cpp b/Utilities/otbossim/src/ossim/base/ossimHistogram.cpp
index 9b4caef4a5c3959c1d05083c417945b6a345523a..ff703165d03d50d47ee7474f6e8152a60ffcc9fd 100644
--- a/Utilities/otbossim/src/ossim/base/ossimHistogram.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimHistogram.cpp
@@ -15,7 +15,7 @@
// frequency counts for each of these buckets.
//
//********************************************************************
-// $Id: ossimHistogram.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimHistogram.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
//
#include <stdio.h>
@@ -1396,7 +1396,7 @@ bool ossimHistogram::loadState(const ossimRefPtr<ossimXmlNode> xmlNode)
floatValues.push_back(vString.toFloat32());
}
}
- count = floatValues.size();
+ count = (ossim_uint32)floatValues.size();
if(count)
{
diff --git a/Utilities/otbossim/src/ossim/base/ossimKeywordlist.cpp b/Utilities/otbossim/src/ossim/base/ossimKeywordlist.cpp
index f0ed580f36f0fc15e3ac235d778a4d0a76ddb797..0e0afdc05ba766f95bf20fa0e1149e70bd90efce 100644
--- a/Utilities/otbossim/src/ossim/base/ossimKeywordlist.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimKeywordlist.cpp
@@ -5,7 +5,7 @@
// Description: This class provides capabilities for keywordlists.
//
//********************************************************************
-// $Id: ossimKeywordlist.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimKeywordlist.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <algorithm>
#include <fstream>
#include <list>
@@ -16,6 +16,7 @@
#include <ossim/base/ossimKeywordlist.h>
#include <ossim/base/ossimNotifyContext.h>
#include <ossim/base/ossimTrace.h>
+#include <ossim/base/ossimDirectory.h>
static ossimTrace traceDebug("ossimKeywordlist:debug");
static const ossim_int32 MAX_LINE_LENGTH = 256;
@@ -25,7 +26,7 @@ static const char NULL_KEY_NOTICE[]
#ifdef OSSIM_ID_ENABLED
static const bool TRACE = false;
-static const char OSSIM_ID[] = "$Id: ossimKeywordlist.cpp 15766 2009-10-20 12:37:09Z gpotts $";
+static const char OSSIM_ID[] = "$Id: ossimKeywordlist.cpp 15833 2009-10-29 01:41:53Z eshirschorn $";
#endif
ossimKeywordlist::ossimKeywordlist(char delimiter)
@@ -820,16 +821,38 @@ bool ossimKeywordlist::parseFile(const ossimFilename& file,
std::ifstream is;
is.open(file.c_str(), std::ios::in | std::ios::binary);
- if (!is)
+ if ( !is.is_open() )
{
- if(traceDebug())
+ // ESH 07/2008, Trac #234: OSSIM is case sensitive
+ // when using worldfile templates during ingest
+ // -- If first you don't succeed with the user-specified
+ // filename, try again with the results of a case insensitive search.
+ ossimDirectory directory(file.path());
+ ossimFilename filename(file.file());
+
+ std::vector<ossimFilename> result;
+ bool bSuccess = directory.findCaseInsensitiveEquivalents( filename, result );
+ if ( bSuccess == true )
{
- // report all errors that aren't existance problems.
- // we want to know about things like permissions, too many open files, etc.
- ossimNotify(ossimNotifyLevel_DEBUG)
- << "Error opening file: " << file.c_str() << std::endl;
+ int numResults = (int)result.size();
+ int i;
+ for ( i=0; i<numResults && !is.is_open(); ++i )
+ {
+ is.open( result[i].c_str(), std::ios::in | std::ios::binary );
+ }
+ }
+
+ if ( !is.is_open() )
+ {
+ if ( traceDebug() )
+ {
+ // report all errors that aren't existence problems.
+ // we want to know about things like permissions, too many open files, etc.
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "Error opening file: " << file.c_str() << std::endl;
+ }
+ return false;
}
- return false;
}
bool result = parseStream(is, ignoreBinaryChars);
@@ -1111,7 +1134,7 @@ void ossimKeywordlist::stripPrefixFromAll(const ossimString& regularExpression)
ossim_uint32 ossimKeywordlist::getSize()const
{
- return theMap.size();
+ return (ossim_uint32)theMap.size();
}
const ossimKeywordlist::KeywordMap& ossimKeywordlist::getMap()const
diff --git a/Utilities/otbossim/src/ossim/base/ossimNotify.cpp b/Utilities/otbossim/src/ossim/base/ossimNotify.cpp
index b85231ce458f14243c00f6468bfb0fd9e57bd57f..7b1fc61c57b478b22d37022b44e787f64f8ec971 100644
--- a/Utilities/otbossim/src/ossim/base/ossimNotify.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimNotify.cpp
@@ -7,7 +7,7 @@
//
// Contains class definition for ossimNotify.
//*******************************************************************
-// $Id: ossimNotify.cpp 12633 2008-04-07 20:07:37Z gpotts $
+// $Id: ossimNotify.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <iostream>
#include <cstdio>
@@ -91,7 +91,7 @@ protected:
std::ios::app|std::ios::out);
if(outFile)
{
- outFile.write(tempString.c_str(), tempString.length());
+ outFile.write(tempString.c_str(), (std::streamsize)tempString.length());
}
tempString = "";
diff --git a/Utilities/otbossim/src/ossim/base/ossimPolyLine.cpp b/Utilities/otbossim/src/ossim/base/ossimPolyLine.cpp
index 7d87943e280df124426298dac1888d4963f57aa8..72cb123430f8f5192002bf6eed3011a512a36c98 100644
--- a/Utilities/otbossim/src/ossim/base/ossimPolyLine.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimPolyLine.cpp
@@ -5,7 +5,7 @@
// AUTHOR: Garrett Potts (gpotts@imagelinks.com)
//
//*****************************************************************************
-// $Id: ossimPolyLine.cpp 13709 2008-10-14 14:55:11Z gpotts $
+// $Id: ossimPolyLine.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
//
#include <ossim/base/ossimPolyLine.h>
#include <ossim/base/ossimCommon.h>
@@ -470,7 +470,7 @@ bool ossimPolyLine::operator==(const ossimPolyLine& polyLine) const
const ossimPolyLine& ossimPolyLine::operator *=(const ossimDpt& scale)
{
- ossim_uint32 upper = theVertexList.size();
+ ossim_uint32 upper = (ossim_uint32)theVertexList.size();
ossim_uint32 i = 0;
for(i = 0; i < upper; ++i)
@@ -487,7 +487,7 @@ ossimPolyLine ossimPolyLine::operator *(const ossimDpt& scale)const
ossimPolyLine result(*this);
ossim_uint32 i = 0;
- ossim_uint32 upper = theVertexList.size();
+ ossim_uint32 upper = (ossim_uint32)theVertexList.size();
for(i = 0; i < upper; ++i)
{
result.theVertexList[i].x*=scale.x;
diff --git a/Utilities/otbossim/src/ossim/base/ossimPolygon.cpp b/Utilities/otbossim/src/ossim/base/ossimPolygon.cpp
index ef92633a01b46d9b3478040725104cd8b2d3703c..3ce1a74756383914923e63404cb1fc37f4703d66 100644
--- a/Utilities/otbossim/src/ossim/base/ossimPolygon.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimPolygon.cpp
@@ -12,7 +12,7 @@
// LIMITATIONS: None.
//
//*****************************************************************************
-// $Id: ossimPolygon.cpp 13686 2008-10-07 02:13:52Z gpotts $
+// $Id: ossimPolygon.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <algorithm>
#include <iterator>
@@ -141,7 +141,7 @@ double ossimPolygon::area()const
double area = 0;
ossim_uint32 i=0;
ossim_uint32 j=0;
- ossim_uint32 size = theVertexList.size();
+ ossim_uint32 size = (ossim_uint32)theVertexList.size();
for (i=0;i<size;i++)
{
@@ -300,7 +300,7 @@ bool ossimPolygon::clipLineSegment(ossimDpt& P, ossimDpt& Q) const
ossimLine edge, edgeE, edgeL;
bool intersected=false;
double num, denom, t;
- ossim_uint32 npol = theVertexList.size();
+ ossim_uint32 npol = (ossim_uint32)theVertexList.size();
checkOrdering();
//***
@@ -533,7 +533,7 @@ bool ossimPolygon::operator==(const ossimPolygon& polygon) const
const ossimPolygon& ossimPolygon::operator *=(const ossimDpt& scale)
{
- ossim_uint32 upper = theVertexList.size();
+ ossim_uint32 upper = (ossim_uint32)theVertexList.size();
ossim_uint32 i = 0;
for(i = 0; i < upper; ++i)
{
@@ -548,7 +548,7 @@ ossimPolygon ossimPolygon::operator *(const ossimDpt& scale)const
{
ossimPolygon result(*this);
- ossim_uint32 upper = theVertexList.size();
+ ossim_uint32 upper = (ossim_uint32)theVertexList.size();
ossim_uint32 i = 0;
for(i = 0; i < upper; ++i)
{
diff --git a/Utilities/otbossim/src/ossim/base/ossimRectilinearDataObject.cpp b/Utilities/otbossim/src/ossim/base/ossimRectilinearDataObject.cpp
index f744ad4499e449dbebcc9cfb610298b3e1366a78..a98b4cd3e895f278fe7a515d52b02e5fa9465b89 100644
--- a/Utilities/otbossim/src/ossim/base/ossimRectilinearDataObject.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimRectilinearDataObject.cpp
@@ -8,7 +8,7 @@
// Contributor: David A. Horner (DAH) - http://dave.thehorners.com
//
//*************************************************************************
-// $Id: ossimRectilinearDataObject.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimRectilinearDataObject.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/base/ossimRectilinearDataObject.h>
#include <ossim/base/ossimScalarTypeLut.h>
@@ -143,7 +143,7 @@ ossim_uint32 ossimRectilinearDataObject::getNumberOfDataComponents() const
ossim_uint32 ossimRectilinearDataObject::getNumberOfSpatialComponents() const
{
- return theSpatialExtents.size();
+ return (ossim_uint32)theSpatialExtents.size();
}
const ossim_uint32* ossimRectilinearDataObject::getSpatialExtents()const
diff --git a/Utilities/otbossim/src/ossim/elevation/ossimDtedHandler.cpp b/Utilities/otbossim/src/ossim/elevation/ossimDtedHandler.cpp
index a071b6dc349cec461416b113f38454ea50371925..9f1ffbb502ec1f034affa4eeb5fa441bfc8bea6b 100644
--- a/Utilities/otbossim/src/ossim/elevation/ossimDtedHandler.cpp
+++ b/Utilities/otbossim/src/ossim/elevation/ossimDtedHandler.cpp
@@ -9,7 +9,7 @@
// from disk. This elevation files are memory mapped.
//
//*****************************************************************************
-// $Id: ossimDtedHandler.cpp 14296 2009-04-14 17:25:00Z gpotts $
+// $Id: ossimDtedHandler.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <cstdlib>
#include <cstring> /* for memcpy */
@@ -218,7 +218,7 @@ void ossimDtedHandler::mapToMemory()
std::ifstream in(theFilename.c_str(),
std::ios::in|std::ios::binary);
theMemoryMap.resize(theFilename.fileSize());
- in.read((char*)(&theMemoryMap.front()), theMemoryMap.size());
+ in.read((char*)(&theMemoryMap.front()), (std::streamsize)theMemoryMap.size());
in.close();
}
diff --git a/Utilities/otbossim/src/ossim/elevation/ossimElevManager.cpp b/Utilities/otbossim/src/ossim/elevation/ossimElevManager.cpp
index 70a0a502073fdf505236c585bda9c32595bc148b..b99dd4ee4bbc4d3722328353342cdbec0554a91d 100644
--- a/Utilities/otbossim/src/ossim/elevation/ossimElevManager.cpp
+++ b/Utilities/otbossim/src/ossim/elevation/ossimElevManager.cpp
@@ -19,7 +19,7 @@
// Initial coding.
//<
//**************************************************************************
-// $Id: ossimElevManager.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimElevManager.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <algorithm>
@@ -49,7 +49,7 @@ RTTI_DEF1(ossimElevManager, "ossimElevManager" , ossimElevSource)
static ossimTrace traceDebug ("ossimElevManager:debug");
#ifdef OSSIM_ID_ENABLED
-static const char OSSIM_ID[] = "$Id: ossimElevManager.cpp 15766 2009-10-20 12:37:09Z gpotts $";
+static const char OSSIM_ID[] = "$Id: ossimElevManager.cpp 15833 2009-10-29 01:41:53Z eshirschorn $";
#endif
ossimElevManager* ossimElevManager::theInstance = 0;
@@ -180,8 +180,8 @@ bool ossimElevManager::loadState(const ossimKeywordlist& kwl,
ossimString regExpression = ossimString("^(") + copyPrefix + "elevation_source[0-9]+.)";
vector<ossimString> keys =
kwl.getSubstringKeyList( regExpression );
- long numberOfSources = keys.size();
- ossim_uint32 offset = (copyPrefix+"elevation_source").size();
+ long numberOfSources = (long)keys.size();
+ ossim_uint32 offset = (ossim_uint32)(copyPrefix+"elevation_source").size();
ossim_uint32 idx = 0;
std::vector<int> theNumberList(numberOfSources);
for(idx = 0; idx < theNumberList.size();++idx)
@@ -581,7 +581,7 @@ double ossimElevManager::getHeightAboveMSL(const ossimGpt& gpt)
// Search through the list of elevation sources for a valid elevation
// post.
//---
- ossim_uint32 size = theElevSourceList.size();
+ ossim_uint32 size = (ossim_uint32)theElevSourceList.size();
for (ossim_uint32 i = 0; i < size; ++i)
{
//---
@@ -799,7 +799,7 @@ void ossimElevManager::addElevSource(ossimElevSource* source)
ossim_uint32 ossimElevManager::getNumberOfFactories()const
{
- return theElevSourceFactoryList.size();
+ return (ossim_uint32)theElevSourceFactoryList.size();
}
const ossimRefPtr<ossimElevSourceFactory> ossimElevManager::getFactory(ossim_uint32 idx)const
@@ -1859,7 +1859,7 @@ ossimRefPtr<ossimElevSource> ossimElevManager::getElevSourceForPoint(
// Search through the list of elevation sources for a valid elevation
// post.
//---
- ossim_uint32 size = theElevSourceList.size();
+ ossim_uint32 size = (ossim_uint32)theElevSourceList.size();
for (ossim_uint32 i = 0; i < size; ++i)
{
//---
diff --git a/Utilities/otbossim/src/ossim/font/ossimFreeTypeFont.cpp b/Utilities/otbossim/src/ossim/font/ossimFreeTypeFont.cpp
index f25ced15e69a17e7aae64489b83abf46b74f2e0b..465f4bf77af5c45426220fb547700b0282f303ee 100644
--- a/Utilities/otbossim/src/ossim/font/ossimFreeTypeFont.cpp
+++ b/Utilities/otbossim/src/ossim/font/ossimFreeTypeFont.cpp
@@ -6,7 +6,7 @@
// Author: Garrett Potts
//
//********************************************************************
-// $Id: ossimFreeTypeFont.cpp 9099 2006-06-13 21:21:10Z dburken $
+// $Id: ossimFreeTypeFont.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
// ossimFreeTypeFont.h should be load prior to checking for OSSIM_HAS_FREETYPE.
#include <ossim/font/ossimFreeTypeFont.h>
@@ -172,7 +172,7 @@ void ossimFreeTypeFont::layoutGlyphs(const ossimString& s )
FT_UInt load_flags;
FT_UInt num_grays;
FT_UInt prev_index = 0;
- FT_UInt num_glyphs = s.size();
+ FT_UInt num_glyphs = (FT_UInt)s.size();
int error = 0;
deleteGlyphs(theStringLayout);
@@ -261,7 +261,7 @@ const ossim_uint8* ossimFreeTypeFont::rasterize()
setupForRasterization();
layoutGlyphs(theStringToRasterize);
- int num_glyphs = theStringLayout.size();
+ int num_glyphs = (int)theStringLayout.size();
int n;
FT_Vector delta;
int error;
@@ -371,7 +371,7 @@ void ossimFreeTypeFont::getBoundingBox(ossimIrect& box)
setupForRasterization();
layoutGlyphs(theStringToRasterize);
- int num_glyphs = theStringLayout.size();
+ int num_glyphs = (int)theStringLayout.size();
int n;
FT_Vector delta;
int error;
diff --git a/Utilities/otbossim/src/ossim/font/ossimGdBitmapFont.cpp b/Utilities/otbossim/src/ossim/font/ossimGdBitmapFont.cpp
index 448fdf84affe27dab79069831247fdbacbf9ff07..b896d85a4bde424dd55bf60cc74b227260f8bb77 100644
--- a/Utilities/otbossim/src/ossim/font/ossimGdBitmapFont.cpp
+++ b/Utilities/otbossim/src/ossim/font/ossimGdBitmapFont.cpp
@@ -6,7 +6,7 @@
// Description:
//
//********************************************************************
-// $Id: ossimGdBitmapFont.cpp 12276 2008-01-07 19:58:43Z dburken $
+// $Id: ossimGdBitmapFont.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/font/ossimGdBitmapFont.h>
#include "string.h"
@@ -136,7 +136,7 @@ void ossimGdBitmapFont::rasterizeNormal()
{
ossimIrect outBox;
ossimIrect inBox(0,0,
- theStringToRasterize.length()*theGdFontPtr->w-1,
+ (ossim_int32)theStringToRasterize.length()*theGdFontPtr->w-1,
theGdFontPtr->h-1);
getBoundingBox(outBox);
@@ -164,7 +164,7 @@ void ossimGdBitmapFont::rasterizeNormal()
}
// which col do we start on
- bufOffset = character*theGdFontPtr->w;
+ bufOffset = (long)character*theGdFontPtr->w;
// get the starting offset to the bitmap
charOffset = charOffset*theGdFontPtr->w*theGdFontPtr->h;
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimCibCadrgTileSource.cpp b/Utilities/otbossim/src/ossim/imaging/ossimCibCadrgTileSource.cpp
index 5cd095a653ee9ee69bf963190ec4589a1e4f0f49..499b35f8bfc045cbe4193b6d722b4fd7000db0b7 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimCibCadrgTileSource.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimCibCadrgTileSource.cpp
@@ -7,7 +7,7 @@
// Author: Garrett Potts
//
//********************************************************************
-// $Id: ossimCibCadrgTileSource.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimCibCadrgTileSource.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <algorithm>
using namespace std;
@@ -33,6 +33,7 @@ using namespace std;
#include <ossim/support_data/ossimRpfCompressionSection.h>
#include <ossim/imaging/ossimTiffTileSource.h>
#include <ossim/imaging/ossimImageDataFactory.h>
+#include <ossim/imaging/ossimVirtualImageHandler.h>
#include <ossim/projection/ossimEquDistCylProjection.h>
#include <ossim/projection/ossimCylEquAreaProjection.h>
#include <ossim/base/ossimEndian.h>
@@ -41,7 +42,7 @@ using namespace std;
static ossimTrace traceDebug = ossimTrace("ossimCibCadrgTileSource:debug");
#ifdef OSSIM_ID_ENABLED
-static const char OSSIM_ID[] = "$Id: ossimCibCadrgTileSource.cpp 15766 2009-10-20 12:37:09Z gpotts $";
+static const char OSSIM_ID[] = "$Id: ossimCibCadrgTileSource.cpp 15833 2009-10-29 01:41:53Z eshirschorn $";
#endif
RTTI_DEF1(ossimCibCadrgTileSource, "ossimCibCadrgTileSource", ossimImageHandler)
@@ -284,12 +285,22 @@ bool ossimCibCadrgTileSource::getTile(ossimImageData* result,
result && (result->getNumberOfBands() == getNumberOfOutputBands()) &&
(theProductType != OSSIM_PRODUCT_TYPE_UNKNOWN) )
{
- //---
- // Check for overview tile. Some overviews can contain r0 so always
- // call even if resLevel is 0. Method returns true on success, false
- // on error.
- //---
- status = getOverviewTile(resLevel, result);
+ // See if the overview class is a virtual image handler. If so, do not
+ // check the overview tile when resLevel is 0: you cannot assume that the
+ // virtual overview is consistent with the parent image data, which can
+ // be partially updated.
+ ossimVirtualImageHandler* pVirtual = PTR_CAST( ossimVirtualImageHandler,
+ theOverview.get() );
+ if ( resLevel > 0 ||
+ (resLevel == 0 && pVirtual == NULL) )
+ {
+ //---
+ // Check for overview tile. Some overviews can contain r0 so always
+ // call even if resLevel is 0 (if overview is not virtual). Method
+ // returns true on success, false on error.
+ //---
+ status = getOverviewTile(resLevel, result);
+ }
if (!status) // Did not get an overview tile.
{
@@ -1062,7 +1073,7 @@ void ossimCibCadrgTileSource::fillSubTileCadrg(
// ESH 03/2009 -- Partial fix for ticket #646.
// Crash fix on reading RPFs: Make sure the colorTable vector
// has entries before trying to make use of them.
- int numTables = colorTable.size();
+ int numTables = (int)colorTable.size();
if ( numTables <= 0 )
{
return;
@@ -1207,7 +1218,7 @@ void ossimCibCadrgTileSource::fillSubTileCib(
// ESH 03/2009 -- Partial fix for ticket #646.
// Crash fix on reading RPFs: Make sure the colorTable vector
// has entries before trying to make use of them.
- int numTables = colorTable.size();
+ int numTables = (int)colorTable.size();
if ( numTables <= 0 )
{
return;
@@ -1544,7 +1555,7 @@ void ossimCibCadrgTileSource::populateLut()
// ESH 03/2009 -- Partial fix for ticket #646.
// Crash fix on reading RPFs: Make sure the colorTable vector
// has entries before trying to make use of them.
- int numTables = colorTable.size();
+ int numTables = (int)colorTable.size();
ossim_uint32 numElements = (numTables > 0) ? colorTable[0].getNumberOfElements() : 0;
if(numElements > 0)
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimConvolutionFilter1D.cpp b/Utilities/otbossim/src/ossim/imaging/ossimConvolutionFilter1D.cpp
index 8a9eab062e7d9573b9bdd0314e42a98232ede13a..0f38bea9e5b53355056806eb1b8f51c6f7027ba1 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimConvolutionFilter1D.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimConvolutionFilter1D.cpp
@@ -3,7 +3,7 @@
//
// See LICENSE.txt file in the top level directory for more details.
//*************************************************************************
-// $Id: ossimConvolutionFilter1D.cpp 12912 2008-05-28 15:05:54Z gpotts $
+// $Id: ossimConvolutionFilter1D.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimConvolutionFilter1D.h>
@@ -420,7 +420,7 @@ ossimRefPtr<ossimProperty> ossimConvolutionFilter1D::getProperty(const ossimStri
if(name == PROPNAME_KERNEL)
{
ossimMatrixProperty* property = new ossimMatrixProperty(name);
- property->resize(1,theKernel.size());
+ property->resize(1,(int)theKernel.size());
for(ossim_uint32 i=0;i<theKernel.size();++i)
{
(*property)(0,i) = theKernel[i];
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimDdffielddefn.cpp b/Utilities/otbossim/src/ossim/imaging/ossimDdffielddefn.cpp
index c89ee7c5d1f940657a4b6ee8073a0224df9683a0..18d96f7100a22d27bb884bc226bcf62821a3d078 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimDdffielddefn.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimDdffielddefn.cpp
@@ -26,7 +26,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
******************************************************************************
- * $Id: ossimDdffielddefn.cpp 12978 2008-06-04 00:04:14Z dburken $
+ * $Id: ossimDdffielddefn.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
*/
#include <cstring>
@@ -118,7 +118,7 @@ void ossimDDFFieldDefn::AddSubfield( ossimDDFSubfieldDefn *poNewSFDefn,
_formatControls = strdup( "()" );
}
- int nOldLen = strlen(_formatControls);
+ int nOldLen = (int)strlen(_formatControls);
char *pszNewFormatControls = (char *)
malloc(nOldLen+3+strlen(poNewSFDefn->GetFormat()));
@@ -189,9 +189,9 @@ int ossimDDFFieldDefn::GenerateDDREntry( char **ppachData,
int *pnLength )
{
- *pnLength = 9 + strlen(_fieldName) + 1
- + strlen(_arrayDescr) + 1
- + strlen(_formatControls) + 1;
+ *pnLength = 9 + (int)strlen(_fieldName) + 1
+ + (int)strlen(_arrayDescr) + 1
+ + (int)strlen(_formatControls) + 1;
if( strlen(_formatControls) == 0 )
*pnLength -= 1;
@@ -580,14 +580,14 @@ char *ossimDDFFieldDefn::ExpandFormat( const char * pszSrc )
if( (int) (strlen(pszExpandedContents) + strlen(pszDest) + 1)
> nDestMax )
{
- nDestMax = 2 * (strlen(pszExpandedContents) + strlen(pszDest));
+ nDestMax = 2 * ((int)strlen(pszExpandedContents) + (int)strlen(pszDest));
pszDest = (char *) realloc(pszDest,nDestMax+1);
}
strcat( pszDest, pszExpandedContents );
- iDst = strlen(pszDest);
+ iDst = (int)strlen(pszDest);
- iSrc = iSrc + strlen(pszContents) + 2;
+ iSrc = iSrc + (int)strlen(pszContents) + 2;
free( pszContents );
free( pszExpandedContents );
@@ -613,7 +613,7 @@ char *ossimDDFFieldDefn::ExpandFormat( const char * pszSrc )
> nDestMax )
{
nDestMax =
- 2 * (strlen(pszExpandedContents) + strlen(pszDest));
+ 2 * ((int)strlen(pszExpandedContents) + (int)strlen(pszDest));
pszDest = (char *) realloc(pszDest,nDestMax+1);
}
@@ -622,12 +622,12 @@ char *ossimDDFFieldDefn::ExpandFormat( const char * pszSrc )
strcat( pszDest, "," );
}
- iDst = strlen(pszDest);
+ iDst = (int)strlen(pszDest);
if( pszNext[0] == '(' )
- iSrc = iSrc + strlen(pszContents) + 2;
+ iSrc = iSrc + (int)strlen(pszContents) + 2;
else
- iSrc = iSrc + strlen(pszContents);
+ iSrc = iSrc + (int)strlen(pszContents);
free( pszContents );
free( pszExpandedContents );
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimDdfrecord.cpp b/Utilities/otbossim/src/ossim/imaging/ossimDdfrecord.cpp
index d3e304dec79dd5f54ab791c58f9459e1e3ec7662..5ad6efe0bd9a5d63f35682ff7a09790e893f2b68 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimDdfrecord.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimDdfrecord.cpp
@@ -26,7 +26,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
******************************************************************************
- * $Id: ossimDdfrecord.cpp 12978 2008-06-04 00:04:14Z dburken $
+ * $Id: ossimDdfrecord.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
*/
#include <cstring>
@@ -34,7 +34,7 @@
#include <ossim/base/ossimNotifyContext.h>
#include <ossim/base/ossimCplUtil.h>
-// CPL_CVSID("$Id: ossimDdfrecord.cpp 12978 2008-06-04 00:04:14Z dburken $");
+// CPL_CVSID("$Id: ossimDdfrecord.cpp 15833 2009-10-29 01:41:53Z eshirschorn $");
static const size_t nLeaderSize = 24;
@@ -266,7 +266,7 @@ int ossimDDFRecord::ReadHeader()
char achLeader[nLeaderSize];
int nReadBytes;
- nReadBytes = fread(achLeader,1,nLeaderSize,poModule->GetFP());
+ nReadBytes = (int)fread(achLeader,1,(int)nLeaderSize,poModule->GetFP());
if( nReadBytes == 0 && feof( poModule->GetFP() ) )
{
return false;
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimDdfsubfielddefn.cpp b/Utilities/otbossim/src/ossim/imaging/ossimDdfsubfielddefn.cpp
index 99cb75cada7c31fcfb3743753415185bdae9c9d9..0576d5add345089de50f032267999fb4ec8ad8fa 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimDdfsubfielddefn.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimDdfsubfielddefn.cpp
@@ -26,7 +26,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
******************************************************************************
- * $Id: ossimDdfsubfielddefn.cpp 15261 2009-08-26 12:47:58Z dburken $
+ * $Id: ossimDdfsubfielddefn.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
*/
#include <cstring>
@@ -80,7 +80,7 @@ void ossimDDFSubfieldDefn::SetName( const char * pszNewName )
pszName = strdup( pszNewName );
- for( i = strlen(pszName)-1; i > 0 && pszName[i] == ' '; i-- )
+ for( i = (int)strlen(pszName)-1; i > 0 && pszName[i] == ' '; i-- )
pszName[i] = '\0';
}
@@ -801,7 +801,7 @@ int ossimDDFSubfieldDefn::FormatStringValue( char *pachData, int nBytesAvailable
int nSize;
if( nValueLength == -1 )
- nValueLength = strlen(pszValue);
+ nValueLength = (int)strlen(pszValue);
if( bIsVariable )
{
@@ -865,7 +865,7 @@ int ossimDDFSubfieldDefn::FormatIntValue( char *pachData, int nBytesAvailable,
if( bIsVariable )
{
- nSize = strlen(szWork) + 1;
+ nSize = (int)strlen(szWork) + 1;
}
else
{
@@ -954,7 +954,7 @@ int ossimDDFSubfieldDefn::FormatFloatValue( char *pachData, int nBytesAvailable,
if( bIsVariable )
{
- nSize = strlen(szWork) + 1;
+ nSize = (int)strlen(szWork) + 1;
}
else
{
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimGeneralRasterTileSource.cpp b/Utilities/otbossim/src/ossim/imaging/ossimGeneralRasterTileSource.cpp
index 09f61973260485d153d18e4e7f1739abbac1eea8..5e46a45072f145b4c68e43d4b6693be96af643e3 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimGeneralRasterTileSource.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimGeneralRasterTileSource.cpp
@@ -10,7 +10,7 @@
//
// Contains class definition for ossimGeneralRasterTileSource.
//*******************************************************************
-// $Id: ossimGeneralRasterTileSource.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimGeneralRasterTileSource.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimGeneralRasterTileSource.h>
#include <ossim/base/ossimConstants.h>
@@ -324,7 +324,7 @@ bool ossimGeneralRasterTileSource::fillBIP(const ossimIpt& origin,
//***
// Read the line of image data.
//***
- theFileStrList[0]->read((char*)buf, buffer_width);
+ theFileStrList[0]->read((char*)buf, (std::streamsize)buffer_width);
if ((long)theFileStrList[0]->gcount() != (long)buffer_width)
{
theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
@@ -409,7 +409,7 @@ bool ossimGeneralRasterTileSource::fillBIL(const ossimIpt& origin,
//***
// Read the line of image data.
//***
- theFileStrList[0]->read((char*)buf, buffer_width);
+ theFileStrList[0]->read((char*)buf, (std::streamsize)buffer_width);
if ((long)theFileStrList[0]->gcount() != (long)buffer_width)
{
theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
@@ -512,7 +512,7 @@ bool ossimGeneralRasterTileSource::fillBSQ(const ossimIpt& origin,
//***
// Read the line of image data.
//***
- theFileStrList[0]->read((char*)buf, buffer_width);
+ theFileStrList[0]->read((char*)buf, (std::streamsize)buffer_width);
if ((long)theFileStrList[0]->gcount() != (long)buffer_width)
{
theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
@@ -616,7 +616,7 @@ bool ossimGeneralRasterTileSource::fillBsqMultiFile(const ossimIpt& origin,
//***
// Read the line of image data.
//***
- theFileStrList[band]->read((char*)buf, buffer_width);
+ theFileStrList[band]->read((char*)buf, (std::streamsize)buffer_width);
if ((long)theFileStrList[band]->gcount() != (long)buffer_width)
{
theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimGeoAnnotationMultiEllipseObject.cpp b/Utilities/otbossim/src/ossim/imaging/ossimGeoAnnotationMultiEllipseObject.cpp
index b2a3bc3458e766a8756a5afcfe7ef2040dbec80b..436c60b6cb488dee103679ad36fd8e710d9e0061 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimGeoAnnotationMultiEllipseObject.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimGeoAnnotationMultiEllipseObject.cpp
@@ -5,7 +5,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimGeoAnnotationMultiEllipseObject.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimGeoAnnotationMultiEllipseObject.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimGeoAnnotationMultiEllipseObject.h>
#include <ossim/imaging/ossimAnnotationMultiEllipseObject.h>
@@ -64,10 +64,10 @@ void ossimGeoAnnotationMultiEllipseObject::transform(
ossimImageGeometry* projection)
{
const std::vector<ossimGpt>::size_type BOUNDS = thePointList.size();
- theProjectedObject->resize(BOUNDS);
+ theProjectedObject->resize((ossim_uint32)BOUNDS);
for(std::vector<ossimGpt>::size_type i = 0; i < BOUNDS; ++i)
{
- projection->worldToLocal(thePointList[i], (*theProjectedObject)[i]);
+ projection->worldToLocal(thePointList[(int)i], (*theProjectedObject)[(int)i]);
}
computeBoundingRect();
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimGeoAnnotationPolyObject.cpp b/Utilities/otbossim/src/ossim/imaging/ossimGeoAnnotationPolyObject.cpp
index 273d5ee1792be686ce5ea50fac1316b93c777c6b..d8b92e602f4eb6c7238b5cd33b6f5d9a32652e9d 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimGeoAnnotationPolyObject.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimGeoAnnotationPolyObject.cpp
@@ -6,7 +6,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimGeoAnnotationPolyObject.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimGeoAnnotationPolyObject.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <sstream>
@@ -112,7 +112,7 @@ void ossimGeoAnnotationPolyObject::transform(ossimImageGeometry* projection)
for(std::vector<ossimGpt>::size_type index=0; index < BOUNDS; ++index)
{
- projection->worldToLocal(thePolygon[index], poly[index]);
+ projection->worldToLocal(thePolygon[(int)index], poly[(int)index]);
}
// update the bounding rect
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimGeoPolyCutter.cpp b/Utilities/otbossim/src/ossim/imaging/ossimGeoPolyCutter.cpp
index d8785618427b72868e8301162d981e6480625aa4..f8b796c90b369ad81977d9806fd97eb51196ed24 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimGeoPolyCutter.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimGeoPolyCutter.cpp
@@ -5,7 +5,7 @@
// Author: Garrett Potts (gpotts@imagelinks.com)
//
//*************************************************************************
-// $Id: ossimGeoPolyCutter.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimGeoPolyCutter.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <algorithm>
#include <ossim/imaging/ossimGeoPolyCutter.h>
#include <ossim/projection/ossimProjection.h>
@@ -72,7 +72,7 @@ bool ossimGeoPolyCutter::loadState(const ossimKeywordlist& kwl,
ossimString polygons = ossimString("^(") + copyPrefix + "geo_polygon[0-9]+.)";
vector<ossimString> keys =
kwl.getSubstringKeyList( polygons );
- int offset = (copyPrefix+"geo_polygon").size();
+ int offset = (int)(copyPrefix+"geo_polygon").size();
std::vector<int> numberList(keys.size());
for(int idx = 0; idx < (int)numberList.size();++idx)
@@ -177,7 +177,7 @@ void ossimGeoPolyCutter::addPolygon(const vector<ossimIpt>& polygon)
{
ossimPolyCutter::addPolygon(polygon);
theGeoPolygonList.push_back(ossimGeoPolygon());
- invertPolygon(thePolygonList.size()-1);
+ invertPolygon((int)thePolygonList.size()-1);
}
}
@@ -187,7 +187,7 @@ void ossimGeoPolyCutter::addPolygon(const vector<ossimDpt>& polygon)
{
ossimPolyCutter::addPolygon(polygon);
theGeoPolygonList.push_back(ossimGeoPolygon());
- invertPolygon(thePolygonList.size()-1);
+ invertPolygon((int)thePolygonList.size()-1);
}
}
@@ -197,7 +197,7 @@ void ossimGeoPolyCutter::addPolygon(const ossimPolygon& polygon)
{
ossimPolyCutter::addPolygon(polygon);
theGeoPolygonList.push_back(ossimGeoPolygon());
- invertPolygon(thePolygonList.size()-1);
+ invertPolygon((int)thePolygonList.size()-1);
}
}
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimGridRemapSource.cpp b/Utilities/otbossim/src/ossim/imaging/ossimGridRemapSource.cpp
index 2b8a0b69b9eaf496faf617dc21903afda66472e3..5c4dad6cda4638a086988c435f8bc3c06fe6f918 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimGridRemapSource.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimGridRemapSource.cpp
@@ -14,7 +14,7 @@
// LIMITATIONS: None.
//
//*****************************************************************************
-// $Id: ossimGridRemapSource.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimGridRemapSource.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimGridRemapSource.h>
@@ -299,7 +299,7 @@ bool ossimGridRemapSource::saveState(ossimKeywordlist& kwl,
void ossimGridRemapSource::setGridNode(const ossimDpt& view_pt,
const double* value)
{
- int numGrids = theGrids.size();
+ int numGrids = (int)theGrids.size();
for (int i=0; i<numGrids; i++)
theGrids[i]->setNearestNode(view_pt, value[i]);
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimHistoMatchRemapper.cpp b/Utilities/otbossim/src/ossim/imaging/ossimHistoMatchRemapper.cpp
index c253ffd068346e49e15502b16e944e07f0e9787c..2a4448ff1d9fa60d0581b6d3efe5ef49704f2775 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimHistoMatchRemapper.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimHistoMatchRemapper.cpp
@@ -8,7 +8,7 @@
// Author: Garrett Potts
//
//*******************************************************************
-// $Id: ossimHistoMatchRemapper.cpp 9094 2006-06-13 19:12:40Z dburken $
+// $Id: ossimHistoMatchRemapper.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimHistoMatchRemapper.h>
#include <ossim/imaging/ossimImageData.h>
#include <ossim/imaging/ossimImageSource.h>
@@ -62,7 +62,7 @@ ossimRefPtr<ossimImageData> ossimHistoMatchRemapper::getTile(
}
theBlankTile->setOrigin(tileRect.ul());
- ossim_uint32 numberOfBands = theInputMeanPerBand.size();
+ ossim_uint32 numberOfBands = (ossim_uint32)theInputMeanPerBand.size();
numberOfBands = numberOfBands>tile->getNumberOfBands()?tile->getNumberOfBands():numberOfBands;
double result = 0;
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimHsvGridRemapEngine.cpp b/Utilities/otbossim/src/ossim/imaging/ossimHsvGridRemapEngine.cpp
index f39204a7f9b1ad4543ffc24d0b0e3a567003c5ef..ec735297e0270df6e2c49fc0c220dc7ff3870ac0 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimHsvGridRemapEngine.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimHsvGridRemapEngine.cpp
@@ -14,7 +14,7 @@
// LIMITATIONS: None.
//
//*****************************************************************************
-// $Id: ossimHsvGridRemapEngine.cpp 9094 2006-06-13 19:12:40Z dburken $
+// $Id: ossimHsvGridRemapEngine.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimHsvGridRemapEngine.h>
@@ -162,7 +162,7 @@ void ossimHsvGridRemapEngine::assignRemapValues (
// Declare a 2D array that will contain all of the contributing sources'
// HSV mean values. Also declare the accumulator target vector.
//***
- int num_contributors = sources_list.size();
+ int num_contributors = (int)sources_list.size();
double** contributor_pixel = new double* [num_contributors];
for (i=0; i<num_contributors; i++)
contributor_pixel[i] = new double[3];
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimImageChain.cpp b/Utilities/otbossim/src/ossim/imaging/ossimImageChain.cpp
index 6e0dd2cc3d1e8cc7aa85aee3f8bae7e784ae85db..17e63b8ee5a69054a745faf377e719a3ff47a748 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimImageChain.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimImageChain.cpp
@@ -8,7 +8,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimImageChain.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimImageChain.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <algorithm>
#include <iostream>
#include <iterator>
@@ -539,7 +539,7 @@ bool ossimImageChain::removeChild(ossimConnectableObject* object)
ossimConnectableObject::ConnectableObjectList output = object->getOutputList();
// remember the old size before removing
- ossim_uint32 chainSize = theImageChainList.size();
+ ossim_uint32 chainSize = (ossim_uint32)theImageChainList.size();
current = theImageChainList.erase(current);
// Clear connections between this object and child.
@@ -1294,9 +1294,9 @@ bool ossimImageChain::addAllSources(map<ossimId, vector<ossimId> >& idMapping,
ossimString regExpression = ossimString("^(") + copyPrefix + "object[0-9]+.)";
vector<ossimString> keys =
kwl.getSubstringKeyList( regExpression );
- long numberOfSources = keys.size();//kwl.getNumberOfSubstringKeys(regExpression);
+ long numberOfSources = (long)keys.size();//kwl.getNumberOfSubstringKeys(regExpression);
- int offset = (copyPrefix+"object").size();
+ int offset = (int)(copyPrefix+"object").size();
int idx = 0;
std::vector<int> theNumberList(numberOfSources);
for(idx = 0; idx < (int)theNumberList.size();++idx)
@@ -1398,8 +1398,8 @@ void ossimImageChain::findInputConnectionIds(vector<ossimId>& result,
vector<ossimString> keys =
kwl.getSubstringKeyList( regExpression );
- ossim_int32 offset = (copyPrefix+"input_connection").size();
- ossim_uint32 numberOfKeys = keys.size();
+ ossim_int32 offset = (ossim_int32)(copyPrefix+"input_connection").size();
+ ossim_uint32 numberOfKeys = (ossim_uint32)keys.size();
std::vector<int> theNumberList(numberOfKeys);
for(idx = 0; idx < theNumberList.size();++idx)
{
@@ -1433,7 +1433,7 @@ bool ossimImageChain::connectAllSources(const map<ossimId, vector<ossimId> >& id
if(currentSource)
{
- long upperBound = (*iter).second.size();
+ long upperBound = (long)(*iter).second.size();
for(long index = 0; index < upperBound; ++index)
{
if((*iter).second[index].getId() > -1)
@@ -1471,7 +1471,7 @@ bool ossimImageChain::saveState(ossimKeywordlist& kwl,
{
return result;
}
- ossim_uint32 upper = theImageChainList.size();
+ ossim_uint32 upper = (ossim_uint32)theImageChainList.size();
ossim_uint32 counter = 1;
if (upper)
@@ -1526,7 +1526,7 @@ void ossimImageChain::initialize()
static const char* MODULE = "ossimImageChain::initialize()";
if (traceDebug()) CLOG << " Entered..." << std::endl;
- long upper = theImageChainList.size();
+ long upper = (ossim_uint32)theImageChainList.size();
for(long index = upper - 1; index >= 0; --index)
{
@@ -1574,7 +1574,7 @@ void ossimImageChain::enableSource()
void ossimImageChain::disableSource()
{
- long upper = theImageChainList.size();
+ long upper = (ossim_uint32)theImageChainList.size();
for(long index = upper - 1; index >= 0; --index)
{
@@ -1614,7 +1614,7 @@ bool ossimImageChain::deleteLast()
if (theImageChainList.size() == 0) return false;
// Clear any listeners, memory.
- ossim_uint32 index = theImageChainList.size() - 1;
+ ossim_uint32 index = (ossim_uint32)theImageChainList.size() - 1;
theImageChainList[index]->
removeListener((ossimConnectableObjectListener*)this);
theImageChainList[index]->removeListener(theChildListener);
@@ -1628,7 +1628,7 @@ bool ossimImageChain::deleteLast()
void ossimImageChain::deleteList()
{
- long upper = theImageChainList.size();
+ long upper = (long)theImageChainList.size();
for(long index = 0; index < upper; ++index)
{
theImageChainList[index]->removeListener((ossimConnectableObjectListener*)this);
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimImageCombiner.cpp b/Utilities/otbossim/src/ossim/imaging/ossimImageCombiner.cpp
index bae8c9315666886d6c224a035e4f6d19d4d345aa..452674b53e1595fae09ca8d88b7c789da4697b1d 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimImageCombiner.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimImageCombiner.cpp
@@ -5,7 +5,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimImageCombiner.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimImageCombiner.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimImageCombiner.h>
#include <ossim/base/ossimKeywordlist.h>
#include <ossim/base/ossimIrect.h>
@@ -56,15 +56,15 @@ ossimImageCombiner::ossimImageCombiner(ossimObject* owner,
ossimImageCombiner::ossimImageCombiner(ossimConnectableObject::ConnectableObjectList& inputSources)
:ossimImageSource(NULL,
- inputSources.size(),
+ (ossim_uint32)inputSources.size(),
0,
false,
false),
- theLargestNumberOfInputBands(0),
- theInputToPassThrough(0),
- theHasDifferentInputs(false),
- theNormTile(NULL),
- theCurrentIndex(0)
+ theLargestNumberOfInputBands(0),
+ theInputToPassThrough(0),
+ theHasDifferentInputs(false),
+ theNormTile(NULL),
+ theCurrentIndex(0)
{
theComputeFullResBoundsFlag = true;
for(ossim_uint32 index = 0; index < inputSources.size(); ++index)
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimImageData.cpp b/Utilities/otbossim/src/ossim/imaging/ossimImageData.cpp
index 8a69bbb4b56ccee2ffe390f3251e115f85e446fe..11e9d43975694a3177202b11edb3456e800e8d51 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimImageData.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimImageData.cpp
@@ -7,7 +7,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimImageData.cpp 15792 2009-10-22 18:03:13Z dburken $
+// $Id: ossimImageData.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <iterator>
@@ -4801,18 +4801,15 @@ ossimImageData::unloadBandToBsqTemplate(T, // dummy template arg...
{
T d_dest_band = d[d_dest_band_pixel_offset];
- for ( band=0; band<num_bands; ++band )
+ for ( band=0; band<num_bands && band!=dest_band; ++band )
{
- if (band!=dest_band)
+ T d_other_band = d[d_pixel_offset + (band * d_band_offset)];
+
+ // test for the color discrepancy
+ if ( d_other_band != d_dest_band )
{
- T d_other_band = d[d_pixel_offset + (band * d_band_offset)];
-
- // test for the color discrepancy
- if ( d_other_band != d_dest_band )
- {
- d[d_dest_band_pixel_offset] = s[src_band][i];
- break;
- }
+ d[d_dest_band_pixel_offset] = s[src_band][i];
+ break;
}
}
}
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimImageHandler.cpp b/Utilities/otbossim/src/ossim/imaging/ossimImageHandler.cpp
index 0ba911847a9fce81afade87baaf9bc7ff950cf29..27ffdf858df3d3a711560bb40d8e1801a8fd4fa9 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimImageHandler.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimImageHandler.cpp
@@ -12,7 +12,7 @@
// derive from.
//
//*******************************************************************
-// $Id: ossimImageHandler.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimImageHandler.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <algorithm>
@@ -47,7 +47,7 @@ RTTI_DEF1(ossimImageHandler, "ossimImageHandler", ossimImageSource)
static ossimTrace traceDebug("ossimImageHandler:debug");
#ifdef OSSIM_ID_ENABLED
-static const char OSSIM_ID[] = "$Id: ossimImageHandler.cpp 15766 2009-10-20 12:37:09Z gpotts $";
+static const char OSSIM_ID[] = "$Id: ossimImageHandler.cpp 15833 2009-10-29 01:41:53Z eshirschorn $";
#endif
// GARRETT! All of the decimation factors are scattered throughout. We want to fold that into
@@ -62,6 +62,7 @@ ossimImageHandler::ossimImageHandler()
:
ossimImageSource(0, 0, 0, true, false /* output list is not fixed */ ),
theImageFile(ossimFilename::NIL),
+theSupplementaryDirectory(ossimFilename::NIL),
theOverview(0),
//theSubImageOffset(0, 0),
theValidImageVertices(0),
@@ -379,7 +380,21 @@ void ossimImageHandler::getDecimationFactor(ossim_uint32 resLevel,
}
else
{
- result.x = 1.0 / ((ossim_float64)(1<<resLevel));
+ /*
+ ESH 02/2009 -- No longer assume powers of 2 reduction
+ in linear size from resLevel 0 (Tickets # 467,529).
+ */
+ ossim_int32 x = getNumberOfLines(resLevel);
+ ossim_int32 x0 = getNumberOfLines(0);
+
+ if ( x > 0 && x0 > 0 )
+ {
+ result.x = ((double)x) / x0;
+ }
+ else
+ {
+ result.x = 1.0 / (1<<resLevel);
+ }
result.y = result.x;
}
}
@@ -1092,7 +1107,7 @@ ossim_uint32 ossimImageHandler::getNumberOfEntries()const
std::vector<ossim_uint32> tempList;
getEntryList(tempList);
- return tempList.size();
+ return (ossim_uint32)tempList.size();
}
@@ -1124,6 +1139,15 @@ const ossimFilename& ossimImageHandler::getFilename()const
return theImageFile;
}
+void ossimImageHandler::setSupplementaryDirectory(const ossimFilename& dir)
+{
+ theSupplementaryDirectory = dir;
+}
+
+const ossimFilename& ossimImageHandler::getSupplementaryDirectory()const
+{
+ return theSupplementaryDirectory;
+}
void ossimImageHandler::setProperty(ossimRefPtr<ossimProperty> property)
{
@@ -1236,6 +1260,16 @@ ossimFilename ossimImageHandler::getFilenameWithThisExtension(
// Get the image file.
ossimFilename f = getFilename();
+ // If the supplementary directory is set, find the extension
+ // at that location instead of at the default.
+ if ( theSupplementaryDirectory.empty() == false )
+ {
+ ossimFilename fname = f.file();
+
+ f.setPath( theSupplementaryDirectory );
+ f.dirCat( fname );
+ }
+
// Wipe out the extension.
f.setExtension("");
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerFactory.cpp b/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerFactory.cpp
index 21a53e76e8889718dc05dde771d1a191d33e0dbc..400b01d3a962c46ebf2f96d3d3463163381e70c0 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerFactory.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerFactory.cpp
@@ -1,11 +1,11 @@
//----------------------------------------------------------------------------
//
// License: LGPL
-//
+//
// See LICENSE.txt file in the top level directory for more details.
//
//----------------------------------------------------------------------------
-// $Id: ossimImageHandlerFactory.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimImageHandlerFactory.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimImageHandlerFactory.h>
#include <ossim/imaging/ossimAdrgTileSource.h>
#include <ossim/imaging/ossimCcfTileSource.h>
@@ -23,6 +23,7 @@
#include <ossim/imaging/ossimERSTileSource.h>
#include <ossim/imaging/ossimVpfTileSource.h>
#include <ossim/imaging/ossimTileMapTileSource.h>
+#include <ossim/imaging/ossimVirtualImageHandler.h>
#include <ossim/base/ossimTrace.h>
#include <ossim/base/ossimKeywordNames.h>
#include <ossim/imaging/ossimJpegTileSource.h>
@@ -47,8 +48,8 @@ ossimImageHandlerFactory* ossimImageHandlerFactory::instance()
theInstance = new ossimImageHandlerFactory;
// let's turn off tiff error reporting
- TIFFSetErrorHandler(NULL);
- TIFFSetWarningHandler(NULL);
+ TIFFSetErrorHandler(0);
+ TIFFSetWarningHandler(0);
}
return theInstance;
@@ -58,7 +59,7 @@ ossimImageHandler* ossimImageHandlerFactory::open(
const ossimFilename& fileName)const
{
ossimFilename copyFilename = fileName;
-
+
if(traceDebug())
{
ossimNotify(ossimNotifyLevel_DEBUG)
@@ -81,7 +82,7 @@ ossimImageHandler* ossimImageHandlerFactory::open(
if(!copyFilename.exists()) return 0;
ossimString ext = copyFilename.ext().downcase();
-
+
if(ext == "gz")
{
copyFilename = copyFilename.setExtension("");
@@ -101,6 +102,18 @@ ossimImageHandler* ossimImageHandlerFactory::open(
// readers...
//---
+ if(traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "trying OSSIM Virtual Image" << std::endl;
+ }
+ result = new ossimVirtualImageHandler;
+ if(result->open(copyFilename))
+ {
+ return result.release();
+ }
+ result = 0;
+
if(traceDebug())
{
ossimNotify(ossimNotifyLevel_DEBUG)
@@ -344,16 +357,16 @@ ossimImageHandler* ossimImageHandlerFactory::open(
ossimNotify(ossimNotifyLevel_DEBUG)
<< "trying adrg" << std::endl;
}
-
+
// test if ADRG
result = new ossimAdrgTileSource();
-
+
if(result->open(copyFilename))
{
return result.release();
}
result = 0;
-
+
if(traceDebug())
{
ossimNotify(ossimNotifyLevel_DEBUG)
@@ -365,14 +378,14 @@ ossimImageHandler* ossimImageHandlerFactory::open(
{
return result.release();
}
-
+
result = 0;
if(traceDebug())
{
ossimNotify(ossimNotifyLevel_DEBUG)
<< "ossimImageHandlerFactory::open(filename) DEBUG: returning..." << std::endl;
}
- return (ossimImageHandler*)NULL;
+ return (ossimImageHandler*)0;
}
ossimImageHandler* ossimImageHandlerFactory::open(const ossimKeywordlist& kwl,
@@ -398,7 +411,7 @@ ossimImageHandler* ossimImageHandlerFactory::open(const ossimKeywordlist& kwl,
return result.release();
}
result = 0;
-
+
if(traceDebug())
{
ossimNotify(ossimNotifyLevel_DEBUG)
@@ -558,9 +571,9 @@ ossimImageHandler* ossimImageHandlerFactory::open(const ossimKeywordlist& kwl,
{
return result.release();
}
-
+
result = 0;
-
+
if(traceDebug())
{
ossimNotify(ossimNotifyLevel_DEBUG)
@@ -677,7 +690,7 @@ ossimImageHandler* ossimImageHandlerFactory::openFromExtension(
}
result = 0;
}
-
+
if ( (ext == "tif") || (ext == "tiff") )
{
// this must be checked first before the TIFF handler
@@ -723,7 +736,7 @@ ossimImageHandler* ossimImageHandlerFactory::openFromExtension(
}
result = 0;
}
-
+
if ( (ext == "jpg") || (ext == "jpeg") )
{
result = new ossimJpegTileSource;
@@ -733,7 +746,7 @@ ossimImageHandler* ossimImageHandlerFactory::openFromExtension(
}
result = 0;
}
-
+
if ( (ext == "doq") || (ext == "doqq") )
{
result = new ossimDoqqTileSource;
@@ -763,7 +776,7 @@ ossimImageHandler* ossimImageHandlerFactory::openFromExtension(
return result.release();
}
result = 0;
- }
+ }
if (ext == "dem")
{
@@ -884,7 +897,7 @@ ossimObject* ossimImageHandlerFactory::createObject(const ossimString& typeName)
void ossimImageHandlerFactory::getSupportedExtensions(ossimImageHandlerFactoryBase::UniqueStringList& extensionList)const
{
extensionList.push_back("img");
- extensionList.push_back("ccf");
+ extensionList.push_back("ccf");
extensionList.push_back("toc");
extensionList.push_back("tif");
extensionList.push_back("tiff");
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimImageMetaData.cpp b/Utilities/otbossim/src/ossim/imaging/ossimImageMetaData.cpp
index ea2cc3f538f47958d01be1d431675678c4023ea8..abf7a6205c954a28a33c2192f7c82aa3bc86d92a 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimImageMetaData.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimImageMetaData.cpp
@@ -10,7 +10,7 @@
// Contains class definition for ossimImageMetaData.
//
//*******************************************************************
-// $Id: ossimImageMetaData.cpp 12246 2008-01-03 19:41:35Z dburken $
+// $Id: ossimImageMetaData.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <vector>
#include <algorithm>
#include <ossim/imaging/ossimImageMetaData.h>
@@ -230,7 +230,7 @@ void ossimImageMetaData::loadBandInfo(const ossimKeywordlist& kwl,
std::vector<ossimString> keys =
kwl.getSubstringKeyList( regExpression );
- ossim_uint32 numberOfBands = keys.size();
+ ossim_uint32 numberOfBands = (ossim_uint32)keys.size();
theMinValuesValidFlag = true;
theMaxValuesValidFlag = true;
@@ -249,7 +249,7 @@ void ossimImageMetaData::loadBandInfo(const ossimKeywordlist& kwl,
setNumberOfBands(numberOfBands);
}
- int offset = (copyPrefix+"band").size();
+ int offset = (int)(copyPrefix+"band").size();
int idx = 0;
std::vector<int> theNumberList(numberOfBands);
for(idx = 0; idx < (int)theNumberList.size();++idx)
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimImageModel.cpp b/Utilities/otbossim/src/ossim/imaging/ossimImageModel.cpp
index c766b81e645786d5f8f2a7cf7c848ca6e337fe69..00e01eacefccab11da45f6b7d4a74c1baead5fe6 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimImageModel.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimImageModel.cpp
@@ -137,7 +137,7 @@ void ossimImageModel::getBoundingRectangle(ossim_uint32 rrds,
}
ossim_uint32 ossimImageModel::getNumberOfDecimationLevels()const
{
- return theDecimationFactors.size();
+ return (ossim_uint32)theDecimationFactors.size();
}
void ossimImageModel::setTargetRrds(ossim_uint32 rrds)
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimImageRenderer.cpp b/Utilities/otbossim/src/ossim/imaging/ossimImageRenderer.cpp
index 94c0587b22db4a6c3aa058824bbd38fa39e12de7..68736894b57b38b402ee8f6df775febda15de34a 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimImageRenderer.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimImageRenderer.cpp
@@ -7,7 +7,7 @@
// Author: Garrett Potts
//
//*******************************************************************
-// $Id: ossimImageRenderer.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimImageRenderer.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <iostream>
using namespace std;
@@ -41,7 +41,7 @@ using namespace std;
#include <ossim/projection/ossimEquDistCylProjection.h>
#ifdef OSSIM_ID_ENABLED
-static const char OSSIM_ID[] = "$Id: ossimImageRenderer.cpp 15766 2009-10-20 12:37:09Z gpotts $";
+static const char OSSIM_ID[] = "$Id: ossimImageRenderer.cpp 15833 2009-10-29 01:41:53Z eshirschorn $";
#endif
static ossimTrace traceDebug("ossimImageRenderer:debug");
@@ -926,7 +926,7 @@ void ossimImageRenderer::fillTile(ossimRefPtr<ossimImageData> outputData,
ossimDpt decimation;
decimation.makeNan(); // initialize to nan.
theInputConnection->getDecimationFactor(resLevel, decimation);
- double requestScale = 1.0 / pow( (double)2.0, (double)resLevel );
+ double requestScale = 1.0 / (1<<resLevel);
double closestScale = decimation.hasNans() ? requestScale : decimation.x;
double differenceTest = 0.0;
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimLandsatTileSource.cpp b/Utilities/otbossim/src/ossim/imaging/ossimLandsatTileSource.cpp
index 735572c7d8ac52b84fdebb2d6ddb8434345f6bcf..0cd2732a937cb095e546cd779a363edd84d31300 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimLandsatTileSource.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimLandsatTileSource.cpp
@@ -9,7 +9,7 @@
// Contains class implementaiton for the class "ossim LandsatTileSource".
//
//*******************************************************************
-// $Id: ossimLandsatTileSource.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimLandsatTileSource.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimLandsatTileSource.h>
#include <ossim/base/ossimDirectory.h>
@@ -158,7 +158,7 @@ bool ossimLandsatTileSource::open()
ossimGeneralRasterInfo generalRasterInfo(fileList,
OSSIM_UINT8,
OSSIM_BSQ_MULTI_FILE,
- fileList.size(),
+ (ossim_uint32)fileList.size(),
theFfHdr->getLinesPerBand(),
theFfHdr->getPixelsPerLine(),
0,
@@ -169,7 +169,7 @@ bool ossimLandsatTileSource::open()
generalRasterInfo = ossimGeneralRasterInfo(fileList,
OSSIM_UINT8,
OSSIM_BSQ,
- fileList.size(),
+ (ossim_uint32)fileList.size(),
theFfHdr->getLinesPerBand(),
theFfHdr->getPixelsPerLine(),
0,
@@ -178,7 +178,7 @@ bool ossimLandsatTileSource::open()
}
theMetaData.clear();
theMetaData.setScalarType(OSSIM_UINT8);
- theMetaData.setNumberOfBands(fileList.size());
+ theMetaData.setNumberOfBands((ossim_uint32)fileList.size());
theImageData = generalRasterInfo;
if(initializeHandler())
{
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimLocalCorrelationFusion.cpp b/Utilities/otbossim/src/ossim/imaging/ossimLocalCorrelationFusion.cpp
index 2e65780dbad0c6cd33856318df027d4763416241..b04aba115cbd805883e338d42e972e6602872ed7 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimLocalCorrelationFusion.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimLocalCorrelationFusion.cpp
@@ -6,7 +6,7 @@
// Author: Garrett Potts
//
//*******************************************************************
-// $Id: ossimLocalCorrelationFusion.cpp 11347 2007-07-23 13:01:59Z gpotts $
+// $Id: ossimLocalCorrelationFusion.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimLocalCorrelationFusion.h>
#include <ossim/matrix/newmat.h>
#include <ossim/matrix/newmatio.h>
@@ -160,7 +160,7 @@ ossimRefPtr<ossimImageData> ossimLocalCorrelationFusion::getTile(const ossimIrec
}
double panAttenuator = computeParameterOffset(REGRESSION_COEFFICIENT_ATTENUATOR_OFFSET);
double delta = 0.0;
- ossim_uint32 bandsSize = bands.size();
+ ossim_uint32 bandsSize = (ossim_uint32)bands.size();
ossim_float64 slopeClamp = computeParameterOffset(REGRESSION_COEFFICIENT_CLAMP_OFFSET);
ossim_float64 minSlope = -slopeClamp;
ossim_float64 maxSlope = slopeClamp;
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimMemoryImageSource.cpp b/Utilities/otbossim/src/ossim/imaging/ossimMemoryImageSource.cpp
index 33511c88e8ab25e30c6982d1a2f96c703d83f4fe..ce9382c1c860def5acd4aca2685ec6023a88dabd 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimMemoryImageSource.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimMemoryImageSource.cpp
@@ -181,7 +181,7 @@ void ossimMemoryImageSource::getDecimationFactor(ossim_uint32 resLevel,
}
else
{
- result.x = 1.0 / pow((double)2, (double)resLevel);
+ result.x = 1.0 / (1<<resLevel);
result.y = result.x;
}
}
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimMonoGridRemapEngine.cpp b/Utilities/otbossim/src/ossim/imaging/ossimMonoGridRemapEngine.cpp
index cc4352a0d997f8f4bde1120314832e03164483c3..83bafd1e3ac0cfefd3deb1de1dd6ade1c3e88c67 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimMonoGridRemapEngine.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimMonoGridRemapEngine.cpp
@@ -16,7 +16,7 @@
// LIMITATIONS: None.
//
//*****************************************************************************
-// $Id: ossimMonoGridRemapEngine.cpp 9094 2006-06-13 19:12:40Z dburken $
+// $Id: ossimMonoGridRemapEngine.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimMonoGridRemapEngine.h>
@@ -259,7 +259,7 @@ void ossimMonoGridRemapEngine::assignRemapValues (
// Declare a 2D array that will contain all of the contributing sources'
// MONO mean values. Also declare the accumulator target vector.
//***
- int num_contributors = sources_list.size();
+ int num_contributors = (int)sources_list.size();
double** contributor_pixel = new double* [num_contributors];
for (i=0; i<num_contributors; i++)
contributor_pixel[i] = new double[1];
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimMultiBandHistogramTileSource.cpp b/Utilities/otbossim/src/ossim/imaging/ossimMultiBandHistogramTileSource.cpp
index 245184c961fe2a2f56440ed92cd34f0dc75ebbc8..24c727a236183c05a3029273b13353e85bb5c2a5 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimMultiBandHistogramTileSource.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimMultiBandHistogramTileSource.cpp
@@ -5,7 +5,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimMultiBandHistogramTileSource.cpp 11721 2007-09-13 13:19:34Z gpotts $
+// $Id: ossimMultiBandHistogramTileSource.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimMultiBandHistogramTileSource.h>
#include <ossim/base/ossimMultiResLevelHistogram.h>
#include <ossim/base/ossimMultiBandHistogram.h>
@@ -184,7 +184,7 @@ void ossimMultiBandHistogramTileSource::allocate()
}
if(numberOfBands > theMinValuePercentArray.size())
{
- for(i = theMinValuePercentArray.size(); i < numberOfBands; ++i)
+ for(i = (ossim_uint32)theMinValuePercentArray.size(); i < numberOfBands; ++i)
{
theMinValuePercentArray[i] = 0.0;
theMaxValuePercentArray[i] = 0.0;
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimNitfTileSource.cpp b/Utilities/otbossim/src/ossim/imaging/ossimNitfTileSource.cpp
index 3ad59cecbd8db4b7cc5751e79f5109b89effec76..dab0107fdfdbabd0d5bf14c6b2921e74be1ab595 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimNitfTileSource.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimNitfTileSource.cpp
@@ -9,7 +9,7 @@
// Description: Contains class definition for ossimNitfTileSource.
//
//*******************************************************************
-// $Id: ossimNitfTileSource.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimNitfTileSource.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <jerror.h>
#include <algorithm> /* for std::fill */
@@ -45,7 +45,7 @@
RTTI_DEF1_INST(ossimNitfTileSource, "ossimNitfTileSource", ossimImageHandler)
#ifdef OSSIM_ID_ENABLED
- static const char OSSIM_ID[] = "$Id: ossimNitfTileSource.cpp 15766 2009-10-20 12:37:09Z gpotts $";
+ static const char OSSIM_ID[] = "$Id: ossimNitfTileSource.cpp 15833 2009-10-29 01:41:53Z eshirschorn $";
#endif
//---
@@ -298,7 +298,7 @@ bool ossimNitfTileSource::parseFile()
theCurrentEntry = theEntryList[0];
}
- theNumberOfImages = theNitfImageHeader.size();
+ theNumberOfImages = (ossim_uint32)theNitfImageHeader.size();
if (theNitfImageHeader.size() != theNumberOfImages)
{
@@ -2177,7 +2177,7 @@ ossim_uint32 ossimNitfTileSource::getCurrentEntry() const
ossim_uint32 ossimNitfTileSource::getNumberOfEntries() const
{
- return theEntryList.size();
+ return (ossim_uint32)theEntryList.size();
}
void ossimNitfTileSource::getEntryList(std::vector<ossim_uint32>& entryList)const
@@ -2599,7 +2599,7 @@ void ossimNitfTileSource::vqUncompress(ossimRefPtr<ossimImageData> destination,
ossim_uint32 compressionIdx = 0;
ossim_uint32 uncompressIdx = 0;
ossim_uint32 uncompressYidx = 0;
- ossim_uint32 rows = table.size();
+ ossim_uint32 rows = (ossim_uint32)table.size();
ossim_uint32 cols = 0;
ossim_uint32 rowIdx = 0;
ossim_uint32 colIdx = 0;
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimOverviewBuilderFactory.cpp b/Utilities/otbossim/src/ossim/imaging/ossimOverviewBuilderFactory.cpp
index 32697a60f907511aa29b1a25b648abe4ff74a40c..e04c0ab3ea19de2f04aeb00e5fc0bc9fe0f39fc2 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimOverviewBuilderFactory.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimOverviewBuilderFactory.cpp
@@ -7,12 +7,13 @@
// Description: .
//
//----------------------------------------------------------------------------
-// $Id: ossimOverviewBuilderFactory.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimOverviewBuilderFactory.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <cstddef> /* for NULL */
#include <ossim/imaging/ossimOverviewBuilderFactory.h>
#include <ossim/imaging/ossimTiffOverviewBuilder.h>
+#include <ossim/imaging/ossimVirtualOverviewBuilder.h>
ossimOverviewBuilderFactory*
ossimOverviewBuilderFactory::theInstance = NULL;
@@ -34,17 +35,20 @@ ossimOverviewBuilderFactory::~ossimOverviewBuilderFactory()
ossimOverviewBuilderBase* ossimOverviewBuilderFactory::createBuilder(
const ossimString& typeName) const
{
- ossimRefPtr<ossimOverviewBuilderBase> result = new ossimTiffOverviewBuilder();
- if ( result->hasOverviewType(typeName) == true )
+ ossimRefPtr<ossimOverviewBuilderBase> result = new ossimTiffOverviewBuilder();
+ if ( result->hasOverviewType(typeName) == false )
{
- // Capture the type. (This builder has more than one.)
- result->setOverviewType(typeName);
+ result = new ossimVirtualOverviewBuilder();
}
- else
+ if ( result->hasOverviewType(typeName) == false )
{
result = 0;
}
-
+
+ if ( result.get() )
+ {
+ result->setOverviewType(typeName);
+ }
return result.release();
}
@@ -53,6 +57,9 @@ void ossimOverviewBuilderFactory::getTypeNameList(
{
ossimRefPtr<ossimOverviewBuilderBase> builder = new ossimTiffOverviewBuilder();
builder->getTypeNameList(typeList);
+
+ builder = new ossimVirtualOverviewBuilder();
+ builder->getTypeNameList(typeList);
builder = 0;
}
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimOverviewSequencer.cpp b/Utilities/otbossim/src/ossim/imaging/ossimOverviewSequencer.cpp
index 62a278e8897ef864bebd1648a23fd88b15769d57..15b1d691806e916f438ad2356fc76609b5450981 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimOverviewSequencer.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimOverviewSequencer.cpp
@@ -7,7 +7,7 @@
// Description: Sequencer for building overview files.
//
//----------------------------------------------------------------------------
-// $Id: ossimOverviewSequencer.cpp 15794 2009-10-23 12:30:26Z dburken $
+// $Id: ossimOverviewSequencer.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimOverviewSequencer.h>
#include <ossim/base/ossimNotify.h>
@@ -21,7 +21,7 @@
#ifdef OSSIM_ID_ENABLED
-static const char OSSIM_ID[] = "$Id: ossimOverviewSequencer.cpp 15794 2009-10-23 12:30:26Z dburken $";
+static const char OSSIM_ID[] = "$Id: ossimOverviewSequencer.cpp 15833 2009-10-29 01:41:53Z eshirschorn $";
#endif
static ossimTrace traceDebug("ossimOverviewSequencer:debug");
@@ -192,6 +192,18 @@ void ossimOverviewSequencer::setToStartOfSequence()
theCurrentTileNumber = 0;
}
+// ESH 08/2009: Adding support for non-sequential tile access, which is needed by the virtual image writer classes.
+ossim_uint32 ossimOverviewSequencer::getCurrentTileNumber() const
+{
+ return theCurrentTileNumber;
+}
+
+// ESH 08/2009: Adding support for non-sequential tile access, which is needed by the virtual image writer classes.
+void ossimOverviewSequencer::setCurrentTileNumber( ossim_uint32 tileNumber )
+{
+ theCurrentTileNumber = tileNumber;
+}
+
ossimRefPtr<ossimImageData> ossimOverviewSequencer::getNextTile()
{
if ( theDirtyFlag )
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimRgbGridRemapEngine.cpp b/Utilities/otbossim/src/ossim/imaging/ossimRgbGridRemapEngine.cpp
index a19cc76264857b07d96b140767dc5b7ea2e39418..2ce292330a76db6e6f204cbfe608761e86ce1538 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimRgbGridRemapEngine.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimRgbGridRemapEngine.cpp
@@ -14,7 +14,7 @@
// LIMITATIONS: None.
//
//*****************************************************************************
-// $Id: ossimRgbGridRemapEngine.cpp 9094 2006-06-13 19:12:40Z dburken $
+// $Id: ossimRgbGridRemapEngine.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimRgbGridRemapEngine.h>
@@ -166,7 +166,7 @@ void ossimRgbGridRemapEngine::assignRemapValues (
// Declare a 2D array that will contain all of the contributing sources'
// RGB mean values. Also declare the accumulator target vector.
//***
- int num_contributors = sources_list.size();
+ int num_contributors = (int)sources_list.size();
double** contributor_pixel = new double* [num_contributors];
for (i=0; i<num_contributors; i++)
contributor_pixel[i] = new double[3];
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimRgbImage.cpp b/Utilities/otbossim/src/ossim/imaging/ossimRgbImage.cpp
index 296abd0392a1cbf0154f461907a478c7bc1d576d..437db1b1a9f6b4c7473899229622337dd99448be 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimRgbImage.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimRgbImage.cpp
@@ -58,7 +58,7 @@
// END OF COPYRIGHT STATEMENT
//*************************************************************************
-// $Id: ossimRgbImage.cpp 12984 2008-06-04 01:26:24Z dburken $
+// $Id: ossimRgbImage.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <cstdlib>
#include <cmath>
@@ -978,7 +978,7 @@ void ossimRgbImage::drawPolygon(const std::vector<ossimIpt> &p)
{
return;
}
- int n = p.size();
+ int n = (int)p.size();
int i;
int lx, ly;
@@ -1005,7 +1005,7 @@ void ossimRgbImage::drawPolygon(const std::vector<ossimDpt> &p)
{
return;
}
- int n = p.size();
+ int n = (int)p.size();
int i;
double lx, ly;
@@ -1499,7 +1499,7 @@ void ossimRgbImage::drawFilledPolygon(const std::vector<ossimIpt> &p)
{
return;
}
- int n = p.size();
+ int n = (int)p.size();
int i;
int y;
int miny, maxy;
@@ -1589,7 +1589,7 @@ void ossimRgbImage::drawFilledPolygon(const std::vector<ossimDpt> &p)
{
return;
}
- int n = p.size();
+ int n = (int)p.size();
int i;
int y;
int miny, maxy;
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimSFIMFusion.cpp b/Utilities/otbossim/src/ossim/imaging/ossimSFIMFusion.cpp
index 7a5d300920af15ba283038c326f31c6c8dffd83e..ea85aef0e68915ced70c6aacbf9a2f46f1caa9ff 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimSFIMFusion.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimSFIMFusion.cpp
@@ -6,7 +6,7 @@
// Author: Garrett Potts
//
//*******************************************************************
-// $Id: ossimSFIMFusion.cpp 13371 2008-08-02 13:42:42Z gpotts $
+// $Id: ossimSFIMFusion.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimSFIMFusion.h>
#include <ossim/matrix/newmat.h>
#include <ossim/matrix/newmatio.h>
@@ -152,7 +152,7 @@ ossimRefPtr<ossimImageData> ossimSFIMFusion::getTile(const ossimIrect& rect,
bands[idx] = (ossim_float32*)normColorOutputData->getBuf(idx);
}
// double delta = 0.0;
- ossim_uint32 bandsSize = bands.size();
+ ossim_uint32 bandsSize = (ossim_uint32)bands.size();
double normMinPix = 0.0;
for(y = 0; y < h; ++y)
{
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimTiffTileSource.cpp b/Utilities/otbossim/src/ossim/imaging/ossimTiffTileSource.cpp
index 25d3622c708349a2c7ed59d376653144d91524be..8205112f385f16e85177c5aec4a5f443e0b1831d 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimTiffTileSource.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimTiffTileSource.cpp
@@ -12,7 +12,7 @@
// Contains class definition for TiffTileSource.
//
//*******************************************************************
-// $Id: ossimTiffTileSource.cpp 15825 2009-10-27 15:31:44Z dburken $
+// $Id: ossimTiffTileSource.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <cstdlib> /* for abs(int) */
#include <ossim/imaging/ossimTiffTileSource.h>
@@ -673,7 +673,11 @@ bool ossimTiffTileSource::open()
openValidVertices();
loadMetaData();
- initializeBuffers();
+ // ESH 05/2009 -- If memory allocations failed, then
+ // let's bail out of this driver and hope another one
+ // can handle the image ok. I.e. InitializeBuffers()
+ // was changed to return a boolean success/fail flag.
+ bool bSuccess = initializeBuffers();
if (traceDebug())
{
@@ -682,7 +686,7 @@ bool ossimTiffTileSource::open()
}
// Finished...
- return true;
+ return bSuccess;
}
ossim_uint32 ossimTiffTileSource::getNumberOfLines(
@@ -1641,6 +1645,7 @@ bool ossimTiffTileSource::allocateBuffer()
theBufferRect.makeNan();
theBufferRLevel = theCurrentDirectory;
+ bool bSuccess = true;
if (buffer_size != theBufferSize)
{
theBufferSize = buffer_size;
@@ -1648,10 +1653,33 @@ bool ossimTiffTileSource::allocateBuffer()
{
delete [] theBuffer;
}
- theBuffer = new ossim_uint8[buffer_size];
+
+ // ESH 05/2009 -- Fix for ticket #738:
+ // image_info crashing on aerial_ortho image during ingest
+ try
+ {
+ theBuffer = new ossim_uint8[buffer_size];
+ }
+ catch(...)
+ {
+ if (theBuffer)
+ {
+ delete [] theBuffer;
+ theBuffer = 0;
+ }
+
+ bSuccess = false;
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "ossimTiffTileSource::allocateBuffer WARN:"
+ << "\nNot enough memory: buffer_size: " << buffer_size
+ << endl;
+ }
+ }
}
- return true;
+ return bSuccess;
}
ossim_uint32 ossimTiffTileSource::getNumberOfDirectories() const
@@ -1867,7 +1895,7 @@ void ossimTiffTileSource::setReadMethod()
setTiffDirectory(0);
}
-void ossimTiffTileSource::initializeBuffers()
+bool ossimTiffTileSource::initializeBuffers()
{
if(theBuffer)
{
@@ -1892,7 +1920,7 @@ void ossimTiffTileSource::initializeBuffers()
theCurrentTileWidth = theTile->getWidth();
theCurrentTileHeight = theTile->getHeight();
- allocateBuffer();
+ return allocateBuffer();
}
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimTopographicCorrectionFilter.cpp b/Utilities/otbossim/src/ossim/imaging/ossimTopographicCorrectionFilter.cpp
index 282cc86848937b344bd6023ae1230ad740495cd9..3a92c3589e50fdbf4eeb1a9783e49de0d291354f 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimTopographicCorrectionFilter.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimTopographicCorrectionFilter.cpp
@@ -8,7 +8,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimTopographicCorrectionFilter.cpp 13312 2008-07-27 01:26:52Z gpotts $
+// $Id: ossimTopographicCorrectionFilter.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <algorithm>
#include <sstream>
#include <ossim/imaging/ossimTopographicCorrectionFilter.h>
@@ -169,7 +169,7 @@ void ossimTopographicCorrectionFilter::allocate()
int arraySize = theTile->getNumberOfBands();
if(theGain.size() > 0)
{
- arraySize = theGain.size();
+ arraySize = (int)theGain.size();
}
// we will do a non destructive resize onf the arrays
//
@@ -186,7 +186,7 @@ void ossimTopographicCorrectionFilter::allocate()
{
if(theBandMapping[idx] >= theBias.size())
{
- theBandMapping[idx] = theBias.size()-1;
+ theBandMapping[idx] = (unsigned int)theBias.size()-1;
}
}
else
@@ -853,7 +853,7 @@ void ossimTopographicCorrectionFilter::resizeArrays(ossim_uint32 newSize)
ossim_uint32 tempIdx = 0;
if(tempC.size() > 0 && (theC.size() > 0))
{
- int numberOfElements = ossim::min(tempC.size(),theC.size());
+ int numberOfElements = ossim::min((int)tempC.size(),(int)theC.size());
std::copy(tempC.begin(), tempC.begin()+numberOfElements,
theC.begin());
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimUsgsDemTileSource.cpp b/Utilities/otbossim/src/ossim/imaging/ossimUsgsDemTileSource.cpp
index 352ca6f39dcab0ac25656ef28732992cf800ceed..d5b6398583a7b8b35d94a01c5bb8091aba7a0e8f 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimUsgsDemTileSource.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimUsgsDemTileSource.cpp
@@ -9,7 +9,7 @@
// Contains class declaration for ossimUsgsDemTileSource.
//
//********************************************************************
-// $Id: ossimUsgsDemTileSource.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimUsgsDemTileSource.cpp 15837 2009-10-30 12:41:08Z dburken $
#include <iostream>
#include <fstream>
@@ -42,8 +42,8 @@ static const char USGS_DEM_KW[] = "usgs_dem";
ossimUsgsDemTileSource::ossimUsgsDemTileSource()
:
ossimImageHandler(),
- theDem(NULL),
- theTile(NULL),
+ theDem(0),
+ theTile(0),
theNullValue(0.0),
theMinHeight(0.0),
theMaxHeight(0.0),
@@ -59,9 +59,9 @@ ossimUsgsDemTileSource::~ossimUsgsDemTileSource()
if (theDem)
{
delete theDem;
- theDem = NULL;
+ theDem = 0;
}
- theTile = NULL;
+ theTile = 0;
}
ossimRefPtr<ossimImageData> ossimUsgsDemTileSource::getTile(
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimValueAssignImageSourceFilter.cpp b/Utilities/otbossim/src/ossim/imaging/ossimValueAssignImageSourceFilter.cpp
index e0df6bf1377dd1365dc85221caee1e9db8a93780..c310cbaef1971fbbf310b3512ef84de02588f79a 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimValueAssignImageSourceFilter.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimValueAssignImageSourceFilter.cpp
@@ -8,7 +8,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimValueAssignImageSourceFilter.cpp 9094 2006-06-13 19:12:40Z dburken $
+// $Id: ossimValueAssignImageSourceFilter.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimValueAssignImageSourceFilter.h>
#include <ossim/imaging/ossimImageData.h>
#include <ossim/imaging/ossimImageDataFactory.h>
@@ -135,8 +135,8 @@ void ossimValueAssignImageSourceFilter::validateArrays()
{
if(theOutputValueArray.size() != theInputValueArray.size())
{
- ossim_uint32 index = std::min(theOutputValueArray.size(),
- theInputValueArray.size());
+ ossim_uint32 index = std::min((ossim_uint32)theOutputValueArray.size(),
+ (ossim_uint32)theInputValueArray.size());
vector<double> copyVector(theOutputValueArray.begin(),
theOutputValueArray.begin() + index);
@@ -171,7 +171,7 @@ template <class T> void ossimValueAssignImageSourceFilter::executeAssignSeparate
ossimRefPtr<ossimImageData>& data)
{
ossim_uint32 numberOfBands = std::min((ossim_uint32)data->getNumberOfBands(),
- (ossim_uint32)theInputValueArray.size());
+ (ossim_uint32)theInputValueArray.size());
ossim_uint32 maxOffset = data->getWidth()*data->getHeight();
for(ossim_uint32 band = 0; band<numberOfBands; ++band)
@@ -195,7 +195,7 @@ template <class T> void ossimValueAssignImageSourceFilter::executeAssignGroup(
ossimRefPtr<ossimImageData>& data)
{
ossim_uint32 numberOfBands = std::min((ossim_uint32)data->getNumberOfBands(),
- (ossim_uint32)theInputValueArray.size());
+ (ossim_uint32)theInputValueArray.size());
ossim_uint32 maxOffset = data->getWidth()*data->getHeight();
ossim_uint32 band = 0;
bool equalFlag = false;
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimVertexExtractor.cpp b/Utilities/otbossim/src/ossim/imaging/ossimVertexExtractor.cpp
index 1bb7a4045e72818bb6a920a8e59d035ca66fe161..e2be39044d380b86fec0afb081c8d611cde8817d 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimVertexExtractor.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimVertexExtractor.cpp
@@ -6,7 +6,7 @@
// TR # 136 kminear Fix extractVertices method
//
//*************************************************************************
-// $Id: ossimVertexExtractor.cpp 9963 2006-11-28 21:11:01Z gpotts $
+// $Id: ossimVertexExtractor.cpp 15836 2009-10-30 12:29:09Z dburken $
#include <fstream>
using namespace std;
@@ -24,7 +24,7 @@ RTTI_DEF2(ossimVertexExtractor, "ossimVertexExtractor",
ossimVertexExtractor::ossimVertexExtractor(ossimImageSource* inputSource)
:
- ossimOutputSource(NULL, // owner
+ ossimOutputSource(0, // owner
1,
0,
true,
@@ -34,10 +34,10 @@ ossimVertexExtractor::ossimVertexExtractor(ossimImageSource* inputSource)
theFilename(ossimFilename::NIL),
theFileStream(),
theVertice(4),
- theLeftEdge(NULL),
- theRightEdge(NULL)
+ theLeftEdge(0),
+ theRightEdge(0)
{
- if (inputSource == NULL)
+ if (inputSource == 0)
{
ossimNotify(ossimNotifyLevel_WARN) << "ossimVertexExtractor::ossimVertexExtractor ERROR"
<< "\nNULL input image source passed to constructor!"
@@ -54,12 +54,12 @@ ossimVertexExtractor::~ossimVertexExtractor()
if (theLeftEdge)
{
delete [] theLeftEdge;
- theLeftEdge = NULL;
+ theLeftEdge = 0;
}
if (theRightEdge)
{
delete [] theRightEdge;
- theRightEdge = NULL;
+ theRightEdge = 0;
}
}
@@ -1797,12 +1797,12 @@ bool ossimVertexExtractor::extractVertices()
if (leftSlope)
{
delete [] leftSlope;
- leftSlope = NULL;
+ leftSlope = 0;
}
if (rightSlope)
{
delete [] rightSlope;
- rightSlope = NULL;
+ rightSlope = 0;
}
if(traceDebug())
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimVirtualImageHandler.cpp b/Utilities/otbossim/src/ossim/imaging/ossimVirtualImageHandler.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..6709b8a4ef8bfa4ef310e249c941ba5335220792
--- /dev/null
+++ b/Utilities/otbossim/src/ossim/imaging/ossimVirtualImageHandler.cpp
@@ -0,0 +1,1389 @@
+//*******************************************************************
+//
+// License: LGPL
+//
+// See LICENSE.txt file in the top level directory for more details.
+//
+// Author: Eric Hirschorn
+//
+// Description:
+//
+// Contains class definition for VirtualImageHandler.
+//
+//*******************************************************************
+// $Id: ossimVirtualImageHandler.cpp 14655 2009-06-05 11:58:56Z dburken $
+
+#include <xtiffio.h>
+#include <cstdlib> /* for abs(int) */
+#include <ossim/imaging/ossimVirtualImageHandler.h>
+#include <ossim/support_data/ossimGeoTiff.h>
+#include <ossim/base/ossimConstants.h>
+#include <ossim/base/ossimCommon.h>
+#include <ossim/base/ossimTrace.h>
+#include <ossim/base/ossimIpt.h>
+#include <ossim/base/ossimDpt.h>
+#include <ossim/base/ossimFilename.h>
+#include <ossim/base/ossimKeywordlist.h>
+#include <ossim/base/ossimKeywordNames.h>
+#include <ossim/base/ossimEllipsoid.h>
+#include <ossim/base/ossimDatum.h>
+#include <ossim/base/ossimBooleanProperty.h>
+#include <ossim/base/ossimStringProperty.h>
+#include <ossim/imaging/ossimImageDataFactory.h>
+#include <ossim/imaging/ossimTiffTileSource.h>
+
+RTTI_DEF1( ossimVirtualImageHandler, "ossimVirtualImageHandler", ossimImageHandler )
+
+static ossimTrace traceDebug( "ossimVirtualImageHandler:debug" );
+
+//*******************************************************************
+// Public Constructor:
+//*******************************************************************
+ossimVirtualImageHandler::ossimVirtualImageHandler()
+ :
+ ossimImageHandler(),
+ theBuffer(0),
+ theBufferSize(0),
+ theBufferRect(0, 0, 0, 0),
+ theNullBuffer(0),
+ theSampleFormatUnit(0),
+ theMaxSampleValue(0),
+ theMinSampleValue(0),
+ theBitsPerSample(0),
+ theBytesPerPixel(0),
+ theImageSubdirectory(""),
+ theCurrentFrameName(""),
+ theVirtualWriterType(""),
+ theMajorVersion(""),
+ theMinorVersion(""),
+ theCompressType(1),
+ theCompressQuality(75),
+ theOverviewFlag(false),
+ theOpenedFlag(false),
+ theR0isFullRes(false),
+ theEntryIndex(-1),
+ theResLevelStart(0),
+ theResLevelEnd(0),
+ theSamplesPerPixel(0),
+ theNumberOfResLevels(0),
+ thePlanarConfig(PLANARCONFIG_SEPARATE),
+ theScalarType(OSSIM_SCALAR_UNKNOWN),
+ theNumberOfFrames(0),
+ theReadMethod(READ_TILE),
+ theImageTileWidth(-1),
+ theImageTileLength(-1),
+ theImageFrameWidth(-1),
+ theImageFrameLength(-1),
+ theR0NumberOfLines(-1),
+ theR0NumberOfSamples(-1),
+ thePhotometric(PHOTOMETRIC_MINISBLACK),
+ theTif(0),
+ theTile(0),
+ theImageWidth(0),
+ theImageLength(0)
+{}
+
+ossimVirtualImageHandler::~ossimVirtualImageHandler()
+{
+ close();
+}
+
+bool ossimVirtualImageHandler::open( const ossimFilename& image_file )
+{
+ theImageFile = image_file;
+ return open();
+}
+
+void ossimVirtualImageHandler::close()
+{
+ theOpenedFlag = false;
+
+ theImageWidth.clear();
+ theImageLength.clear();
+
+ if (theBuffer)
+ {
+ delete [] theBuffer;
+ theBuffer = 0;
+ theBufferSize = 0;
+ }
+ if (theNullBuffer)
+ {
+ delete [] theNullBuffer;
+ theNullBuffer = 0;
+ }
+ ossimImageHandler::close();
+}
+
+bool ossimVirtualImageHandler::open()
+{
+ static const char MODULE[] = "ossimVirtualImageHandler::open";
+
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE << " Entered..."
+ << "\nFile: " << theImageFile.c_str() << std::endl;
+ }
+
+ if(isOpen())
+ {
+ close();
+ }
+
+ if ( theImageFile.empty() )
+ {
+ return false;
+ }
+ if ( theImageFile.isReadable() == false )
+ {
+ return false;
+ }
+
+ ossimKeywordlist header_kwl( theImageFile );
+
+ if ( header_kwl.getErrorStatus() == ossimErrorCodes::OSSIM_ERROR )
+ {
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << " Keywordlist open error detected." << endl;
+ }
+ return false;
+ }
+
+ theOpenedFlag = loadHeaderInfo( header_kwl ) && initializeBuffers();
+
+ return theOpenedFlag;
+}
+
+bool ossimVirtualImageHandler::openTiff( int resLevel, int row, int col )
+{
+ static const char* MODULE = "ossimVirtualImageHandler::openTiff";
+
+ closeTiff();
+
+ // Check for empty file name.
+ if (theImageFile.empty())
+ {
+ return false;
+ }
+
+ ossimString driveString;
+ ossimString pathString;
+ ossimString fileString;
+ ossimString extString;
+ theImageFile.split( driveString, pathString, fileString, extString );
+
+ // If the virtual image header filename is image.ovr, the current frame
+ // name is e.g. ./ossim-virtual-tiff/res0/row0/col0.tif
+
+ ossimFilename pathFName( pathString );
+ ossimFilename subdirFName1( "." );
+ ossimFilename subdirFName2( subdirFName1.dirCat(theImageSubdirectory) );
+ ossimFilename subdirFName3( subdirFName2.dirCat("res") );
+ subdirFName3.append( ossimString::toString( resLevel ) );
+ ossimFilename subdirFName4( subdirFName3.dirCat("row") );
+ subdirFName4.append( ossimString::toString( row ) );
+ ossimString newPathString( pathFName.dirCat( subdirFName4 ) );
+
+ ossimFilename driveFName( driveString );
+ ossimFilename newPathFName( newPathString );
+ ossimFilename newDirFName( driveFName.dirCat( newPathFName ) );
+
+ ossimString newFileString( "col" );
+ newFileString.append( ossimString::toString(col) );
+
+ ossimString newExtString( "tif" );
+
+ theCurrentFrameName.merge( driveString, newPathString, newFileString, newExtString );
+
+ // First we do a quick test to see if the file looks like a tiff file.
+ unsigned char header[2];
+
+ FILE* fp = fopen( theCurrentFrameName.c_str(), "rb" );
+ if ( fp == NULL )
+ return false;
+
+ fread( header, 2, 1, fp );
+ fclose( fp );
+
+ if( (header[0] != 'M' || header[1] != 'M')
+ && (header[0] != 'I' || header[1] != 'I') )
+ return false;
+
+ //---
+ // See if the file can be opened for reading.
+ //---
+ ossimString openMode = "rm";
+
+#ifdef OSSIM_HAS_GEOTIFF
+# if OSSIM_HAS_GEOTIFF
+ theTif = XTIFFOpen( theCurrentFrameName, openMode );
+# else
+ theTif = TIFFOpen( theCurrentFrameName, openMode );
+# endif
+#else
+ theTif = TIFFOpen( theCurrentFrameName, openMode );
+#endif
+
+ if ( !theTif )
+ {
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:\n"
+ << "could not open tiff file: "
+ << theCurrentFrameName
+ << std::endl;
+ }
+ return false;
+ }
+
+ return true;
+}
+
+bool ossimVirtualImageHandler::closeTiff()
+{
+ if ( theTif )
+ {
+#ifdef OSSIM_HAS_GEOTIFF
+# if OSSIM_HAS_GEOTIFF
+ XTIFFClose( theTif );
+# else
+ TIFFClose( theTif );
+# endif
+#else
+ TIFFClose( theTif );
+#endif
+ theTif = 0;
+ }
+
+ return true;
+}
+
+//*******************************************************************
+// Public method:
+//*******************************************************************
+bool ossimVirtualImageHandler::loadHeaderInfo( const ossimKeywordlist& kwl )
+{
+ static const char MODULE[] = "ossimVirtualImageHandler::loadHeaderInfo";
+
+ bool bRetVal = true;
+
+ // Virtual images currently can only have 1 entry.
+ ossimString lookupStr = kwl.find( ossimKeywordNames::NUMBER_ENTRIES_KW );
+ if ( lookupStr.empty() == false )
+ {
+ ossim_int16 numEntries = lookupStr.toInt16();
+ if ( numEntries != 1 )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << "\nERROR: Number of entries (" << numEntries << ") in virtual image header != 1."
+ << std::endl;
+
+ bRetVal = false;
+ }
+ else
+ {
+ std::vector<ossimString> keyList = kwl.findAllKeysThatContains(
+ ossimKeywordNames::ENTRY_KW );
+
+ int numKeys = (int)keyList.size();
+ if ( numKeys != 1 )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << "\nERROR: Number of entry lines (" << numKeys << ") in virtual image header != 1."
+ << std::endl;
+
+ bRetVal = false;
+ }
+ else
+ {
+ ossimString key = keyList[0];
+ ossimString lookupStr = kwl.find( key );
+ if ( lookupStr.empty() == false )
+ {
+ theEntryIndex = lookupStr.toInt16();
+ }
+ else
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << "\nERROR: No valid entries found in virtual image header."
+ << std::endl;
+
+ bRetVal = false;
+ }
+ }
+ }
+ }
+ else
+ {
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE
+ << "\nERROR: Number of entries not found in virtual image header."
+ << std::endl;
+ }
+
+ bRetVal = false;
+ }
+
+ if ( theEntryIndex > -1 )
+ {
+ ossimString prefix = "image";
+ prefix += ossimString::toString( theEntryIndex ) + ".";
+
+ loadGeometryKeywordEntry( kwl, prefix );
+ loadGeneralKeywordEntry ( kwl, prefix );
+ loadNativeKeywordEntry ( kwl, prefix );
+ }
+
+ return bRetVal;
+}
+
+void ossimVirtualImageHandler::loadNativeKeywordEntry( const ossimKeywordlist& kwl,
+ const ossimString& prefix )
+{
+ static const char MODULE[] = "ossimVirtualImageHandler::loadNativeKeywordEntry";
+
+ ossimString extPrefix = prefix + ossimString( "virtual" ) + ".";
+
+ ossimString lookupStr = kwl.find( extPrefix, "subdirectory" );
+ if ( lookupStr.empty() == false )
+ {
+ theImageSubdirectory = lookupStr;
+ }
+ lookupStr = kwl.find( extPrefix, "writer_type" );
+ if ( lookupStr.empty() == false )
+ {
+ theVirtualWriterType = lookupStr;
+ }
+ lookupStr = kwl.find( extPrefix, "frame_size_x" );
+ if ( lookupStr.empty() == false )
+ {
+ theImageFrameWidth = lookupStr.toInt32();
+ }
+ lookupStr = kwl.find( extPrefix, "frame_size_y" );
+ if ( lookupStr.empty() == false )
+ {
+ theImageFrameLength = lookupStr.toInt32();
+ }
+ lookupStr = kwl.find( extPrefix, "tile_size_x" );
+ if ( lookupStr.empty() == false )
+ {
+ theImageTileWidth = lookupStr.toInt32();
+ }
+ lookupStr = kwl.find( extPrefix, "tile_size_y" );
+ if ( lookupStr.empty() == false )
+ {
+ theImageTileLength = lookupStr.toInt32();
+ }
+ lookupStr = kwl.find( extPrefix, "version_major" );
+ if ( lookupStr.empty() == false )
+ {
+ theMajorVersion = lookupStr;
+ }
+ lookupStr = kwl.find( extPrefix, "version_minor" );
+ if ( lookupStr.empty() == false )
+ {
+ theMinorVersion = lookupStr;
+ }
+ lookupStr = kwl.find( extPrefix, "overview_flag" );
+ if ( lookupStr.empty() == false )
+ {
+ theOverviewFlag = lookupStr.toBool();
+ setStartingResLevel( theOverviewFlag ? 1 : 0 );
+ }
+ lookupStr = kwl.find( extPrefix, "includes_r0" );
+ if ( lookupStr.empty() == false )
+ {
+ theR0isFullRes = lookupStr.toBool();
+ }
+ lookupStr = kwl.find( extPrefix, "bits_per_sample" );
+ if ( lookupStr.empty() == false )
+ {
+ theBitsPerSample = lookupStr.toUInt16();
+ }
+ lookupStr = kwl.find( extPrefix, "bytes_per_pixel" );
+ if ( lookupStr.empty() == false )
+ {
+ theBytesPerPixel = lookupStr.toUInt32();
+ }
+ lookupStr = kwl.find( extPrefix, "resolution_level_starting" );
+ if ( lookupStr.empty() == false )
+ {
+ theResLevelStart = lookupStr.toUInt16();
+ }
+ lookupStr = kwl.find( extPrefix, "resolution_level_ending" );
+ if ( lookupStr.empty() == false )
+ {
+ theResLevelEnd = lookupStr.toUInt16();
+ }
+
+ // number of resolution levels available in the virtual image
+ theNumberOfResLevels = theResLevelEnd - theResLevelStart + 1;
+
+ theImageWidth.resize(theNumberOfResLevels);
+ theImageLength.resize(theNumberOfResLevels);
+ theNumberOfFrames.resize(theNumberOfResLevels);
+
+ extPrefix += ossimString( "resolution_level_" );
+
+ ossim_uint32 r;
+ ossim_uint32 d=0;
+ for ( r=theResLevelStart; r<=theResLevelEnd; ++r )
+ {
+ theImageWidth [d] = theR0NumberOfSamples >> r;
+ theImageLength[d] = theR0NumberOfLines >> r;
+
+ ossimString fullPrefix = extPrefix + ossimString::toString( r ) + ".";
+
+ ossimIpt nFrames;
+ lookupStr = kwl.find( fullPrefix, "number_of_frames_x" );
+ if ( lookupStr.empty() == false )
+ {
+ nFrames.x = lookupStr.toInt32();
+ }
+ lookupStr = kwl.find( fullPrefix, "number_of_frames_y" );
+ if ( lookupStr.empty() == false )
+ {
+ nFrames.y = lookupStr.toInt32();
+
+ }
+
+ theNumberOfFrames[d++] = nFrames;
+ }
+
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << "\nVirtual image information:"
+ << "\nSubdirectory for frames: " << theImageSubdirectory
+ << "\nWriter type: " << theVirtualWriterType
+ << "\nFrame size (x): " << theImageFrameWidth
+ << "\nFrame size (y): " << theImageFrameLength
+ << "\nTile size (x): " << theImageTileWidth
+ << "\nTile size (y): " << theImageTileLength
+ << "\nMajor version: " << theMajorVersion
+ << "\nMinor version: " << theMinorVersion
+ << "\nOverview flag (boolean): " << theOverviewFlag
+ << "\nStarting reduced res set: " << theResLevelStart
+ << "\nEnding reduced res sets: " << theResLevelEnd
+ << std::endl;
+
+ d=0;
+ for ( r=theResLevelStart; r<=theResLevelEnd; ++r )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "Number of frames[" << r << "].x: " << theNumberOfFrames[d].x
+ << "\nNumber of frames[" << r << "].y: " << theNumberOfFrames[d].y
+ << "\nVirtual image width[" << r << "]: " << theImageWidth[d]
+ << "\nVirtual image length[" << r << "]: " << theImageLength[d]
+ << std::endl;
+ ++d;
+ }
+ }
+}
+
+void ossimVirtualImageHandler::loadGeometryKeywordEntry( const ossimKeywordlist& kwl,
+ const ossimString& prefix )
+{
+ static const char MODULE[] = "ossimVirtualImageHandler::loadGeometryKeywordEntry";
+
+ ossimKeywordlist tempKwl(kwl);
+ tempKwl.stripPrefixFromAll( prefix );
+
+ const char* lookup = tempKwl.find(ossimKeywordNames::TYPE_KW);
+ if ( lookup )
+ {
+ if ( !theGeometry.get() )
+ {
+ // allocate an empty geometry if nothing present
+ theGeometry = new ossimImageGeometry();
+ }
+ theGeometry->loadState( tempKwl );
+ }
+ else
+ {
+ if ( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << "\nNo projection type found in: "
+ << theImageFile
+ << std::endl;
+ }
+ }
+}
+
+void ossimVirtualImageHandler::loadGeneralKeywordEntry( const ossimKeywordlist& kwl,
+ const ossimString& prefix )
+{
+ static const char MODULE[] = "ossimVirtualImageHandler::loadGeneralKeywordEntry";
+
+ /* Get the nul, min, max values, as a function of band index */
+ loadMetaData( kwl );
+
+ ossimString lookupStr = kwl.find( prefix, ossimKeywordNames::NUMBER_INPUT_BANDS_KW );
+ if ( lookupStr.empty() == false )
+ {
+ theSamplesPerPixel = lookupStr.toUInt16();
+
+ if( theSamplesPerPixel == 3 )
+ thePhotometric = PHOTOMETRIC_RGB;
+ else
+ thePhotometric = PHOTOMETRIC_MINISBLACK;
+ }
+
+ lookupStr = kwl.find( prefix, ossimKeywordNames::NUMBER_LINES_KW );
+ if ( lookupStr.empty() == false )
+ {
+ theR0NumberOfLines = lookupStr.toInt32();
+ }
+
+ lookupStr = kwl.find( prefix, ossimKeywordNames::NUMBER_SAMPLES_KW );
+ if ( lookupStr.empty() == false )
+ {
+ theR0NumberOfSamples = lookupStr.toInt32();
+ }
+
+ lookupStr = kwl.find( prefix, "radiometry" );
+ theScalarType = OSSIM_SCALAR_UNKNOWN;
+ if ( lookupStr.empty() == false )
+ {
+ if ( lookupStr.contains("8-bit") )
+ {
+ theScalarType = OSSIM_UINT8;
+ }
+ else
+ if ( lookupStr.contains("11-bit") )
+ {
+ theScalarType = OSSIM_USHORT11;
+ }
+ else
+ if ( lookupStr.contains("16-bit unsigned") )
+ {
+ theScalarType = OSSIM_UINT16;
+ }
+ else
+ if ( lookupStr.contains("16-bit signed") )
+ {
+ theScalarType = OSSIM_SINT16;
+ }
+ else
+ if ( lookupStr.contains("32-bit unsigned") )
+ {
+ theScalarType = OSSIM_UINT32;
+ }
+ else
+ if ( lookupStr.contains("float") )
+ {
+ theScalarType = OSSIM_FLOAT32;
+ }
+ else
+ if ( lookupStr.contains("normalized float") )
+ {
+ theScalarType = OSSIM_FLOAT32;
+ }
+ else
+ {
+ /* Do nothing */
+
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << "\nERROR: Unrecognized pixel scalar type description: "
+ << lookupStr
+ << std::endl;
+ }
+ }
+}
+
+void ossimVirtualImageHandler::loadMetaData( const ossimKeywordlist& kwl )
+{
+ theMetaData.clear();
+ theMetaData.loadState( kwl );
+}
+
+ossim_uint32 ossimVirtualImageHandler::getNumberOfLines( ossim_uint32 resLevel ) const
+{
+ ossim_uint32 result = 0;
+
+ if ( theOpenedFlag && isValidRLevel(resLevel) )
+ {
+ //---
+ // If we have r0 our reslevels are the same as the callers so
+ // no adjustment necessary.
+ //---
+ if ( !theStartingResLevel || theR0isFullRes ) // not an overview or has r0.
+ {
+ //---
+ // If we have r0 our reslevels are the same as the callers so
+ // no adjustment necessary.
+ //---
+ if (resLevel < theNumberOfResLevels)
+ {
+ result = theImageLength[resLevel];
+ }
+ }
+ else // this is an overview without r0
+ if (resLevel >= theStartingResLevel)
+ {
+ //---
+ // Adjust the level to be relative to the reader using this as
+ // overview.
+ //---
+ ossim_uint32 level = resLevel - theStartingResLevel;
+ if (level < theNumberOfResLevels)
+ {
+ result = theImageLength[level];
+ }
+ }
+ }
+ else
+ if ( resLevel < theStartingResLevel &&
+ theStartingResLevel > 0 &&
+ !theR0isFullRes &&
+ theNumberOfResLevels > 0 )
+ {
+ result = theImageLength[0] * (1<<(theStartingResLevel-resLevel));
+ }
+
+ return result;
+}
+
+ossim_uint32 ossimVirtualImageHandler::getNumberOfSamples( ossim_uint32 resLevel ) const
+{
+ ossim_uint32 result = 0;
+
+ if ( theOpenedFlag && isValidRLevel(resLevel) )
+ {
+ //---
+ // If we have r0 our reslevels are the same as the callers so
+ // no adjustment necessary.
+ //---
+ if ( !theStartingResLevel || theR0isFullRes ) // not an overview or has r0.
+ {
+ //---
+ // If we have r0 our reslevels are the same as the callers so
+ // no adjustment necessary.
+ //---
+ if (resLevel < theNumberOfResLevels)
+ {
+ result = theImageWidth[resLevel];
+ }
+ }
+ else // this is an overview without r0
+ if (resLevel >= theStartingResLevel)
+ {
+ //---
+ // Adjust the level to be relative to the reader using this as
+ // overview.
+ //---
+ ossim_uint32 level = resLevel - theStartingResLevel;
+ if (level < theNumberOfResLevels)
+ {
+ result = theImageWidth[level];
+ }
+ }
+ }
+ else
+ if ( resLevel < theStartingResLevel &&
+ theStartingResLevel > 0 &&
+ !theR0isFullRes &&
+ theNumberOfResLevels > 0 )
+ {
+ result = theImageWidth[0] * (1<<(theStartingResLevel-resLevel));
+ }
+
+ return result;
+}
+
+ossimIrect ossimVirtualImageHandler::getImageRectangle(ossim_uint32 resLevel) const
+{
+ ossimIrect result;
+
+ if( theOpenedFlag && isValidRLevel(resLevel) )
+ {
+ ossim_int32 lines = getNumberOfLines(resLevel);
+ ossim_int32 samples = getNumberOfSamples(resLevel);
+ if( !lines || !samples )
+ {
+ result.makeNan();
+ }
+ else
+ {
+ result = ossimIrect(0, 0, samples-1, lines-1);
+ }
+ }
+ else
+ if ( resLevel < theStartingResLevel &&
+ theStartingResLevel > 0 &&
+ !theR0isFullRes &&
+ theNumberOfResLevels > 0 )
+ {
+ ossim_uint32 scale = (1<<(theStartingResLevel-resLevel));
+ ossim_uint32 lines = theImageLength[0] * scale;
+ ossim_uint32 samples = theImageWidth[0] * scale;
+
+ result = ossimIrect(0, 0, samples-1, lines-1);
+ }
+ else
+ {
+ result.makeNan();
+ }
+
+ return result;
+}
+
+ossim_uint32 ossimVirtualImageHandler::getNumberOfDecimationLevels() const
+{
+ ossim_uint32 result = theNumberOfResLevels;
+
+ if ( theOverviewFlag && theR0isFullRes )
+ {
+ // Don't count r0.
+ --result;
+ }
+
+ return result;
+}
+
+//*******************************************************************
+// Public method:
+//*******************************************************************
+ossimScalarType ossimVirtualImageHandler::getOutputScalarType() const
+{
+ return theScalarType;
+}
+
+//*******************************************************************
+// Public method:
+//*******************************************************************
+ossim_uint32 ossimVirtualImageHandler::getTileWidth() const
+{
+ if( isOpen() )
+ {
+ return theImageTileWidth;
+ }
+
+ return 0;
+}
+
+//*******************************************************************
+// Public method:
+//*******************************************************************
+ossim_uint32 ossimVirtualImageHandler::getTileHeight() const
+{
+ if( isOpen() )
+ {
+ return theImageTileLength;
+ }
+
+ return 0;
+}
+
+//*******************************************************************
+// Public method:
+//*******************************************************************
+ossim_uint32 ossimVirtualImageHandler::getFrameWidth() const
+{
+ if( isOpen() )
+ {
+ return theImageFrameWidth;
+ }
+
+ return 0;
+}
+
+//*******************************************************************
+// Public method:
+//*******************************************************************
+ossim_uint32 ossimVirtualImageHandler::getFrameHeight() const
+{
+ if( isOpen() )
+ {
+ return theImageFrameLength;
+ }
+
+ return 0;
+}
+
+ossimRefPtr<ossimImageData> ossimVirtualImageHandler::getTile(
+ const ossimIrect& tile_rect, ossim_uint32 resLevel )
+{
+ if (theTile.valid())
+ {
+ // Image rectangle must be set prior to calling getTile.
+ theTile->setImageRectangle(tile_rect);
+
+ if ( getTile( *(theTile.get()), resLevel ) == false )
+ {
+ if (theTile->getDataObjectStatus() != OSSIM_NULL)
+ {
+ theTile->makeBlank();
+ }
+ }
+ }
+
+ theTile->setImageRectangle(tile_rect);
+ return theTile;
+}
+
+bool ossimVirtualImageHandler::getTile( ossimImageData& result,
+ ossim_uint32 resLevel )
+{
+ static const char MODULE[] ="ossimVirtualImageHandler::getTile(ossimImageData&,ossim_uint32)";
+
+ bool status = false;
+
+ //---
+ // Not open, this tile source bypassed, or invalid res level,
+ // return a blank tile.
+ //---
+ if( isOpen() && isSourceEnabled() && isValidRLevel(resLevel) )
+ {
+ ossimIrect tile_rect = result.getImageRectangle();
+
+ // This should be the zero base image rectangle for this res level.
+ ossimIrect image_rect = getImageRectangle(resLevel);
+
+ //---
+ // See if any point of the requested tile is in the image.
+ //---
+ if ( tile_rect.intersects(image_rect) )
+ {
+ // Initialize the tile if needed as we're going to stuff it.
+ if (result.getDataObjectStatus() == OSSIM_NULL)
+ {
+ result.initialize();
+ }
+
+ ossimIrect clip_rect = tile_rect.clipToRect(image_rect);
+
+ if ( !tile_rect.completely_within(clip_rect) )
+ {
+ //---
+ // We're not going to fill the whole tile so start with a
+ // blank tile.
+ //---
+ result.makeBlank();
+ }
+
+ // Load the tile buffer with data from the tif.
+ if ( loadTile( tile_rect, result, resLevel ) )
+ {
+ result.validate();
+ status = true;
+ }
+ else
+ {
+ // Would like to change this to throw ossimException.(drb)
+ status = false;
+ if(traceDebug())
+ {
+ // Error in filling buffer.
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << " Error filling buffer. Return status = false..."
+ << std::endl;
+ }
+ }
+ } // matches: if ( tile_rect.intersects(image_rect) )
+ else
+ {
+ // No part of requested tile within the image rectangle.
+ status = true; // Not an error.
+ result.makeBlank();
+ }
+
+ } // matches: if( isOpen() && isSourceEnabled() && isValidRLevel(resLevel) )
+
+ return status;
+}
+
+bool ossimVirtualImageHandler::loadTile( const ossimIrect& virtual_clip_rect,
+ ossimImageData& result,
+ ossim_uint32 resLevel )
+{
+ static const char MODULE[] = "ossimVirtualImageHandler::loadTile";
+
+ ossimInterleaveType type = ( thePlanarConfig == PLANARCONFIG_CONTIG ) ?
+ OSSIM_BIP : OSSIM_BIL;
+
+ ossimIpt tilesPerFrame = getNumberOfTilesPerFrame();
+
+ ossim_int32 tilesWide = tilesPerFrame.x;
+ ossim_int32 tilesHigh = tilesPerFrame.y;
+
+ ossim_int32 virtual_minx, virtual_miny, virtual_maxx, virtual_maxy;
+ virtual_clip_rect.getBounds( virtual_minx, virtual_miny,
+ virtual_maxx, virtual_maxy );
+
+ // Get the indices of the frame that contains the top-left corner
+ ossim_int32 rowFrameIdxI = virtual_miny / theImageFrameLength;
+ ossim_int32 colFrameIdxI = virtual_minx / theImageFrameWidth;
+
+ // Get the indices of the frame that contains the bottom-right corner
+ ossim_int32 rowFrameIdxF = virtual_maxy / theImageFrameLength;
+ ossim_int32 colFrameIdxF = virtual_maxx / theImageFrameWidth;
+
+ // Get the virtual line,sample of the frame origin
+ ossimIpt frame_shiftI( colFrameIdxI * theImageFrameWidth,
+ rowFrameIdxI * theImageFrameLength );
+
+ ossimIrect clip_rectI( virtual_clip_rect );
+ clip_rectI -= frame_shiftI;
+
+ result.setImageRectangle( clip_rectI );
+
+ //***
+ // Frame loop in the line (height) direction.
+ //***
+ ossim_int32 rowFrameIdx;
+ for( rowFrameIdx = rowFrameIdxI; rowFrameIdx <= rowFrameIdxF; ++rowFrameIdx )
+ {
+ // Origin of a tile within a single output frame.
+ ossimIpt originOF(0, 0);
+ originOF.y = (rowFrameIdx-rowFrameIdxI) * theImageFrameLength;
+
+ //***
+ // Frame loop in the sample (width) direction.
+ //***
+ ossim_int32 colFrameIdx;
+ for( colFrameIdx = colFrameIdxI; colFrameIdx <= colFrameIdxF; ++colFrameIdx )
+ {
+ originOF.x = (colFrameIdx-colFrameIdxI) * theImageFrameWidth;
+
+ // Open a single frame file for reading.
+ bool bOpenedTiff = openTiff( resLevel, rowFrameIdx, colFrameIdx );
+
+ //***
+ // Tile loop in the line direction.
+ //***
+ ossim_int32 iT;
+ for( iT = 0; iT < tilesHigh; ++iT )
+ {
+ // Origin of a tile within a single input frame.
+ ossimIpt originIF(0, 0);
+ originIF.y = iT * theImageTileLength;
+
+ //***
+ // Tile loop in the sample (width) direction.
+ //***
+ ossim_int32 jT;
+ for( jT = 0; jT < tilesWide; ++jT )
+ {
+ originIF.x = jT * theImageTileWidth;
+
+ ossimIrect tile_rectOF( originOF.x + originIF.x,
+ originOF.y + originIF.y,
+ originOF.x + originIF.x + theImageTileWidth - 1,
+ originOF.y + originIF.y + theImageTileLength - 1 );
+
+ if ( tile_rectOF.intersects(clip_rectI) )
+ {
+ ossimIrect tile_clip_rect = tile_rectOF.clipToRect(clip_rectI);
+
+ if ( thePlanarConfig == PLANARCONFIG_CONTIG )
+ {
+ if ( bOpenedTiff )
+ {
+ ossim_int32 tileSizeRead = TIFFReadTile( theTif,
+ theBuffer,
+ originIF.x,
+ originIF.y,
+ 0, 0 );
+ if ( tileSizeRead > 0 )
+ {
+ result.loadTile( theBuffer,
+ tile_rectOF,
+ tile_clip_rect,
+ type );
+ }
+ else
+ if( tileSizeRead < 0 )
+ {
+ if( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " Read Error!"
+ << "\nReturning error... " << endl;
+ }
+ theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
+ closeTiff();
+ return false;
+ }
+ }
+ else
+ {
+ // fill with NULLs
+ result.loadTile( theNullBuffer,
+ tile_rectOF,
+ tile_clip_rect,
+ type );
+ }
+ }
+ else
+ {
+ // band separate tiles...
+ for ( ossim_uint32 band=0; band<theSamplesPerPixel; ++band )
+ {
+ if ( bOpenedTiff )
+ {
+ ossim_int32 tileSizeRead = TIFFReadTile( theTif,
+ theBuffer,
+ originIF.x,
+ originIF.y,
+ 0,
+ band );
+ if ( tileSizeRead > 0 )
+ {
+ result.loadBand( theBuffer,
+ tile_rectOF,
+ tile_clip_rect,
+ band );
+ }
+ else
+ if ( tileSizeRead < 0 )
+ {
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " Read Error!"
+ << "\nReturning error... " << endl;
+ }
+ theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
+ closeTiff();
+ return false;
+ }
+ }
+ else
+ {
+ // fill with NULLs
+ result.loadBand( theNullBuffer,
+ tile_rectOF,
+ tile_clip_rect,
+ band );
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ // All done with the current frame file.
+ closeTiff();
+ return true;
+}
+
+ossimIpt ossimVirtualImageHandler::getNumberOfTilesPerFrame() const
+{
+ ossim_int32 frameSamples = theImageFrameWidth;
+ ossim_int32 frameLines = theImageFrameLength;
+
+ ossim_int32 tileSamples = theImageTileWidth;
+ ossim_int32 tileLines = theImageTileLength;
+
+ ossim_int32 tilesWide = (frameSamples % tileSamples) ?
+ (frameSamples / tileSamples) + 1 : (frameSamples / tileSamples);
+ ossim_int32 tilesHigh = (frameLines % tileLines) ?
+ (frameLines / tileLines) + 1 : (frameLines / tileLines);
+
+ return ossimIpt( tilesWide, tilesHigh );
+}
+
+bool ossimVirtualImageHandler::isValidRLevel( ossim_uint32 resLevel ) const
+{
+ bool result = false;
+
+ //---
+ // If we have r0 our reslevels are the same as the callers so
+ // no adjustment necessary.
+ //---
+ if ( !theStartingResLevel || theR0isFullRes) // Not an overview or has r0.
+ {
+ result = (resLevel < theNumberOfResLevels);
+ }
+ else if (resLevel >= theStartingResLevel) // Used as overview.
+ {
+ result = ( (resLevel - theStartingResLevel) < theNumberOfResLevels);
+ }
+
+ return result;
+}
+
+bool ossimVirtualImageHandler::allocateBuffer()
+{
+ //***
+ // Allocate memory for a buffer to hold data grabbed from the tiff file.
+ //***
+ ossim_uint32 buffer_size=0;
+ switch ( theReadMethod )
+ {
+ case READ_TILE:
+ if ( thePlanarConfig == PLANARCONFIG_CONTIG )
+ {
+ buffer_size = theImageTileWidth *
+ theImageTileLength *
+ theBytesPerPixel *
+ theSamplesPerPixel;
+ }
+ else
+ {
+ buffer_size = theImageTileWidth *
+ theImageTileLength *
+ theBytesPerPixel;
+ }
+ break;
+
+ case READ_RGBA_U8_TILE:
+ case READ_RGBA_U8_STRIP:
+ case READ_RGBA_U8A_STRIP:
+ case READ_SCAN_LINE:
+ default:
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "Read method not implemented!" << endl;
+ print(ossimNotify(ossimNotifyLevel_WARN));
+ return false;
+ }
+
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "ossimVirtualImageHandler::allocateBuffer DEBUG:"
+ << "\nbuffer_size: " << buffer_size
+ << endl;
+ }
+
+ theBufferRect.makeNan();
+
+ bool bSuccess = true;
+ if ( buffer_size != theBufferSize )
+ {
+ theBufferSize = buffer_size;
+ if ( theBuffer )
+ {
+ delete [] theBuffer;
+ }
+ if ( theNullBuffer )
+ {
+ delete [] theNullBuffer;
+ }
+
+ // ESH 05/2009 -- Fix for ticket #738:
+ // image_info crashing on aerial_ortho image during ingest
+ try
+ {
+ theBuffer = new ossim_uint8[buffer_size];
+ theNullBuffer = new ossim_uint8[buffer_size];
+ }
+ catch(...)
+ {
+ if ( theBuffer )
+ {
+ delete [] theBuffer;
+ theBuffer = 0;
+ }
+ if ( theNullBuffer )
+ {
+ delete [] theNullBuffer;
+ theNullBuffer = 0;
+ }
+
+ bSuccess = false;
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "ossimVirtualImageHandler::allocateBuffer WARN:"
+ << "\nNot enough memory: buffer_size: " << buffer_size
+ << endl;
+ }
+ }
+ }
+
+ // initialize the NULL buffer
+ ossim_uint32 b;
+ for ( b=0; b<buffer_size; ++b )
+ {
+ theNullBuffer[b] = 0;
+ }
+
+ return bSuccess;
+}
+
+ossim_uint32 ossimVirtualImageHandler::getImageTileWidth() const
+{
+ return theImageTileWidth;
+}
+
+ossim_uint32 ossimVirtualImageHandler::getImageTileHeight() const
+{
+ return theImageTileLength;
+}
+
+ossimString ossimVirtualImageHandler::getLongName() const
+{
+ return ossimString( "Virtual Image Handler" );
+}
+
+ossimString ossimVirtualImageHandler::getShortName() const
+{
+ return ossimString( "Virtual Image Handler" );
+}
+
+std::ostream& ossimVirtualImageHandler::print( std::ostream& os ) const
+{
+ //***
+ // Use a keyword format.
+ //***
+ os << "image_file: " << theImageFile
+ << "\nsamples_per_pixel: " << theSamplesPerPixel
+ << "\nbits_per_sample: " << theBitsPerSample
+ << "\nsample_format_unit: " << theSampleFormatUnit
+ << "\nmin_sample_value: " << theMinSampleValue
+ << "\nmax_sample_value: " << theMaxSampleValue
+ << "\ntheNumberOfResLevels: " << theNumberOfResLevels
+ << "\ntile_width: " << theImageTileWidth
+ << "\ntile_length: " << theImageTileLength
+ << "\nphotometric: " << thePhotometric
+ << "\nr0_is_full_res: " << theR0isFullRes;
+
+ for ( ossim_uint32 i=0; i<theNumberOfResLevels; ++i )
+ {
+ os << "\ndirectory[" << i << "]"
+ << "\nimage width: " << theImageWidth[i]
+ << "\nimage_length: " << theImageLength[i];
+ os << endl;
+ }
+
+ if ( theTile.valid() )
+ {
+ os << "\nOutput tile dump:\n" << *theTile << endl;
+ }
+
+ os << endl;
+
+ return ossimSource::print( os );
+}
+
+ossim_uint32 ossimVirtualImageHandler::getNumberOfInputBands() const
+{
+ return theSamplesPerPixel;
+}
+
+ossim_uint32 ossimVirtualImageHandler::getNumberOfOutputBands () const
+{
+ return getNumberOfInputBands();
+}
+
+bool ossimVirtualImageHandler::isOpen() const
+{
+ return theOpenedFlag;
+}
+
+bool ossimVirtualImageHandler::hasR0() const
+{
+ return theR0isFullRes;
+}
+
+double ossimVirtualImageHandler::getMinPixelValue( ossim_uint32 band ) const
+{
+ if( theMetaData.getNumberOfBands() )
+ {
+ return ossimImageHandler::getMinPixelValue( band );
+ }
+ return theMinSampleValue;
+}
+
+double ossimVirtualImageHandler::getMaxPixelValue( ossim_uint32 band ) const
+{
+ if( theMetaData.getNumberOfBands() )
+ {
+ return ossimImageHandler::getMaxPixelValue( band );
+ }
+ return theMaxSampleValue;
+}
+
+bool ossimVirtualImageHandler::initializeBuffers()
+{
+ if( theBuffer )
+ {
+ delete [] theBuffer;
+ theBuffer = 0;
+ }
+ if( theNullBuffer )
+ {
+ delete [] theNullBuffer;
+ theNullBuffer = 0;
+ }
+
+ ossimImageDataFactory* idf = ossimImageDataFactory::instance();
+
+ theTile = idf->create( this, this );
+
+ // The width and height must be set prior to call to allocateBuffer.
+ theTile->setWidth (theImageTileWidth);
+ theTile->setHeight(theImageTileLength);
+
+ //
+ // Tiles are constructed with no buffer storage. Call initialize for
+ // "theTile" to allocate memory. Leave "theBlankTile" with a
+ // ossimDataObjectStatus of OSSIM_NULL since no data will ever be
+ // stuffed in it.
+ //
+ theTile->initialize();
+
+ return allocateBuffer();
+}
+
+
+void ossimVirtualImageHandler::setProperty( ossimRefPtr<ossimProperty> property )
+{
+ if( !property.valid() )
+ {
+ return;
+ }
+
+ ossimImageHandler::setProperty( property );
+}
+
+ossimRefPtr<ossimProperty> ossimVirtualImageHandler::getProperty( const ossimString& name )const
+{
+ if( name == "file_type" )
+ {
+ return new ossimStringProperty( name, "TIFF" );
+ }
+
+ return ossimImageHandler::getProperty( name );
+}
+
+void ossimVirtualImageHandler::getPropertyNames( std::vector<ossimString>& propertyNames )const
+{
+ ossimImageHandler::getPropertyNames( propertyNames );
+ propertyNames.push_back( "file_type" );
+}
+
+void ossimVirtualImageHandler::validateMinMax()
+{
+ double tempNull = ossim::defaultNull( theScalarType );
+ double tempMax = ossim::defaultMax ( theScalarType );
+ double tempMin = ossim::defaultMin ( theScalarType );
+
+ if( ( theMinSampleValue == tempNull ) || ossim::isnan( theMinSampleValue ) )
+ {
+ theMinSampleValue = tempMin;
+ }
+ if( ( theMaxSampleValue == tempNull ) || ossim::isnan( theMaxSampleValue ) )
+ {
+ theMaxSampleValue = tempMax;
+ }
+}
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimVirtualImageTiffWriter.cpp b/Utilities/otbossim/src/ossim/imaging/ossimVirtualImageTiffWriter.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..f6e9f707b0c7e729088fe6cf0c974b364a6a51a5
--- /dev/null
+++ b/Utilities/otbossim/src/ossim/imaging/ossimVirtualImageTiffWriter.cpp
@@ -0,0 +1,1779 @@
+//*******************************************************************
+//
+// License: LGPL
+//
+// See LICENSE.txt file in the top level directory for more details.
+//
+// Author: Eric Hirschorn
+//
+//*******************************************************************
+// $Id: ossimVirtualImageTiffWriter.cpp 11971 2007-11-01 16:44:19Z gpotts $
+
+#include <algorithm>
+#include <sstream>
+
+#include <tiffio.h>
+#include <xtiffio.h>
+
+#include <ossim/ossimConfig.h>
+#include <ossim/init/ossimInit.h>
+#include <ossim/base/ossimTrace.h>
+#include <ossim/base/ossimStdOutProgress.h>
+#include <ossim/base/ossimScalarTypeLut.h>
+#include <ossim/parallel/ossimMpi.h>
+#include <ossim/parallel/ossimMpiMasterOverviewSequencer.h>
+#include <ossim/parallel/ossimMpiSlaveOverviewSequencer.h>
+#include <ossim/projection/ossimMapProjection.h>
+#include <ossim/projection/ossimProjectionFactoryRegistry.h>
+#include <ossim/support_data/ossimGeoTiff.h>
+#include <ossim/imaging/ossimImageHandler.h>
+#include <ossim/imaging/ossimImageHandlerRegistry.h>
+#include <ossim/imaging/ossimOverviewSequencer.h>
+#include <ossim/imaging/ossimImageSourceSequencer.h>
+#include <ossim/imaging/ossimCibCadrgTileSource.h>
+#include <ossim/imaging/ossimVirtualImageTiffWriter.h>
+
+static ossimTrace traceDebug("ossimVirtualImageTiffWriter:debug");
+
+static const long DEFAULT_COMPRESS_QUALITY = 75;
+
+RTTI_DEF1( ossimVirtualImageTiffWriter, "ossimVirtualImageTiffWriter", ossimVirtualImageWriter );
+
+#ifdef OSSIM_ID_ENABLED
+static const char OSSIM_ID[] = "$Id: ossimVirtualImageTiffWriter.cpp 11971 2007-11-01 16:44:19Z gpotts $";
+#endif
+
+ossimVirtualImageTiffWriter::ossimVirtualImageTiffWriter( const ossimFilename& file,
+ ossimImageHandler* inputSource,
+ bool overviewFlag )
+ :
+ ossimVirtualImageWriter( file, inputSource, overviewFlag ),
+ theTif(0),
+ theProjectionInfo(0),
+ theCurrentFrameName(""),
+ theCurrentFrameNameTmp("")
+{
+ static const char* MODULE = "ossimVirtualImageTiffWriter::ossimVirtualImageTiffWriter";
+
+ theOutputSubdirectory = "_cache";
+ theVirtualWriterType = "ossim-virtual-tiff"; // this is fixed.
+ theMinorVersion = "1.00"; // for derived writers to set uniquely
+
+ if ( theOutputFile == ossimFilename::NIL )
+ {
+ initializeOutputFilenamFromHandler();
+ }
+ else
+ {
+ // Temporary header file used to help build Rn for n>1.
+ theOutputFileTmp = theOutputFile + ".tmp";
+ }
+
+ ossimString driveString;
+ ossimString pathString;
+ ossimString fileString;
+ ossimString extString;
+ theOutputFile.split( driveString, pathString, fileString, extString );
+
+ theOutputSubdirectory = fileString + theOutputSubdirectory;
+
+ theOutputImageType = "tiff_tiled_band_separate";
+#ifdef OSSIM_ID_ENABLED /* to quell unused variable warning. */
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)<< "OSSIM_ID: " << OSSIM_ID << endl;
+ }
+#endif
+
+ switch( theImageHandler->getOutputScalarType() )
+ {
+ case OSSIM_UINT8:
+ theBitsPerSample = 8;
+ theBytesPerPixel = 1;
+ theSampleFormat = SAMPLEFORMAT_UINT;
+ break;
+
+ case OSSIM_USHORT11:
+ case OSSIM_UINT16:
+ theBitsPerSample = 16;
+ theBytesPerPixel = 2;
+ theSampleFormat = SAMPLEFORMAT_UINT;
+ break;
+
+ case OSSIM_SINT16:
+ theBitsPerSample = 16;
+ theBytesPerPixel = 2;
+ theSampleFormat = SAMPLEFORMAT_INT;
+ break;
+
+ case OSSIM_UINT32:
+ theBitsPerSample = 32;
+ theBytesPerPixel = 4;
+ theSampleFormat = SAMPLEFORMAT_UINT;
+ break;
+
+ case OSSIM_FLOAT32:
+ theBitsPerSample = 32;
+ theBytesPerPixel = 4;
+ theSampleFormat = SAMPLEFORMAT_IEEEFP;
+ break;
+
+ case OSSIM_NORMALIZED_DOUBLE:
+ case OSSIM_FLOAT64:
+ theBitsPerSample = 64;
+ theBytesPerPixel = 8;
+ theSampleFormat = SAMPLEFORMAT_IEEEFP;
+ break;
+
+ default:
+ {
+ // Set the error...
+ theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
+
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nUnknown pixel type: "
+ << ( ossimScalarTypeLut::instance()->getEntryString( theImageHandler->getOutputScalarType() ) )
+ << std::endl;
+
+ ossimSetError( getClassName(),
+ ossimErrorCodes::OSSIM_ERROR,
+ "Unknown pixel type!",
+ __FILE__,
+ __LINE__ );
+ }
+ break;
+ }
+}
+
+ossimVirtualImageTiffWriter::~ossimVirtualImageTiffWriter()
+{
+}
+
+bool ossimVirtualImageTiffWriter::openTiff( int resLevel, int row, int col )
+{
+ static const char* MODULE = "ossimVirtualImageTiffWriter::openTiff";
+
+ if ( theTif ) // Close the existing file pointer.
+ {
+#ifdef OSSIM_HAS_GEOTIFF
+# if OSSIM_HAS_GEOTIFF
+ XTIFFClose( theTif );
+# else
+ TIFFClose( theTif );
+# endif
+#else
+ TIFFClose( theTif );
+#endif
+ }
+
+ // Check for empty file name.
+ if (theOutputFile.empty())
+ {
+ return false;
+ }
+
+ ossimString driveString;
+ ossimString pathString;
+ ossimString fileString;
+ ossimString extString;
+ theOutputFile.split( driveString, pathString, fileString, extString );
+
+ // If the virtual image header filename is image.ovr, the current frame
+ // name is e.g. ./ossim-virtual-tiff/res0/row0/col0.tif
+
+ ossimFilename pathFName( pathString );
+ ossimFilename subdirFName1( "." );
+ ossimFilename subdirFName2( subdirFName1.dirCat(theOutputSubdirectory) );
+ ossimFilename subdirFName3( subdirFName2.dirCat("res") );
+ subdirFName3.append( ossimString::toString( resLevel ) );
+ ossimFilename subdirFName4( subdirFName3.dirCat("row") );
+ subdirFName4.append( ossimString::toString( row ) );
+ ossimString newPathString( pathFName.dirCat( subdirFName4 ) );
+
+ ossimFilename driveFName( driveString );
+ ossimFilename newPathFName( newPathString );
+ ossimFilename newDirFName( driveFName.dirCat( newPathFName ) );
+ newDirFName.createDirectory(true);
+
+ ossimString newFileString( "col" );
+ newFileString.append( ossimString::toString(col) );
+
+ ossimString newExtString( "tif" );
+
+ theCurrentFrameName.merge( driveString, newPathString, newFileString, newExtString );
+
+ theCurrentFrameNameTmp = theCurrentFrameName + ".tmp";
+
+ ossim_uint64 fourGigs = (static_cast<ossim_uint64>(1024)*
+ static_cast<ossim_uint64>(1024)*
+ static_cast<ossim_uint64>(1024)*
+ static_cast<ossim_uint64>(4));
+ ossimIrect bounds = theInputConnection->getBoundingRect();
+ ossim_uint64 byteCheck = (static_cast<ossim_uint64>(bounds.width())*
+ static_cast<ossim_uint64>(bounds.height())*
+ static_cast<ossim_uint64>(theInputConnection->getNumberOfOutputBands())*
+ static_cast<ossim_uint64>(ossim::scalarSizeInBytes(theInputConnection->getOutputScalarType())));
+ ossimString openMode = "w";
+ if( (byteCheck * static_cast<ossim_uint64>(2)) > fourGigs )
+ {
+ openMode += "8";
+ }
+
+ //---
+ // See if the file can be opened for writing.
+ // Note: If this file existed previously it will be overwritten.
+ //---
+
+#ifdef OSSIM_HAS_GEOTIFF
+# if OSSIM_HAS_GEOTIFF
+ theTif = XTIFFOpen( theCurrentFrameNameTmp, openMode );
+# else
+ theTif = TIFFOpen( theCurrentFrameNameTmp, openMode );
+# endif
+#else
+ theTif = TIFFOpen( theCurrentFrameNameTmp, openMode );
+#endif
+
+ if ( !theTif )
+ {
+ setErrorStatus(); // base class
+ ossimSetError( getClassName().c_str(),
+ ossimErrorCodes::OSSIM_ERROR,
+ "File %s line %d Module %s Error:\n Error opening file: %s\n",
+ __FILE__,
+ __LINE__,
+ MODULE,
+ theCurrentFrameNameTmp.c_str() );
+
+ return false;
+ }
+ return true;
+}
+
+bool ossimVirtualImageTiffWriter::closeTiff()
+{
+ if ( theTif )
+ {
+#ifdef OSSIM_HAS_GEOTIFF
+# if OSSIM_HAS_GEOTIFF
+ XTIFFClose( theTif );
+# else
+ TIFFClose( theTif );
+# endif
+#else
+ TIFFClose( theTif );
+#endif
+ theTif = 0;
+ }
+
+ return true;
+}
+
+// Flush the currently open tiff file
+void ossimVirtualImageTiffWriter::flushTiff()
+{
+ if(theTif)
+ {
+ TIFFFlush(theTif);
+ }
+}
+
+// Rename the currently open tiff file
+void ossimVirtualImageTiffWriter::renameTiff()
+{
+ theCurrentFrameNameTmp.rename( theCurrentFrameName );
+ if(traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_INFO)
+ << "Wrote file: " << theCurrentFrameName.c_str() << std::endl;
+ }
+}
+
+ossimIpt ossimVirtualImageTiffWriter::getOutputTileSize()const
+{
+ return theOutputTileSize;
+}
+
+void ossimVirtualImageTiffWriter::setOutputTileSize( const ossimIpt& tileSize )
+{
+ if ( (tileSize.x % 16) || (tileSize.y % 16) )
+ {
+ if(traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "ossimVirtualImageTiffWriter::changeTileSize ERROR:"
+ << "\nTile size must be a multiple of 32!"
+ << "\nSize remains: " << theOutputTileSize
+ << std::endl;
+ }
+ return;
+ }
+
+ ossimVirtualImageWriter::setOutputTileSize( tileSize );
+}
+
+void ossimVirtualImageTiffWriter::setCompressionType( const ossimString& type )
+{
+ if( type == "jpeg" )
+ {
+ theCompressType = COMPRESSION_JPEG;
+ }
+ else
+ if( type == "lzw" )
+ {
+ theCompressType = COMPRESSION_LZW;
+ }
+ else
+ if( type == "deflate" )
+ {
+ theCompressType = COMPRESSION_DEFLATE;
+ }
+ else
+ if( type == "packbits" )
+ {
+ theCompressType = COMPRESSION_PACKBITS;
+ }
+ else
+ {
+ theCompressType = COMPRESSION_NONE;
+ if (traceDebug())
+ {
+ ossimSetError( getClassName(),
+ ossimErrorCodes::OSSIM_WARNING,
+ "ossimVirtualImageTiffWriter::setCompressionType\nfile %s line %d\n\
+ Unsupported compression type: %d Defaulting to none.",
+ __FILE__,
+ __LINE__,
+ theCompressType );
+ }
+ }
+}
+
+void ossimVirtualImageTiffWriter::setCompressionQuality( ossim_int32 quality )
+{
+ if ( quality > 1 && quality < 101 )
+ {
+ theCompressQuality = quality;
+ }
+ else
+ {
+ theCompressQuality = DEFAULT_COMPRESS_QUALITY;
+
+ if (traceDebug())
+ {
+ ossimSetError( getClassName(),
+ ossimErrorCodes::OSSIM_WARNING,
+ "\
+ ossimVirtualImageTiffWriter::setCompressionQuality\n%s file %s \
+ line %d Compression quality of %d is out of range!\nis out of range!\n\
+ Range is 100 to 1. Current quality set to default of 75.",
+ __FILE__,
+ __LINE__,
+ quality );
+ }
+ }
+}
+
+ossimString ossimVirtualImageTiffWriter::getOverviewType(
+ ossimFilterResampler::ossimFilterResamplerType resamplerType )
+{
+ ossimString overviewType("unknown");
+
+ if ( resamplerType == ossimFilterResampler::ossimFilterResampler_NEAREST_NEIGHBOR )
+ {
+ overviewType = "ossim_virtual_tiff_nearest";
+ }
+ else
+ {
+ overviewType = "ossim_virtual_tiff_box";
+ }
+
+ return overviewType;
+}
+
+ossimFilterResampler::ossimFilterResamplerType
+ ossimVirtualImageTiffWriter::getResamplerType( const ossimString& type )
+{
+ ossimFilterResampler::ossimFilterResamplerType resamplerType =
+ ossimFilterResampler::ossimFilterResampler_NEAREST_NEIGHBOR;
+
+ if (type == "ossim_virtual_tiff_nearest")
+ {
+ resamplerType =
+ ossimFilterResampler::ossimFilterResampler_NEAREST_NEIGHBOR;
+
+ }
+ else
+ if (type == "ossim_virtual_tiff_box")
+ {
+ resamplerType = ossimFilterResampler::ossimFilterResampler_BOX;
+ }
+
+ return resamplerType;
+}
+
+bool ossimVirtualImageTiffWriter::isOverviewTypeHandled( const ossimString& type )
+{
+ bool bIsHandled = false;
+ if (type == "ossim_virtual_tiff_nearest")
+ {
+ bIsHandled = true;
+ }
+ else
+ if (type == "ossim_virtual_tiff_box")
+ {
+ bIsHandled = true;
+ }
+
+ return bIsHandled;
+}
+
+void ossimVirtualImageTiffWriter::getTypeNameList(
+ std::vector<ossimString>& typeList )
+{
+ typeList.push_back( ossimString("ossim_virtual_tiff_box") );
+ typeList.push_back( ossimString("ossim_virtual_tiff_nearest") );
+}
+
+bool ossimVirtualImageTiffWriter::writeR0Partial()
+{
+ static const char MODULE[] = "ossimVirtualImageBuilder::writeR0Partial";
+
+ ossim_int32 numberOfFrames = getNumberOfBuiltFrames( 0, true ); // Frames per image
+
+ ossimIpt tilesPerFrame = getNumberOfTilesPerOutputFrame();
+ ossim_int32 tilesWide = tilesPerFrame.x;
+ ossim_int32 tilesHigh = tilesPerFrame.y;
+
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE << " DEBUG:"
+ << "\nresolution level : " << 0
+ << "\ntiles per frame (horz) : " << tilesWide
+ << "\ntiles per frame (vert) : " << tilesHigh
+ << "\nframes per image (total): " << numberOfFrames
+ << std::endl;
+ }
+
+ setProcessStatus(ossimProcessInterface::PROCESS_STATUS_EXECUTING);
+ setPercentComplete(0.0);
+
+ setCurrentMessage(ossimString("Copying r0..."));
+
+ ossim_int32 frameNumber = 0;
+ std::vector<ossimIpt> ossimIptList;
+ bool bIsFrameAlreadyDone = false;
+
+ ossim_uint32 nQ = (ossim_uint32)theInputFrameInfoQueue.size();
+ ossim_uint32 idxQ;
+ for ( idxQ=0; idxQ<nQ; ++idxQ )
+ {
+ InputFrameInfo* pInfo = theInputFrameInfoQueue[idxQ];
+ if ( pInfo && pInfo->isValid() )
+ {
+ //***
+ // Frame loop in the line (height) direction.
+ //***
+ ossim_int32 iF;
+ ossim_int32 yRangeMin = pInfo->yRangeMin[0];
+ ossim_int32 yRangeMax = pInfo->yRangeMax[0];
+ for( iF = yRangeMin; iF <= yRangeMax; ++iF )
+ {
+ // Origin of a frame with respect to the entire image.
+ ossimIpt originI(0, 0);
+ originI.y = iF * theOutputFrameSize.y;
+
+ //***
+ // Frame loop in the sample (width) direction.
+ //***
+ ossim_int32 jF;
+ ossim_int32 xRangeMin = pInfo->xRangeMin[0];
+ ossim_int32 xRangeMax = pInfo->xRangeMax[0];
+ for( jF = xRangeMin; jF <= xRangeMax; ++jF )
+ {
+ // Add check here to see if (jF,iF) has already been processed for
+ // a previous input frame in the queue.
+ bIsFrameAlreadyDone = isFrameAlreadyDone( idxQ, 0, jF, iF );
+
+ if ( bIsFrameAlreadyDone == false )
+ {
+ originI.x = jF * theOutputFrameSize.x;
+
+ // Only create an output image frame if data is found
+ // in the input image to write to it. E.g. if the input image
+ // is RPF, there can be missing input frames.
+ bool bCreatedFrame = false;
+
+ ossimIptList.clear();
+
+ ossim_int32 tileNumber = 0;
+
+ //***
+ // Tile loop in the line direction.
+ //***
+ ossim_int32 iT;
+ for( iT = 0; iT < tilesHigh; ++iT )
+ {
+ // Origin of a tile within a single output frame.
+ ossimIpt originF(0, 0);
+ originF.y = iT * theOutputTileSize.y;
+
+ //***
+ // Tile loop in the sample (width) direction.
+ //***
+ ossim_int32 jT;
+ for( jT = 0; jT < tilesWide; ++jT )
+ {
+ originF.x = jT * theOutputTileSize.x;
+
+ // Origin of a tile with respect to the entire image.
+ ossimIpt originT(originI);
+ originT += originF;
+
+ ossimRefPtr<ossimImageData> t =
+ theImageHandler->getTile( ossimIrect( originT.x,
+ originT.y,
+ originT.x + (theOutputTileSize.x-1),
+ originT.y + (theOutputTileSize.y-1) ) );
+
+ ossimDataObjectStatus doStatus = t->getDataObjectStatus();
+ if ( t.valid() &&
+ (doStatus == OSSIM_PARTIAL || doStatus == OSSIM_FULL) )
+ {
+ if ( bCreatedFrame == false )
+ {
+ // Open a single frame file.
+ openTiff( 0, iF, jF );
+
+ ossimIrect rect( originI.x,
+ originI.y,
+ originI.x + theOutputFrameSize.x-1,
+ originI.y + theOutputFrameSize.y-1 );
+
+ if ( !setTags( 0, rect ) )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << "\nError writing tags!" << std::endl;
+ closeTiff();
+ return false;
+ }
+ if ( 1 )
+ {
+ ossimDrect areaOfInterest(rect);
+ ossimRefPtr<ossimMapProjectionInfo> projInfo =
+ new ossimMapProjectionInfo( theInputMapProjection,
+ areaOfInterest );
+ ossimGeoTiff::writeTags( theTif, projInfo );
+ }
+
+ bCreatedFrame = true;
+ }
+
+ uint32 band;
+ for ( band=0; band<theImageHandler->getNumberOfInputBands(); ++band )
+ {
+ // Grab a pointer to the tile for the band.
+ tdata_t data = static_cast<tdata_t>(t->getBuf(band));
+
+ // Write the tile.
+ int bytesWritten = 0;
+ bytesWritten = TIFFWriteTile( theTif,
+ data,
+ originF.x,
+ originF.y,
+ 0, // z
+ band ); // sample
+
+ if ( bytesWritten != theTileSizeInBytes )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nError returned writing tiff tile: " << tileNumber
+ << " of frame: " << frameNumber
+ << "\nExpected bytes written: " << theTileSizeInBytes
+ << "\nBytes written: " << bytesWritten
+ << std::endl;
+ theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
+ closeTiff();
+ return false;
+ }
+ }
+ }
+ else
+ {
+ if ( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE << " DEBUG:"
+ << "\nNo data found for tiff tile: " << tileNumber
+ << " of frame: " << frameNumber
+ << std::endl;
+ }
+
+ ossimIptList.push_back( originF );
+ }
+
+ ++tileNumber;
+
+ } // End of tile loop in the sample (width) direction.
+
+ } // End of tile loop in the line (height) direction.
+
+ // Write NULL data into partially occupied output frame.
+ if ( bCreatedFrame == true )
+ {
+ tdata_t data = static_cast<tdata_t>(&(theNullDataBuffer.front()));
+ ossim_uint32 numIpts = (ossim_uint32)ossimIptList.size();
+ ossim_uint32 i;
+ for ( i=0; i<numIpts; ++i )
+ {
+ ossimIpt originF = ossimIptList[i];
+
+ uint32 band;
+ for ( band=0; band<theImageHandler->getNumberOfInputBands(); ++band )
+ {
+ // Write the tile.
+ int bytesWritten = 0;
+ bytesWritten = TIFFWriteTile( theTif,
+ data,
+ originF.x,
+ originF.y,
+ 0, // z
+ band ); // sample
+
+ if ( bytesWritten != theTileSizeInBytes )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nError returned writing tiff frame: " << frameNumber
+ << "\nExpected bytes written: " << theTileSizeInBytes
+ << "\nBytes written: " << bytesWritten
+ << std::endl;
+ theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
+ closeTiff();
+ return false;
+ }
+ }
+ }
+
+ // Close and rename the new frame file.
+ closeTiff();
+ renameTiff();
+ }
+
+ ++frameNumber;
+
+ } // is frame already done check
+
+ } // End of frame loop in the sample (width) direction.
+
+ if (needsAborting())
+ {
+ setPercentComplete(100.0);
+ return true;
+ }
+ else
+ if ( bIsFrameAlreadyDone == false )
+ {
+ double frame = frameNumber;
+ setPercentComplete(frame / numberOfFrames * 100.0);
+ }
+
+ } // End of frame loop in the line (height) direction.
+
+ } // End of pInfo NULL check
+
+ } // End of queue loop
+
+ return true;
+}
+
+bool ossimVirtualImageTiffWriter::writeR0Full()
+{
+ static const char MODULE[] = "ossimVirtualImageBuilder::writeR0Full";
+
+ ossimIpt framesPerImage = getNumberOfOutputFrames();
+ ossim_int32 framesWide = framesPerImage.x;
+ ossim_int32 framesHigh = framesPerImage.y;
+ ossim_int32 numberOfFrames = framesWide * framesHigh; // Frames per image
+
+ ossimIpt tilesPerFrame = getNumberOfTilesPerOutputFrame();
+ ossim_int32 tilesWide = tilesPerFrame.x;
+ ossim_int32 tilesHigh = tilesPerFrame.y;
+
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE << " DEBUG:"
+ << "\ntiles per frame (horz) : " << tilesWide
+ << "\ntiles per frame (vert) : " << tilesHigh
+ << "\nframes per image (horz) : " << framesWide
+ << "\nframes per image (vert) : " << framesHigh
+ << "\nframes per image (total): " << numberOfFrames
+ << std::endl;
+ }
+
+ setProcessStatus(ossimProcessInterface::PROCESS_STATUS_EXECUTING);
+ setPercentComplete(0.0);
+
+ setCurrentMessage(ossimString("Copying r0..."));
+
+ ossim_int32 frameNumber = 0;
+ std::vector<ossimIpt> ossimIptList;
+
+ //***
+ // Frame loop in the line (height) direction.
+ //***
+ ossim_int32 iF;
+ for( iF = 0; iF < framesHigh; ++iF )
+ {
+ // Origin of a frame with respect to the entire image.
+ ossimIpt originI(0, 0);
+ originI.y = iF * theOutputFrameSize.y;
+
+ //***
+ // Frame loop in the sample (width) direction.
+ //***
+ ossim_int32 jF;
+ for( jF = 0; jF < framesWide; ++jF )
+ {
+ originI.x = jF * theOutputFrameSize.x;
+
+ // Only create an output image frame if data is found
+ // in the input image to write to it. E.g. if the input image
+ // is RPF, there can be missing input frames.
+ bool bCreatedFrame = false;
+
+ ossimIptList.clear();
+
+ ossim_int32 tileNumber = 0;
+
+ //***
+ // Tile loop in the line direction.
+ //***
+ ossim_int32 iT;
+ for( iT = 0; iT < tilesHigh; ++iT )
+ {
+ // Origin of a tile within a single output frame.
+ ossimIpt originF(0, 0);
+ originF.y = iT * theOutputTileSize.y;
+
+ //***
+ // Tile loop in the sample (width) direction.
+ //***
+ ossim_int32 jT;
+ for( jT = 0; jT < tilesWide; ++jT )
+ {
+ originF.x = jT * theOutputTileSize.x;
+
+ // Origin of a tile with respect to the entire image.
+ ossimIpt originT(originI);
+ originT += originF;
+
+ ossimRefPtr<ossimImageData> t =
+ theImageHandler->getTile( ossimIrect( originT.x,
+ originT.y,
+ originT.x + (theOutputTileSize.x-1),
+ originT.y + (theOutputTileSize.y-1) ) );
+
+ ossimDataObjectStatus doStatus = t->getDataObjectStatus();
+ if ( t.valid() &&
+ (doStatus == OSSIM_PARTIAL || doStatus == OSSIM_FULL) )
+ {
+ if ( bCreatedFrame == false )
+ {
+ // Open a single frame file.
+ openTiff( 0, iF, jF );
+
+ ossimIrect rect( originI.x,
+ originI.y,
+ originI.x + theOutputFrameSize.x-1,
+ originI.y + theOutputFrameSize.y-1 );
+
+ if ( !setTags( 0, rect ) )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << "\nError writing tags!" << std::endl;
+ closeTiff();
+ return false;
+ }
+ if ( 1 )
+ {
+ ossimDrect areaOfInterest(rect);
+ ossimRefPtr<ossimMapProjectionInfo> projInfo =
+ new ossimMapProjectionInfo( theInputMapProjection, areaOfInterest );
+ ossimGeoTiff::writeTags( theTif, projInfo );
+ }
+
+ bCreatedFrame = true;
+ }
+
+ uint32 band;
+ for ( band=0; band<theImageHandler->getNumberOfInputBands(); ++band )
+ {
+ // Grab a pointer to the tile for the band.
+ tdata_t data = static_cast<tdata_t>(t->getBuf(band));
+
+ // Write the tile.
+ int bytesWritten = 0;
+ bytesWritten = TIFFWriteTile( theTif,
+ data,
+ originF.x,
+ originF.y,
+ 0, // z
+ band ); // sample
+
+ if ( bytesWritten != theTileSizeInBytes )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nError returned writing tiff tile: " << tileNumber
+ << " of frame: " << frameNumber
+ << "\nExpected bytes written: " << theTileSizeInBytes
+ << "\nBytes written: " << bytesWritten
+ << std::endl;
+ theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
+ closeTiff();
+ return false;
+ }
+ }
+ }
+ else
+ {
+ if ( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE << " DEBUG:"
+ << "\nNo data found for tiff tile: " << tileNumber
+ << " of frame: " << frameNumber
+ << std::endl;
+ }
+
+ ossimIptList.push_back( originF );
+ }
+
+ ++tileNumber;
+
+ } // End of tile loop in the sample (width) direction.
+
+ } // End of tile loop in the line (height) direction.
+
+ // Write NULL data into partially occupied output frame.
+ if ( bCreatedFrame == true )
+ {
+ tdata_t data = static_cast<tdata_t>(&(theNullDataBuffer.front()));
+ ossim_uint32 numIpts = (ossim_uint32)ossimIptList.size();
+ ossim_uint32 i;
+ for ( i=0; i<numIpts; ++i )
+ {
+ ossimIpt originF = ossimIptList[i];
+
+ uint32 band;
+ for ( band=0; band<theImageHandler->getNumberOfInputBands(); ++band )
+ {
+ // Write the tile.
+ int bytesWritten = 0;
+ bytesWritten = TIFFWriteTile( theTif,
+ data,
+ originF.x,
+ originF.y,
+ 0, // z
+ band ); // sample
+
+ if ( bytesWritten != theTileSizeInBytes )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nError returned writing tiff frame: " << frameNumber
+ << "\nExpected bytes written: " << theTileSizeInBytes
+ << "\nBytes written: " << bytesWritten
+ << std::endl;
+ theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
+ closeTiff();
+ return false;
+ }
+ }
+ }
+
+ // Close and rename the new frame file.
+ closeTiff();
+ renameTiff();
+ }
+
+ ++frameNumber;
+
+ } // End of frame loop in the sample (width) direction.
+
+ if (needsAborting())
+ {
+ setPercentComplete(100.0);
+ break;
+ }
+ else
+ {
+ double frame = frameNumber;
+ setPercentComplete(frame / numberOfFrames * 100.0);
+ }
+
+ } // End of frame loop in the line (height) direction.
+
+ return true;
+}
+
+bool ossimVirtualImageTiffWriter::writeRnPartial( ossim_uint32 resLevel )
+{
+ static const char MODULE[] = "ossimVirtualImageTiffWriter::writeRnPartial";
+
+ if ( resLevel == 0 )
+ {
+ return false;
+ }
+
+ ossimRefPtr<ossimImageHandler> imageHandler;
+
+ //---
+ // If we copied r0 to the virtual image use it instead of the
+ // original image handler as it is probably faster.
+ //---
+ if ( resLevel <= theImageHandler->getNumberOfDecimationLevels() )
+ {
+ imageHandler = theImageHandler.get();
+ }
+ else
+ {
+ imageHandler = ossimImageHandlerRegistry::instance()->open( theOutputFileTmp );
+ if ( !imageHandler.valid() )
+ {
+ // Set the error...
+ ossimSetError( getClassName(),
+ ossimErrorCodes::OSSIM_OPEN_FILE_ERROR,
+ "%s file %s line %d\nCannot open file: %s",
+ MODULE,
+ __FILE__,
+ __LINE__,
+ theOutputFileTmp.c_str() );
+ return false;
+ }
+ }
+
+ // If the image handler was created in this member function,
+ // make sure we delete it on return.
+ bool bLocalImageHandler = (theImageHandler.get() != imageHandler.get());
+
+ //---
+ // Set up the sequencer. This will be one of three depending on if we're
+ // running mpi and if we are a master process or a slave process.
+ //---
+ ossimRefPtr<ossimOverviewSequencer> sequencer;
+
+ if( ossimMpi::instance()->getNumberOfProcessors() > 1 )
+ {
+ if ( ossimMpi::instance()->getRank() == 0 )
+ {
+ sequencer = new ossimMpiMasterOverviewSequencer();
+ }
+ else
+ {
+ sequencer = new ossimMpiSlaveOverviewSequencer();
+ }
+ }
+ else
+ {
+ sequencer = new ossimOverviewSequencer();
+ }
+
+ sequencer->setImageHandler( imageHandler.get() );
+
+ //---
+ // If the source image had built in overviews then we must subtract from the
+ // resLevel given to the sequencer or it will get the wrong image rectangle
+ // for the area of interest.
+ //---
+ ossim_uint32 sourceResLevel = ( bLocalImageHandler == false ) ?
+ resLevel - 1 :
+ resLevel - theImageHandler->getNumberOfDecimationLevels();
+
+ sequencer->setSourceLevel( sourceResLevel );
+ sequencer->setResampleType( theResampleType );
+ sequencer->setTileSize( ossimIpt( theOutputTileSize.x, theOutputTileSize.y ) );
+ sequencer->initialize();
+
+ // If we are a slave process start the resampling of tiles.
+ if ( ossimMpi::instance()->getRank() != 0 )
+ {
+ sequencer->slaveProcessTiles();
+ if ( bLocalImageHandler == true )
+ {
+ imageHandler = 0;
+ }
+ return true;
+ }
+
+ //---
+ // The rest of the method on master node only.
+ //---
+
+ setProcessStatus( ossimProcessInterface::PROCESS_STATUS_EXECUTING );
+ setPercentComplete( 0.0 );
+
+ ostringstream os;
+ os << "creating r" << resLevel << "...";
+ setCurrentMessage( os.str() );
+
+ ossim_int32 numberOfFrames = getNumberOfBuiltFrames( resLevel, true ); // partial build
+
+ ossimIpt tilesPerFrame = getNumberOfTilesPerOutputFrame(); // resLevel independent
+ ossim_int32 tilesWide = tilesPerFrame.x;
+ ossim_int32 tilesHigh = tilesPerFrame.y;
+
+ ossimIpt tilesPerImage = getNumberOfOutputTiles( resLevel ); // assumes full build
+ ossim_int32 tilesWideAcrossImage = tilesPerImage.x;
+ ossim_int32 tilesHighAcrossImage = tilesPerImage.y;
+
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE << " DEBUG:"
+ << "\nresolution level : " << resLevel
+ << "\ntiles per frame (horz) : " << tilesWide
+ << "\ntiles per frame (vert) : " << tilesHigh
+ << "\nframes per image (total): " << numberOfFrames
+ << std::endl;
+ }
+
+ ossim_int32 frameNumber = 0;
+ std::vector<ossimIpt> ossimIptList;
+ bool bIsFrameAlreadyDone = false;
+
+ ossim_uint32 nQ = (ossim_uint32)theInputFrameInfoQueue.size();
+ ossim_uint32 idxQ;
+ for ( idxQ=0; idxQ<nQ; ++idxQ )
+ {
+ InputFrameInfo* pInfo = theInputFrameInfoQueue[idxQ];
+ if ( pInfo && pInfo->isValid(resLevel) )
+ {
+ //***
+ // Frame loop in the line (height) direction.
+ //***
+ ossim_int32 iF;
+ ossim_int32 yRangeMin = pInfo->yRangeMin[resLevel];
+ ossim_int32 yRangeMax = pInfo->yRangeMax[resLevel];
+ for( iF = yRangeMin; iF <= yRangeMax; ++iF )
+ {
+ // Origin of a frame with respect to the entire image.
+ ossimIpt originI(0, 0);
+ originI.y = iF * theOutputFrameSize.y;
+
+ //***
+ // Frame loop in the sample (width) direction.
+ //***
+ ossim_int32 jF;
+ ossim_int32 xRangeMin = pInfo->xRangeMin[resLevel];
+ ossim_int32 xRangeMax = pInfo->xRangeMax[resLevel];
+ for( jF = xRangeMin; jF <= xRangeMax; ++jF )
+ {
+ // Add check here to see if (jF,iF) has already been processed for
+ // a previous input frame in the queue for this resolution level.
+ bIsFrameAlreadyDone = isFrameAlreadyDone( idxQ, resLevel, jF, iF );
+
+ if ( bIsFrameAlreadyDone == false )
+ {
+ originI.x = jF * theOutputFrameSize.x;
+
+ // Only create an output image frame if data is found
+ // in the input image to write to it. E.g. if the input image
+ // is RPF, there can be missing input frames.
+ bool bCreatedFrame = false;
+
+ ossimIptList.clear();
+
+ //***
+ // Tile loop in the line direction.
+ //***
+ ossim_int32 iT;
+ for( iT = 0; iT < tilesHigh; ++iT )
+ {
+ // Origin of a tile within a single output frame.
+ ossimIpt originF(0, 0);
+ originF.y = iT * theOutputTileSize.y;
+
+ //***
+ // Tile loop in the sample (width) direction.
+ //***
+ ossim_int32 jT;
+ for( jT = 0; jT < tilesWide; ++jT )
+ {
+ originF.x = jT * theOutputTileSize.x;
+
+ // tile index with respect to the image at resLevel
+ ossim_int32 iI = iF * tilesHigh + iT;
+ ossim_int32 jI = jF * tilesWide + jT;
+
+ ossim_uint32 tileNumber = -1;
+ ossimRefPtr<ossimImageData> t;
+ bool bWritingImageData = false;
+ if ( iI < tilesHighAcrossImage && jI < tilesWideAcrossImage )
+ {
+ tileNumber = iI * tilesWideAcrossImage + jI;
+
+ // Grab the resampled tile.
+ sequencer->setCurrentTileNumber( tileNumber );
+ t = sequencer->getNextTile();
+
+ ossimDataObjectStatus doStatus = t->getDataObjectStatus();
+ if ( t.valid() &&
+ (doStatus == OSSIM_PARTIAL || doStatus == OSSIM_FULL) )
+ {
+ bWritingImageData = true;
+
+ if ( bCreatedFrame == false )
+ {
+ // Open a single frame file.
+ openTiff( resLevel, iF, jF );
+
+ ossimIrect bounding_area( originI.x,
+ originI.y,
+ originI.x + theOutputFrameSize.x - 1,
+ originI.y + theOutputFrameSize.y - 1 );
+
+ if ( !setTags( resLevel, bounding_area ) )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << "\nError writing tags!" << std::endl;
+ closeTiff();
+ if ( bLocalImageHandler == true )
+ {
+ imageHandler = 0;
+ }
+ return false;
+ }
+ if ( 1 )
+ {
+ ossim_uint32 pixelSizeScale = (ossim_uint32)(1<<resLevel);
+
+ // Rescale pixel size based on the resolution level.
+ ossimDpt degPerPix = theInputMapProjection->getDecimalDegreesPerPixel();
+ ossimDpt degPerPixScaled = degPerPix * pixelSizeScale;
+
+ theInputMapProjection->setDecimalDegreesPerPixel( degPerPixScaled );
+
+ ossimDrect areaOfInterest(bounding_area);
+ ossimRefPtr<ossimMapProjectionInfo> projInfo =
+ new ossimMapProjectionInfo( theInputMapProjection,
+ areaOfInterest );
+ ossimGeoTiff::writeTags( theTif, projInfo );
+
+ // reset to resLevel 0 value
+ theInputMapProjection->setDecimalDegreesPerPixel( degPerPix );
+ }
+
+ bCreatedFrame = true;
+ }
+
+ uint32 band;
+ for ( band=0; band<theImageHandler->getNumberOfInputBands(); ++band )
+ {
+ // Grab a pointer to the tile for the band.
+ tdata_t data = static_cast<tdata_t>(t->getBuf(band));
+
+ int bytesWritten = TIFFWriteTile( theTif,
+ data,
+ originF.x,
+ originF.y,
+ 0, // z
+ band ); // sample
+
+ if ( bytesWritten != theTileSizeInBytes )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nError returned writing tiff tile: " << tileNumber
+ << " of frame: " << frameNumber
+ << "\nExpected bytes written: " << theTileSizeInBytes
+ << "\nBytes written: " << bytesWritten
+ << std::endl;
+ theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
+ closeTiff();
+ if ( bLocalImageHandler == true )
+ {
+ imageHandler = 0;
+ }
+ return false;
+ }
+ }
+ }
+ }
+ else
+ if ( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE << " DEBUG:"
+ << "\nNo data found for tiff tile: " << tileNumber
+ << " of frame: " << frameNumber
+ << std::endl;
+ }
+
+ if ( bWritingImageData == false )
+ {
+ ossimIptList.push_back( originF );
+ }
+
+ } // End of tile loop in the sample (width) direction.
+
+ } // End of tile loop in the line (height) direction.
+
+ // Write NULL data into partially occupied output frame.
+ if ( bCreatedFrame == true )
+ {
+ tdata_t data = static_cast<tdata_t>(&(theNullDataBuffer.front()));
+ ossim_uint32 numIpts = (ossim_uint32)ossimIptList.size();
+ ossim_uint32 i;
+ for ( i=0; i<numIpts; ++i )
+ {
+ ossimIpt originF = ossimIptList[i];
+
+ uint32 band;
+ for ( band=0; band<theImageHandler->getNumberOfInputBands(); ++band )
+ {
+ int bytesWritten = TIFFWriteTile( theTif,
+ data,
+ originF.x,
+ originF.y,
+ 0, // z
+ band ); // sample
+
+ if ( bytesWritten != theTileSizeInBytes )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nError returned writing tiff frame: " << frameNumber
+ << "\nExpected bytes written: " << theTileSizeInBytes
+ << "\nBytes written: " << bytesWritten
+ << std::endl;
+ theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
+ closeTiff();
+ if ( bLocalImageHandler == true )
+ {
+ imageHandler = 0;
+ }
+ return false;
+ }
+ }
+ }
+
+ // Close and rename the new frame file.
+ closeTiff();
+ renameTiff();
+ }
+
+ ++frameNumber;
+
+ } // is output frame already done check
+
+ } // End of frame loop in the sample (width) direction.
+
+ if (needsAborting())
+ {
+ setPercentComplete(100.0);
+ if ( bLocalImageHandler == true )
+ {
+ imageHandler = 0;
+ }
+ return true;
+ }
+ else
+ if ( bIsFrameAlreadyDone == false )
+ {
+ double frame = frameNumber;
+ setPercentComplete(frame / numberOfFrames * 100.0);
+ }
+
+ } // End of frame loop in the line (height) direction.
+
+ } // End of pInfo NULL check
+
+ } // End of queue loop
+
+ if ( bLocalImageHandler == true )
+ {
+ imageHandler = 0;
+ }
+
+ return true;
+}
+
+bool ossimVirtualImageTiffWriter::writeRnFull( ossim_uint32 resLevel )
+{
+ static const char MODULE[] = "ossimVirtualImageTiffWriter::writeRnFull";
+
+ if ( resLevel == 0 )
+ {
+ return false;
+ }
+
+ ossimRefPtr<ossimImageHandler> imageHandler;
+
+ //---
+ // If we copied r0 to the virtual image use it instead of the
+ // original image handler as it is probably faster.
+ //---
+ if ( resLevel <= theImageHandler->getNumberOfDecimationLevels() )
+ {
+ imageHandler = theImageHandler.get();
+ }
+ else
+ {
+ imageHandler = ossimImageHandlerRegistry::instance()->open( theOutputFileTmp );
+ if ( !imageHandler.valid() )
+ {
+ // Set the error...
+ ossimSetError( getClassName(),
+ ossimErrorCodes::OSSIM_OPEN_FILE_ERROR,
+ "%s file %s line %d\nCannot open file: %s",
+ MODULE,
+ __FILE__,
+ __LINE__,
+ theOutputFileTmp.c_str() );
+ return false;
+ }
+ }
+
+ // If the image handler was created in this member function,
+ // make sure we delete it on return.
+ bool bLocalImageHandler = (theImageHandler.get() != imageHandler.get());
+
+ //---
+ // Set up the sequencer. This will be one of three depending on if we're
+ // running mpi and if we are a master process or a slave process.
+ //---
+ ossimRefPtr<ossimOverviewSequencer> sequencer;
+
+ if( ossimMpi::instance()->getNumberOfProcessors() > 1 )
+ {
+ if ( ossimMpi::instance()->getRank() == 0 )
+ {
+ sequencer = new ossimMpiMasterOverviewSequencer();
+ }
+ else
+ {
+ sequencer = new ossimMpiSlaveOverviewSequencer();
+ }
+ }
+ else
+ {
+ sequencer = new ossimOverviewSequencer();
+ }
+
+ sequencer->setImageHandler( imageHandler.get() );
+
+ //---
+ // If the source image had built in overviews then we must subtract from the
+ // resLevel given to the sequencer or it will get the wrong image rectangle
+ // for the area of interest.
+ //---
+ ossim_uint32 sourceResLevel = ( bLocalImageHandler == false ) ?
+ resLevel - 1 :
+ resLevel - theImageHandler->getNumberOfDecimationLevels();
+
+ sequencer->setSourceLevel( sourceResLevel );
+ sequencer->setResampleType( theResampleType );
+ sequencer->setTileSize( ossimIpt( theOutputTileSize.x, theOutputTileSize.y ) );
+ sequencer->initialize();
+
+ // If we are a slave process start the resampling of tiles.
+ if ( ossimMpi::instance()->getRank() != 0 )
+ {
+ sequencer->slaveProcessTiles();
+ if ( bLocalImageHandler == true )
+ {
+ imageHandler = 0;
+ }
+ return true;
+ }
+
+ //---
+ // The rest of the method on master node only.
+ //---
+
+ setProcessStatus( ossimProcessInterface::PROCESS_STATUS_EXECUTING );
+ setPercentComplete( 0.0 );
+
+ ostringstream os;
+ os << "creating r" << resLevel << "...";
+ setCurrentMessage( os.str() );
+
+ ossimIpt framesPerImage = getNumberOfOutputFrames( resLevel ); // full build
+ ossim_int32 framesWide = framesPerImage.x;
+ ossim_int32 framesHigh = framesPerImage.y;
+ ossim_int32 numberOfFrames = framesWide * framesHigh; // Frames per image
+
+ ossimIpt tilesPerFrame = getNumberOfTilesPerOutputFrame(); // resLevel independent
+ ossim_int32 tilesWide = tilesPerFrame.x;
+ ossim_int32 tilesHigh = tilesPerFrame.y;
+
+ ossimIpt tilesPerImage = getNumberOfOutputTiles( resLevel ); // assumes full build
+ ossim_int32 tilesWideAcrossImage = tilesPerImage.x;
+ ossim_int32 tilesHighAcrossImage = tilesPerImage.y;
+
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE << " DEBUG:"
+ << "\nresolution level : " << resLevel
+ << "\ntiles per frame (horz) : " << tilesWide
+ << "\ntiles per frame (vert) : " << tilesHigh
+ << "\nframes per image (horz) : " << framesWide
+ << "\nframes per image (vert) : " << framesHigh
+ << "\nframes per image (total): " << numberOfFrames
+ << std::endl;
+ }
+
+ ossim_int32 frameNumber = 0;
+ std::vector<ossimIpt> ossimIptList;
+
+ //***
+ // Frame loop in the line (height) direction.
+ //***
+ ossim_int32 iF;
+ for( iF = 0; iF < framesHigh; ++iF )
+ {
+ // Origin of a frame with respect to the entire image.
+ ossimIpt originI(0, 0);
+ originI.y = iF * theOutputFrameSize.y;
+
+ //***
+ // Frame loop in the sample (width) direction.
+ //***
+ ossim_int32 jF;
+ for( jF = 0; jF < framesWide; ++jF )
+ {
+ originI.x = jF * theOutputFrameSize.x;
+
+ // Only create an output image frame if data is found
+ // in the input image to write to it. E.g. if the input image
+ // is RPF, there can be missing input frames.
+ bool bCreatedFrame = false;
+
+ ossimIptList.clear();
+
+ //***
+ // Tile loop in the line direction.
+ //***
+ ossim_int32 iT;
+ for( iT = 0; iT < tilesHigh; ++iT )
+ {
+ // Origin of a tile within a single output frame.
+ ossimIpt originF(0, 0);
+ originF.y = iT * theOutputTileSize.y;
+
+ //***
+ // Tile loop in the sample (width) direction.
+ //***
+ ossim_int32 jT;
+ for( jT = 0; jT < tilesWide; ++jT )
+ {
+ originF.x = jT * theOutputTileSize.x;
+
+ // tile index with respect to the image at resLevel
+ ossim_int32 iI = iF * tilesHigh + iT;
+ ossim_int32 jI = jF * tilesWide + jT;
+
+ ossim_uint32 tileNumber = -1;
+ ossimRefPtr<ossimImageData> t;
+ bool bWritingImageData = false;
+ if ( iI < tilesHighAcrossImage && jI < tilesWideAcrossImage )
+ {
+ tileNumber = iI * tilesWideAcrossImage + jI;
+
+ // Grab the resampled tile.
+ sequencer->setCurrentTileNumber( tileNumber );
+ t = sequencer->getNextTile();
+
+ ossimDataObjectStatus doStatus = t->getDataObjectStatus();
+ if ( t.valid() &&
+ (doStatus == OSSIM_PARTIAL || doStatus == OSSIM_FULL) )
+ {
+ bWritingImageData = true;
+
+ if ( bCreatedFrame == false )
+ {
+ // Open a single frame file.
+ openTiff( resLevel, iF, jF );
+
+ ossimIrect bounding_area( originI.x,
+ originI.y,
+ originI.x + theOutputFrameSize.x - 1,
+ originI.y + theOutputFrameSize.y - 1 );
+
+ if ( !setTags( resLevel, bounding_area ) )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << "\nError writing tags!" << std::endl;
+ closeTiff();
+ if ( bLocalImageHandler == true )
+ {
+ imageHandler = 0;
+ }
+ return false;
+ }
+ if ( 1 )
+ {
+ ossim_uint32 pixelSizeScale = (ossim_uint32)(1<<resLevel);
+
+ // Rescale pixel size based on the resolution level.
+ ossimDpt degPerPix = theInputMapProjection->getDecimalDegreesPerPixel();
+ ossimDpt degPerPixScaled = degPerPix * pixelSizeScale;
+
+ theInputMapProjection->setDecimalDegreesPerPixel( degPerPixScaled );
+
+ ossimDrect areaOfInterest(bounding_area);
+ ossimRefPtr<ossimMapProjectionInfo> projInfo =
+ new ossimMapProjectionInfo( theInputMapProjection,
+ areaOfInterest );
+ ossimGeoTiff::writeTags( theTif, projInfo );
+
+ // reset to resLevel 0 value
+ theInputMapProjection->setDecimalDegreesPerPixel( degPerPix );
+ }
+
+ bCreatedFrame = true;
+ }
+
+ uint32 band;
+ for ( band=0; band<theImageHandler->getNumberOfInputBands(); ++band )
+ {
+ // Grab a pointer to the tile for the band.
+ tdata_t data = static_cast<tdata_t>(t->getBuf(band));
+
+ int bytesWritten = TIFFWriteTile( theTif,
+ data,
+ originF.x,
+ originF.y,
+ 0, // z
+ band ); // sample
+
+ if ( bytesWritten != theTileSizeInBytes )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nError returned writing tiff tile: " << tileNumber
+ << " of frame: " << frameNumber
+ << "\nExpected bytes written: " << theTileSizeInBytes
+ << "\nBytes written: " << bytesWritten
+ << std::endl;
+ theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
+ closeTiff();
+ if ( bLocalImageHandler == true )
+ {
+ imageHandler = 0;
+ }
+ return false;
+ }
+ }
+ }
+ }
+ else
+ if ( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE << " DEBUG:"
+ << "\nNo data found for tiff tile: " << tileNumber
+ << " of frame: " << frameNumber
+ << std::endl;
+ }
+
+ if ( bWritingImageData == false )
+ {
+ ossimIptList.push_back( originF );
+ }
+
+ } // End of tile loop in the sample (width) direction.
+
+ } // End of tile loop in the line (height) direction.
+
+ // Write NULL data into partially occupied output frame.
+ if ( bCreatedFrame == true )
+ {
+ tdata_t data = static_cast<tdata_t>(&(theNullDataBuffer.front()));
+ ossim_uint32 numIpts = (ossim_uint32)ossimIptList.size();
+ ossim_uint32 i;
+ for ( i=0; i<numIpts; ++i )
+ {
+ ossimIpt originF = ossimIptList[i];
+
+ uint32 band;
+ for ( band=0; band<theImageHandler->getNumberOfInputBands(); ++band )
+ {
+ int bytesWritten = TIFFWriteTile( theTif,
+ data,
+ originF.x,
+ originF.y,
+ 0, // z
+ band ); // sample
+
+ if ( bytesWritten != theTileSizeInBytes )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nError returned writing tiff frame: " << frameNumber
+ << "\nExpected bytes written: " << theTileSizeInBytes
+ << "\nBytes written: " << bytesWritten
+ << std::endl;
+ theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
+ closeTiff();
+ if ( bLocalImageHandler == true )
+ {
+ imageHandler = 0;
+ }
+ return false;
+ }
+ }
+ }
+
+ // Close and rename the new frame file.
+ closeTiff();
+ renameTiff();
+ }
+
+ ++frameNumber;
+
+ } // End of frame loop in the sample (width) direction.
+
+ if (needsAborting())
+ {
+ setPercentComplete(100.0);
+ break;
+ }
+ else
+ {
+ double frame = frameNumber;
+ setPercentComplete(frame / numberOfFrames * 100.0);
+ }
+
+ } // End of frame loop in the line (height) direction.
+
+ if ( bLocalImageHandler == true )
+ {
+ imageHandler = 0;
+ }
+
+ return true;
+}
+
+bool ossimVirtualImageTiffWriter::setTags( ossim_int32 resLevel,
+ const ossimIrect& outputRect ) const
+{
+ if ( theTif == 0 )
+ {
+ return false;
+ }
+
+ int16 samplesPerPixel = theImageHandler->getNumberOfOutputBands();
+ ossim_float64 minSampleValue = theImageHandler->getMinPixelValue();
+ ossim_float64 maxSampleValue = theImageHandler->getMaxPixelValue();
+
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "ossimVirtualImageBuilder::setTags DEBUG:"
+ << "\nrrds_level: " << resLevel
+ << "\nminSampleValue: " << minSampleValue
+ << "\nmaxSampleValue: " << maxSampleValue
+ << std::endl;
+ }
+
+ TIFFSetField( theTif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_SEPARATE );
+ TIFFSetField( theTif, TIFFTAG_IMAGEWIDTH, theOutputFrameSize.x );
+ TIFFSetField( theTif, TIFFTAG_IMAGELENGTH, theOutputFrameSize.y );
+ TIFFSetField( theTif, TIFFTAG_BITSPERSAMPLE, theBitsPerSample );
+ TIFFSetField( theTif, TIFFTAG_SAMPLEFORMAT, theSampleFormat );
+ TIFFSetField( theTif, TIFFTAG_SAMPLESPERPIXEL, samplesPerPixel );
+
+ if( theImageHandler->getNumberOfInputBands() == 3 )
+ TIFFSetField( theTif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB );
+ else
+ TIFFSetField( theTif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK );
+
+ TIFFSetField( theTif, TIFFTAG_TILEWIDTH, theOutputTileSize.x );
+ TIFFSetField( theTif, TIFFTAG_TILELENGTH, theOutputTileSize.y );
+
+ // Set the compression related tags...
+ TIFFSetField( theTif, TIFFTAG_COMPRESSION, theCompressType );
+ if ( theCompressType == COMPRESSION_JPEG )
+ {
+ TIFFSetField( theTif, TIFFTAG_JPEGQUALITY, theCompressQuality );
+ }
+
+ // Set the min/max values.
+ switch( theImageHandler->getOutputScalarType() )
+ {
+ case OSSIM_SINT16:
+ case OSSIM_FLOAT32:
+ case OSSIM_FLOAT64:
+ case OSSIM_NORMALIZED_DOUBLE:
+ TIFFSetField( theTif, TIFFTAG_SMINSAMPLEVALUE, minSampleValue );
+ TIFFSetField( theTif, TIFFTAG_SMAXSAMPLEVALUE, maxSampleValue );
+ break;
+
+ case OSSIM_UINT8:
+ case OSSIM_USHORT11:
+ case OSSIM_UINT16:
+ case OSSIM_UINT32:
+ default:
+ TIFFSetField( theTif, TIFFTAG_MINSAMPLEVALUE, static_cast<int>(minSampleValue) );
+ TIFFSetField( theTif, TIFFTAG_MAXSAMPLEVALUE, static_cast<int>(maxSampleValue) );
+ break;
+ }
+
+ return true;
+}
+
+bool ossimVirtualImageTiffWriter::initializeOutputFilenamFromHandler()
+{
+ if ( !theImageHandler )
+ {
+ return false;
+ }
+
+ // Set the output filename to a default.
+ theOutputFile = theImageHandler->getFilename();
+ if( theImageHandler->getNumberOfEntries() > 1 )
+ {
+ ossim_uint32 currentEntry = theImageHandler->getCurrentEntry();
+ theOutputFile.setExtension( "" );
+ theOutputFile += "_e";
+ theOutputFile += ossimString::toString( currentEntry );
+
+ // .ovr: file extension for all overview files in OSSIM.
+ // .ovi: "ossim virtual image" for non-overview output images.
+ theOutputFile += theOverviewFlag ? ".ovr" : "ovi";
+ }
+ else
+ {
+ // .ovr: file extension for all overview files in OSSIM.
+ // .ovi: "ossim virtual image" for non-overview output images.
+ theOutputFile.setExtension( theOverviewFlag ? ".ovr" : "ovi" );
+ }
+
+ if ( theOutputFile == theImageHandler->getFilename() )
+ {
+ // Don't allow this.
+ theOutputFile = ossimFilename::NIL;
+ }
+
+ // Temporary header file used to help build Rn for n>1.
+ theOutputFileTmp = theOutputFile + ".tmp";
+
+ if ( theOutputFile.empty() )
+ {
+ return false;
+ }
+
+ return true;
+}
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimVirtualImageWriter.cpp b/Utilities/otbossim/src/ossim/imaging/ossimVirtualImageWriter.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..bead02b7894fdcfcebce1a4b81e76b2020d25295
--- /dev/null
+++ b/Utilities/otbossim/src/ossim/imaging/ossimVirtualImageWriter.cpp
@@ -0,0 +1,1300 @@
+//*******************************************************************
+//
+// License: LGPL
+//
+// See LICENSE.txt file in the top level directory for more details.
+//
+// Author: Eric Hirschorn
+//
+// Description:
+//
+// Contains class declaration for ossimVirtualImageWriter.
+//*******************************************************************
+// $Id: ossimVirtualImageWriter.cpp 13312 2008-07-27 01:26:52Z gpotts $
+
+#include <ossim/ossimConfig.h>
+#include <ossim/base/ossimKeywordlist.h>
+#include <ossim/base/ossimFilename.h>
+#include <ossim/base/ossimKeywordNames.h>
+#include <ossim/base/ossimErrorContext.h>
+#include <ossim/base/ossimImageTypeLut.h>
+#include <ossim/base/ossimUnitTypeLut.h>
+#include <ossim/base/ossimTrace.h>
+#include <ossim/base/ossimStdOutProgress.h>
+#include <ossim/parallel/ossimMpi.h>
+#include <ossim/projection/ossimMapProjection.h>
+#include <ossim/projection/ossimMapProjectionInfo.h>
+#include <ossim/projection/ossimProjectionFactoryRegistry.h>
+#include <ossim/imaging/ossimScalarRemapper.h>
+#include <ossim/imaging/ossimImageHandler.h>
+#include <ossim/imaging/ossimImageHandlerRegistry.h>
+#include <ossim/imaging/ossimImageSourceSequencer.h>
+#include <ossim/imaging/ossimCibCadrgTileSource.h>
+#include <ossim/imaging/ossimVirtualImageHandler.h>
+#include <ossim/imaging/ossimVirtualImageWriter.h>
+#include <ossim/support_data/ossimRpfToc.h>
+#include <ossim/support_data/ossimRpfTocEntry.h>
+
+static ossimTrace traceDebug("ossimVirtualImageWriter:debug");
+
+#if OSSIM_ID_ENABLED
+static const char OSSIM_ID[] = "$Id: ossimVirtualImageWriter.cpp 13312 2008-07-27 01:26:52Z gpotts $";
+#endif
+
+RTTI_DEF3( ossimVirtualImageWriter,
+ "ossimVirtualImageWriter",
+ ossimOutputSource,
+ ossimProcessInterface,
+ ossimConnectableObjectListener )
+
+ossimVirtualImageWriter::ossimVirtualImageWriter( const ossimFilename& file,
+ ossimImageHandler* inputSource,
+ bool overviewFlag )
+ : ossimOutputSource(0,
+ 1,
+ 0,
+ true,
+ true),
+ theOutputFile(file),
+ theOutputFileTmp(""),
+ theOutputSubdirectory("unknown"),
+ theVirtualWriterType("unknown"),
+ theOutputImageType(ossimImageTypeLut().getEntryString(OSSIM_IMAGE_TYPE_UNKNOWN)),
+ theMajorVersion("1.00"), // for the ossimVirtualImageWriter class only
+ theMinorVersion("0.00"), // for derived writers to set uniquely
+ theCompressType(1),
+ theCompressQuality(75),
+ theOutputTileSize(OSSIM_DEFAULT_TILE_WIDTH, OSSIM_DEFAULT_TILE_HEIGHT),
+ theOutputFrameSize(OSSIM_DEFAULT_FRAME_WIDTH, OSSIM_DEFAULT_FRAME_HEIGHT),
+ theInputFrameSize(OSSIM_DEFAULT_FRAME_WIDTH, OSSIM_DEFAULT_FRAME_HEIGHT),
+ theBytesPerPixel(0),
+ theBitsPerSample(0),
+ theSampleFormat(0),
+ theTileSizeInBytes(0),
+ theNullDataBuffer(0),
+ theProgressListener(0),
+ theCopyAllFlag(false),
+ theLimitedScopeUpdateFlag(false),
+ theOverviewFlag(overviewFlag),
+ theCurrentEntry(0),
+ theInputMapProjection(0),
+ theDirtyFrameList(0),
+ theInputFrameInfoList(0),
+ theInputFrameInfoQueue(0),
+ theResampleType(ossimFilterResampler::ossimFilterResampler_BOX),
+ theImageHandler(0),
+ theInputConnection(0),
+ theInputGeometry(0),
+ theInputProjection(0),
+ theAreaOfInterest(0,0,0,0)
+{
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "ossimVirtualImageWriter::ossimVirtualImageWriter entered..."
+ << std::endl;
+ }
+
+ ossim::defaultTileSize( theOutputTileSize );
+
+ theImageHandler = inputSource;
+ theInputConnection = new ossimImageSourceSequencer(
+ static_cast<ossimImageSource*>( inputSource ) );
+ theInputGeometry = theImageHandler.valid() ? theImageHandler->getImageGeometry() : 0;
+ theInputProjection = theInputGeometry.valid() ? theInputGeometry->getProjection() : 0;
+
+ // Retrieve the map projection object from the input image.
+ theInputMapProjection = theInputProjection.valid() ?
+ PTR_CAST( ossimMapProjection, theInputProjection.get() ) : 0;
+
+ // The current entry of the input image handler stays the same
+ // throughout the lifetime of this virtual image writer.
+ theCurrentEntry = theImageHandler->getCurrentEntry();
+
+ // now map the sequencer to the same input
+ connectMyInputTo(0, inputSource);
+ initialize();
+
+ theInputConnection->connectMyInputTo( 0, inputSource, false );
+ theAreaOfInterest.makeNan();
+
+ //---
+ // Check for a listeners. If the list is empty, add a standard out
+ // listener so that command line apps like img2rr will get some
+ // progress.
+ //---
+ if (theListenerList.empty())
+ {
+ theProgressListener = new ossimStdOutProgress( 0, true );
+ addListener( theProgressListener );
+ setCurrentMessage(ossimString( "Starting virtual image write...") );
+ }
+
+ // See if the input image format is RPF. If it is, do some config.
+ ossimCibCadrgTileSource* pRpf = PTR_CAST( ossimCibCadrgTileSource, theImageHandler.get() );
+ if ( pRpf != NULL )
+ {
+ theInputFrameSize.x = ossimCibCadrgTileSource::CIBCADRG_FRAME_WIDTH;
+ theInputFrameSize.y = ossimCibCadrgTileSource::CIBCADRG_FRAME_HEIGHT;
+
+ // Collect the frame file names of RPF image
+ int nFramesFound = 0;
+
+ const ossimRpfToc* pRpfToc = pRpf->getToc();
+
+ // Number of directories of images
+ unsigned long nEntries = pRpfToc->getNumberOfEntries();
+ ossim_uint32 iE;
+ for ( iE=0; iE<nEntries; ++iE )
+ {
+ // Retrieve directory info
+ const ossimRpfTocEntry* pEntry = pRpfToc->getTocEntry( iE );
+ if ( pEntry != NULL )
+ {
+ ossim_uint32 nRows = pEntry->getNumberOfFramesVertical();
+ ossim_uint32 nCols = pEntry->getNumberOfFramesHorizontal();
+
+ ossim_uint32 iV,iH;
+ for ( iV=0; iV<nRows; ++iV )
+ {
+ for ( iH=0; iH<nCols; ++iH )
+ {
+ ossimRpfFrameEntry frameEntry;
+ bool bResult = pEntry->getEntry( iV, iH, frameEntry );
+ if ( bResult == true )
+ {
+ ossimString framePath = frameEntry.getPathToFrameFileFromRoot();
+ if ( framePath.length() > 0 )
+ {
+ InputFrameInfo* info = new InputFrameInfo();
+ if ( info != 0 )
+ {
+ info->name = framePath;
+ info->entry = iE;
+ info->row = iV;
+ info->col = iH;
+
+ theInputFrameInfoList.push_back( info );
+ }
+ if ( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "Frame file(" << ++nFramesFound << "): "
+ << framePath
+ << " (entry: " << iE << ", row: " << iV << ", col: " << iH << ")"
+ << std::endl;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+}
+
+ossimVirtualImageWriter::~ossimVirtualImageWriter()
+{
+ int numFrames = (int)theInputFrameInfoList.size();
+ int i;
+ for ( i=0; i<numFrames; ++i )
+ {
+ InputFrameInfo* info = theInputFrameInfoList[i];
+ if ( info != 0 )
+ {
+ delete info;
+ }
+ }
+ theInputFrameInfoList.clear();
+
+ theInputConnection = 0;
+ theInputGeometry = 0;
+ theInputProjection = 0;
+
+ if ( theProgressListener )
+ {
+ setCurrentMessage( ossimString("Finished virtual image write...") );
+ removeListener( theProgressListener );
+ delete theProgressListener;
+ theProgressListener = 0;
+ }
+}
+
+void ossimVirtualImageWriter::initialize()
+{
+ if( theInputConnection.valid() )
+ {
+ theInputConnection->initialize();
+ setAreaOfInterest( theInputConnection->getBoundingRect() );
+ }
+}
+
+InputFrameInfo* ossimVirtualImageWriter::getInputFrameInfo( ossimFilename name ) const
+{
+ static const char MODULE[] = "ossimVirtualImageWriter::getInputFrameInfo";
+
+ // First test: do an unfiltered name compare to find the InputFrameInfo.
+ int numFrames = (int)theInputFrameInfoList.size();
+ int i;
+ for ( i=0; i<numFrames; ++i )
+ {
+ InputFrameInfo* info = theInputFrameInfoList[i];
+ if ( info != 0 )
+ {
+ if ( (theCurrentEntry == info->entry) &&
+ (name == info->name) )
+ {
+ if ( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE << " DEBUG:"
+ << "\nRPF frame found: " << name
+ << " using full unfiltered name compare:"
+ << " info->entry=" << info->entry
+ << " info->row=" << info->row
+ << " info->col=" << info->col
+ << std::endl;
+ }
+
+ return info;
+ }
+ }
+ }
+
+ if ( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE << " DEBUG:"
+ << "\nRPF frame not found: " << name
+ << " in full unfiltered name compare."
+ << "/nWill now try less stringent test."
+ << std::endl;
+ }
+
+ // Second test: just check the filename and extension with no path check
+ // to find an InputFrameInfo candidate.
+ ossimString driveStringIn;
+ ossimString pathStringIn;
+ ossimString fileStringIn;
+ ossimString extStringIn;
+ name.split( driveStringIn,
+ pathStringIn,
+ fileStringIn,
+ extStringIn );
+
+ for ( i=0; i<numFrames; ++i )
+ {
+ InputFrameInfo* info = theInputFrameInfoList[i];
+ if ( info != 0 )
+ {
+ if ( theCurrentEntry == info->entry )
+ {
+ ossimString driveStringRPF;
+ ossimString pathStringRPF;
+ ossimString fileStringRPF;
+ ossimString extStringRPF;
+ info->name.split( driveStringRPF,
+ pathStringRPF,
+ fileStringRPF,
+ extStringRPF );
+
+ if ( (fileStringRPF == fileStringIn) &&
+ (extStringRPF == extStringIn) )
+ {
+ if ( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE << " DEBUG:"
+ << "\nRPF frame candidate found: " << name
+ << " using stripped name compare:"
+ << " info->name=" << info->name
+ << " info->entry=" << info->entry
+ << " info->row=" << info->row
+ << " info->col=" << info->col
+ << std::endl;
+ }
+
+ return info;
+ }
+ }
+ }
+ }
+
+ if ( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nRPF frame not found: " << name
+ << std::endl;
+ }
+
+ return 0;
+}
+
+ossim_int32 ossimVirtualImageWriter::getNumberOfBuiltFrames( ossim_uint32 resLevel,
+ bool bPartialBuild ) const
+{
+ ossim_int32 numFrames = 0;
+
+ if ( bPartialBuild )
+ {
+ // Since the input frames have potentially overlapping output
+ // frame ranges, we make the count accurate by making use of the
+ // isFrameAlreadyDone() member function which allows us to discard
+ // the duplicates.
+ ossim_uint32 nQ = (ossim_uint32)theInputFrameInfoQueue.size();
+ ossim_uint32 idxQ;
+ for ( idxQ=0; idxQ<nQ; ++idxQ )
+ {
+ InputFrameInfo* pInfo = theInputFrameInfoQueue[idxQ];
+ if ( pInfo && pInfo->isValid(resLevel) )
+ {
+ ossim_int32 xRangeMin = pInfo->xRangeMin[resLevel];
+ ossim_int32 xRangeMax = pInfo->xRangeMax[resLevel];
+ ossim_int32 yRangeMin = pInfo->yRangeMin[resLevel];
+ ossim_int32 yRangeMax = pInfo->yRangeMax[resLevel];
+
+ //***
+ // Frame loop in the line (height) direction.
+ //***
+ ossim_int32 iF;
+ for( iF = yRangeMin; iF <= yRangeMax; ++iF )
+ {
+ //***
+ // Frame loop in the sample (width) direction.
+ //***
+ ossim_int32 jF;
+ for( jF = xRangeMin; jF <= xRangeMax; ++jF )
+ {
+ // Add check here to see if (jF,iF) has already been processed for
+ // a previous input frame in the queue.
+ bool bIsFrameAlreadyDone = isFrameAlreadyDone( idxQ, resLevel, jF, iF );
+
+ if ( bIsFrameAlreadyDone == false )
+ {
+ ++numFrames;
+ }
+ }
+ }
+ }
+ }
+ }
+ else
+ {
+ ossim_int32 imageSamples = theImageHandler->getNumberOfSamples();
+ ossim_int32 imageLines = theImageHandler->getNumberOfLines();
+
+ ossim_uint32 resLevelPow = (ossim_uint32)(1<<resLevel);
+ imageSamples /= resLevelPow;
+ imageLines /= resLevelPow;
+
+ ossim_int32 frameSamples = theOutputFrameSize.x;
+ ossim_int32 frameLines = theOutputFrameSize.y;
+
+ ossim_int32 framesWide = (imageSamples % frameSamples) ?
+ (imageSamples / frameSamples) + 1 : (imageSamples / frameSamples);
+ ossim_int32 framesHigh = (imageLines % frameLines) ?
+ (imageLines / frameLines) + 1 : (imageLines / frameLines);
+
+ numFrames = framesWide * framesHigh;
+ }
+
+ return numFrames;
+}
+
+ossimIpt ossimVirtualImageWriter::getNumberOfOutputFrames( ossim_uint32 resLevel ) const
+{
+ ossim_int32 imageSamples = theImageHandler->getNumberOfSamples();
+ ossim_int32 imageLines = theImageHandler->getNumberOfLines();
+
+ ossim_uint32 resLevelPow = (ossim_uint32)(1<<resLevel);
+ imageSamples /= resLevelPow;
+ imageLines /= resLevelPow;
+
+ ossim_int32 frameSamples = theOutputFrameSize.x;
+ ossim_int32 frameLines = theOutputFrameSize.y;
+
+ ossim_int32 framesWide = (imageSamples % frameSamples) ?
+ (imageSamples / frameSamples) + 1 : (imageSamples / frameSamples);
+ ossim_int32 framesHigh = (imageLines % frameLines) ?
+ (imageLines / frameLines) + 1 : (imageLines / frameLines);
+
+ return ossimIpt( framesWide, framesHigh );
+}
+
+ossimIpt ossimVirtualImageWriter::getNumberOfOutputTiles( ossim_uint32 resLevel ) const
+{
+ ossim_int32 imageSamples = theImageHandler->getNumberOfSamples();
+ ossim_int32 imageLines = theImageHandler->getNumberOfLines();
+
+ ossim_uint32 resLevelPow = (ossim_uint32)(1<<resLevel);
+ imageSamples /= resLevelPow;
+ imageLines /= resLevelPow;
+
+ ossim_int32 tileSamples = theOutputTileSize.x;
+ ossim_int32 tileLines = theOutputTileSize.y;
+
+ ossim_int32 tilesWide = (imageSamples % tileSamples) ?
+ (imageSamples / tileSamples) + 1 :
+ (imageSamples / tileSamples);
+ ossim_int32 tilesHigh = (imageLines % tileLines) ?
+ (imageLines / tileLines) + 1 :
+ (imageLines / tileLines);
+
+ return ossimIpt( tilesWide, tilesHigh );
+}
+
+ossimIpt ossimVirtualImageWriter::getNumberOfTilesPerOutputFrame() const
+{
+ ossim_int32 frameSamples = theOutputFrameSize.x;
+ ossim_int32 frameLines = theOutputFrameSize.y;
+
+ ossim_int32 tileSamples = theOutputTileSize.x;
+ ossim_int32 tileLines = theOutputTileSize.y;
+
+ ossim_int32 tilesWide = (frameSamples % tileSamples) ?
+ (frameSamples / tileSamples) + 1 : (frameSamples / tileSamples);
+ ossim_int32 tilesHigh = (frameLines % tileLines) ?
+ (frameLines / tileLines) + 1 : (frameLines / tileLines);
+
+ return ossimIpt( tilesWide, tilesHigh );
+}
+
+ossimObject* ossimVirtualImageWriter::getObject()
+{
+ return this;
+}
+
+const ossimObject* ossimVirtualImageWriter::getObject() const
+{
+ return this;
+}
+
+void ossimVirtualImageWriter::setOutputImageType( const ossimString& type )
+{
+ theOutputImageType = type;
+}
+
+void ossimVirtualImageWriter::setOutputImageType( ossim_int32 type )
+{
+ ossimImageTypeLut lut;
+ theOutputImageType = lut.getEntryString( type );
+}
+
+ossimString ossimVirtualImageWriter::getOutputImageTypeString() const
+{
+ return theOutputImageType;
+}
+
+ossim_int32 ossimVirtualImageWriter::getOutputImageType() const
+{
+ ossimImageTypeLut lut;
+ return lut.getEntryNumber( theOutputImageType );
+}
+
+bool ossimVirtualImageWriter::getOverviewFlag() const
+{
+ return theOverviewFlag;
+}
+
+void ossimVirtualImageWriter::setOverviewFlag( bool flag )
+{
+ theOverviewFlag = flag;
+}
+
+ossimIrect ossimVirtualImageWriter::getAreaOfInterest() const
+{
+ return theAreaOfInterest;
+}
+
+void ossimVirtualImageWriter::setAreaOfInterest( const ossimIrect& inputRect )
+{
+ theAreaOfInterest = inputRect;
+ if( theInputConnection.valid() )
+ {
+ theInputConnection->setAreaOfInterest( inputRect );
+ }
+}
+
+void ossimVirtualImageWriter::setOutputFile( const ossimFilename& file )
+{
+ theOutputFile = file;
+}
+
+const ossimFilename& ossimVirtualImageWriter::getOutputFile()const
+{
+ return theOutputFile;
+}
+
+bool ossimVirtualImageWriter::canConnectMyInputTo( ossim_int32 inputIndex,
+ const ossimConnectableObject* object ) const
+{
+ return ( object &&
+ ( (PTR_CAST(ossimImageSource, object) && (inputIndex == 0)) ) );
+}
+
+void ossimVirtualImageWriter::setOutputTileSize( const ossimIpt& tileSize )
+{
+ if ( theInputConnection.valid() )
+ {
+ theInputConnection->setTileSize( tileSize );
+ }
+
+ theOutputTileSize = tileSize;
+
+ theTileSizeInBytes = theOutputTileSize.x * theOutputTileSize.y * theBytesPerPixel;
+
+ //---
+ // Make a buffer to pass to pass to the write tile methods when an image
+ // handler returns a null tile.
+ //---
+ theNullDataBuffer.resize( theTileSizeInBytes );
+
+ // Fill it with zeroes.
+ std::fill( theNullDataBuffer.begin(), theNullDataBuffer.end(), 0 );
+}
+
+void ossimVirtualImageWriter::setOutputFrameSize( const ossimIpt& frameSize )
+{
+ theOutputFrameSize = frameSize;
+}
+
+bool ossimVirtualImageWriter::getCopyAllFlag() const
+{
+ return theCopyAllFlag;
+}
+
+void ossimVirtualImageWriter::setCopyAllFlag( bool flag )
+{
+ theCopyAllFlag = flag;
+}
+
+ossim_uint32 ossimVirtualImageWriter::getFinalResLevel( ossim_uint32 startRLevel,
+ bool bPartialBuild ) const
+{
+ // Note we always have one rset
+ ossim_uint32 rLevel = startRLevel;
+
+ ossimIpt nFrames = getNumberOfOutputFrames( rLevel );
+ ossim_uint32 largest = ( nFrames.x > nFrames.y ) ? nFrames.x : nFrames.y;
+
+ while( largest > 1 )
+ {
+ ++rLevel;
+
+ nFrames = getNumberOfOutputFrames( rLevel );
+ largest = (nFrames.x > nFrames.y) ? nFrames.x : nFrames.y;
+ }
+
+ return rLevel;
+}
+
+ossim_uint32 ossimVirtualImageWriter::getStartingResLevel() const
+{
+ return theCopyAllFlag ? 0 : 1;
+}
+
+// After 1 or more dirty frames are set, an update to the image will
+// be of limited scope to areas of the RPF image that come from the
+// frame files found in theDirtyFrameList.
+void ossimVirtualImageWriter::setDirtyFrame( const ossimString& name )
+{
+ // Add the name of a frame to the dirty frame list.
+ theDirtyFrameList.push_back(name);
+}
+
+bool ossimVirtualImageWriter::isFrameAlreadyDone( ossim_uint32 mQ,
+ ossim_uint32 resLevel,
+ ossim_int32 frameX,
+ ossim_int32 frameY ) const
+{
+ bool bFoundIt = false;
+ ossim_uint32 nQ = (ossim_uint32)theInputFrameInfoQueue.size();
+ ossim_uint32 idxQ;
+ for ( idxQ=0; idxQ<nQ && idxQ<mQ; ++idxQ )
+ {
+ InputFrameInfo* pInfo = theInputFrameInfoQueue[idxQ];
+ if ( pInfo && pInfo->isValid() )
+ {
+ ossim_int32 xRangeMin = pInfo->xRangeMin[resLevel];
+ ossim_int32 xRangeMax = pInfo->xRangeMax[resLevel];
+ ossim_int32 yRangeMin = pInfo->yRangeMin[resLevel];
+ ossim_int32 yRangeMax = pInfo->yRangeMax[resLevel];
+
+ if ( xRangeMin <= frameX && frameX <= xRangeMax &&
+ yRangeMin <= frameY && frameY <= yRangeMax )
+ {
+ bFoundIt = true;
+ break;
+ }
+ }
+ }
+
+ return bFoundIt;
+}
+
+bool ossimVirtualImageWriter::execute()
+{
+ static const char MODULE[] = "ossimVirtualImageWriter::execute";
+
+ // If the virtual header file already exists,
+ // let's try to stay consistent with its parameters.
+ bool bExists = theOutputFile.exists();
+ if ( bExists )
+ {
+ ossimRefPtr<ossimImageHandler> pHand = ossimImageHandlerRegistry::instance()->open( theOutputFile );
+ if ( pHand.valid() )
+ {
+ ossimVirtualImageHandler* pVirt = PTR_CAST( ossimVirtualImageHandler, pHand.get() );
+ if ( pVirt != NULL )
+ {
+ ossimIpt outputFrameSize;
+ outputFrameSize.x = pVirt->getFrameWidth();
+ outputFrameSize.y = pVirt->getFrameHeight();
+
+ if ( outputFrameSize.x != theOutputFrameSize.x )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "The requested output frame size(x): "
+ << theOutputFrameSize.x
+ << " -> "
+ << outputFrameSize.x
+ << ", overridden by pre-existing value found in: "
+ << theOutputFile
+ << std::endl;
+
+ theOutputFrameSize.x = outputFrameSize.x;
+ }
+ if ( outputFrameSize.y != theOutputFrameSize.y )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "The requested output frame size(y): "
+ << theOutputFrameSize.y
+ << " -> "
+ << outputFrameSize.y
+ << ", overridden by pre-existing value found in: "
+ << theOutputFile
+ << std::endl;
+
+ theOutputFrameSize.y = outputFrameSize.y;
+ }
+
+ ossimIpt outputTileSize;
+ outputTileSize.x = pVirt->getTileWidth();
+ outputTileSize.y = pVirt->getTileHeight();
+
+ if ( outputTileSize.x != theOutputTileSize.x )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "The requested output tile size(x): "
+ << theOutputTileSize.x
+ << " -> "
+ << outputTileSize.x
+ << ", overridden by pre-existing value found in: "
+ << theOutputFile
+ << std::endl;
+
+ theOutputTileSize.x = outputTileSize.x;
+ }
+ if ( outputTileSize.y != theOutputTileSize.y )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "The requested output tile size(y): "
+ << theOutputTileSize.y
+ << " -> "
+ << outputTileSize.y
+ << ", overridden by pre-existing value found in: "
+ << theOutputFile
+ << std::endl;
+
+ theOutputTileSize.y = outputTileSize.y;
+ }
+ }
+
+ pHand = 0;
+ }
+ }
+
+ // Adjust the x-dimensional output frame size to be an integer
+ // multiple of the output tile size (e.g. x1,x2,x3,...) if it isn't
+ // already.
+ ossim_int32 modX = theOutputFrameSize.x % theOutputTileSize.x;
+ if ( modX != 0 )
+ {
+ ossim_int32 mulX = (theOutputFrameSize.x / theOutputTileSize.x) + 1;
+ if ( mulX == 0 )
+ {
+ mulX = 1;
+ }
+
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "Adjusting the requested output frame size("
+ << theOutputFrameSize.x
+ << ") in x-dim to "
+ << mulX << " times the output tile size("
+ << theOutputTileSize.x
+ << ")"
+ << std::endl;
+
+ theOutputFrameSize.x = theOutputTileSize.x * mulX;
+ }
+
+ // Adjust the y-dimensional output frame size to be an integer
+ // multiple of the output tile size (e.g. x1,x2,x3,...) if it isn't
+ // already.
+ ossim_int32 modY = theOutputFrameSize.y % theOutputTileSize.y;
+ if ( modY != 0 )
+ {
+ ossim_int32 mulY = (theOutputFrameSize.y / theOutputTileSize.y) + 1;
+ if ( mulY== 0 )
+ {
+ mulY = 1;
+ }
+
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "Adjusting the requested output frame size("
+ << theOutputFrameSize.y
+ << ") in y-dim to "
+ << mulY << " times the output tile size("
+ << theOutputTileSize.y
+ << ")"
+ << std::endl;
+
+ theOutputFrameSize.y = theOutputTileSize.y * mulY;
+ }
+
+ // Zero base starting resLevel.
+ ossim_uint32 startRLev = getStartingResLevel();
+
+ // Zero base final resLevel.
+ ossim_uint32 finalRLev = getFinalResLevel( startRLev );
+
+ // Print out the dirty frames.
+ ossimCibCadrgTileSource* pRpf = PTR_CAST( ossimCibCadrgTileSource, theImageHandler.get() );
+ if ( pRpf != NULL )
+ {
+ // Make sure the queue is empty before we start adding in.
+ theInputFrameInfoQueue.clear();
+
+ int nFrames = (int)theDirtyFrameList.size();
+ if ( nFrames > 0 )
+ {
+ ossim_uint32 inputFrameNx = theInputFrameSize.x;
+ ossim_uint32 inputFrameNy = theInputFrameSize.y;
+ ossim_uint32 outputFrameNx = theOutputFrameSize.x;
+ ossim_uint32 outputFrameNy = theOutputFrameSize.y;
+
+ int idx;
+ for( idx=0; idx<nFrames; ++idx )
+ {
+ ossimFilename frameTestName = theDirtyFrameList[idx];
+ InputFrameInfo* info = getInputFrameInfo( frameTestName );
+ if ( info )
+ {
+ if ( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "\nRange processing input frame file(" << info->name << "): "
+ << "\n(entry: " << info->entry << ", row: " << info->row << ", col: " << info->col << ")"
+ << std::endl;
+ }
+
+ ossim_uint32 inputFrameI = info->col;
+ ossim_uint32 inputFrameJ = info->row;
+
+ // set the output frame index ranges
+ ossim_uint32 r;
+ for ( r=0; r<=finalRLev; ++r )
+ {
+ ossim_uint32 scale = (ossim_uint32)(1<<r);
+ ossim_uint32 scaledOutputFrameNx = scale * outputFrameNx;
+ ossim_uint32 scaledOutputFrameNy = scale * outputFrameNy;
+
+ ossim_uint32 inputNthFramePixelBeginX = inputFrameI * inputFrameNx;
+ ossim_uint32 inputNthFramePixelEndX = inputNthFramePixelBeginX + inputFrameNx - 1;
+
+ ossim_uint32 inputNthFramePixelBeginY = inputFrameJ * inputFrameNy;
+ ossim_uint32 inputNthFramePixelEndY = inputNthFramePixelBeginY + inputFrameNy - 1;
+
+ double xRangeMinD = (double)inputNthFramePixelBeginX / scaledOutputFrameNx;
+ double xRangeMaxD = (double)inputNthFramePixelEndX / scaledOutputFrameNx;
+ double yRangeMinD = (double)inputNthFramePixelBeginY / scaledOutputFrameNy;
+ double yRangeMaxD = (double)inputNthFramePixelEndY / scaledOutputFrameNy;
+
+ ossim_uint32 xRangeMin = (ossim_uint32)xRangeMinD;
+ ossim_uint32 xRangeMax = (ossim_uint32)xRangeMaxD;
+ ossim_uint32 yRangeMin = (ossim_uint32)yRangeMinD;
+ ossim_uint32 yRangeMax = (ossim_uint32)yRangeMaxD;
+
+ if ( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "\nOutput frame ranges at resLevel: " << r
+ << "\nxRangeMin: " << xRangeMin << ", xRangeMax: " << xRangeMax
+ << "\nyRangeMin: " << yRangeMin << ", yRangeMax: " << yRangeMax
+ << "\n"
+ << std::endl;
+ }
+
+ info->xRangeMin.push_back( xRangeMin );
+ info->xRangeMax.push_back( xRangeMax );
+ info->yRangeMin.push_back( yRangeMin );
+ info->yRangeMax.push_back( yRangeMax );
+ }
+
+ // add frames to process to queue
+ theInputFrameInfoQueue.push_back( info );
+ }
+
+ if ( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << "\nFrame file(" << idx+1 << "): "
+ << theDirtyFrameList[idx]
+ << (info ? " will" : " will not")
+ << " be processed."
+ << std::endl;
+ }
+ }
+
+ if ( theInputFrameInfoQueue.size() > 0 )
+ {
+ theLimitedScopeUpdateFlag = true;
+
+ // If all the frames for the current input image handler entry have
+ // been entered, we don't have to set theLimitedScopeUpdateFlag to true.
+ // So a check to see if all frames have been added to the list or not
+ // can be added.
+ }
+ else
+ {
+ // No frames have been found for the current entry of the
+ // input image handler. So there's no work to be done and we
+ // should bail...
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "There is nothing to do, so exiting overview write of entry: "
+ << theCurrentEntry
+ << std::endl;
+ return false;
+ }
+ }
+ else
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "Building entire image..."
+ << std::endl;
+ }
+ }
+ else
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "\nInput image (" << theImageHandler->getFilename() << ") not an RPF, "
+ << "so the entire image is being rebuilt."
+ << std::endl;
+ }
+
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE
+ << "\nCurrent number of reduced res sets: "
+ << theImageHandler->getNumberOfDecimationLevels()
+ << "\nStarting reduced res set: " << startRLev
+ << "\nEnding reduced res sets: " << finalRLev
+ << "\nResampling type: " << theResampleType
+ << std::endl;
+ }
+
+ if ( ossimMpi::instance()->getRank() == 0 )
+ {
+ if ( startRLev == 0 )
+ {
+ if ( !writeR0() )
+ {
+ // Set the error...
+ ossimSetError( getClassName(),
+ ossimErrorCodes::OSSIM_ERROR,
+ "File %s line %d\nError copying image!",
+ __FILE__,
+ __LINE__ );
+ return false;
+ }
+ else
+ {
+ ossimKeywordlist temp_header_kwl;
+ saveHeaderInfo( temp_header_kwl, startRLev, startRLev );
+ temp_header_kwl.write( theOutputFileTmp );
+ }
+ }
+ }
+
+ ossim_uint32 writeRnStartRLev = (startRLev==0) ? startRLev+1 : startRLev;
+ for ( ossim_uint32 i = writeRnStartRLev; i <= finalRLev; ++i )
+ {
+ // Sync all processes...
+ ossimMpi::instance()->barrier();
+
+ if ( !writeRn( i ) )
+ {
+ // Set the error...
+ ossimSetError( getClassName(),
+ ossimErrorCodes::OSSIM_WRITE_FILE_ERROR,
+ "%s file %s line %d\nError creating reduced res set!",
+ MODULE,
+ __FILE__,
+ __LINE__ );
+
+ if ( theOutputFileTmp.exists() )
+ {
+ theOutputFileTmp.remove();
+ }
+
+ cout << "Writing header file for up to R" << i-1 << ": " << theOutputFile << endl;
+
+ ossimKeywordlist error_header_kwl;
+ saveHeaderInfo( error_header_kwl, startRLev, i-1 );
+ error_header_kwl.write( theOutputFile );
+ return false;
+ }
+ else
+ {
+ if ( theOutputFileTmp.exists() )
+ {
+ theOutputFileTmp.remove();
+ }
+ ossimKeywordlist temp_header_kwl;
+ saveHeaderInfo( temp_header_kwl, startRLev, i );
+ temp_header_kwl.write( theOutputFileTmp );
+ }
+ }
+
+ if ( theOutputFileTmp.exists() )
+ {
+ theOutputFileTmp.remove();
+ }
+
+ cout << "Writing header file: " << theOutputFile << " for virtual image." << endl;
+
+ ossimKeywordlist header_kwl;
+ saveHeaderInfo( header_kwl, startRLev, finalRLev );
+ return header_kwl.write( theOutputFile );
+}
+
+bool ossimVirtualImageWriter::writeR0()
+{
+ if ( theLimitedScopeUpdateFlag == true )
+ {
+ return writeR0Partial();
+ }
+ else
+ {
+ return writeR0Full();
+ }
+}
+
+bool ossimVirtualImageWriter::writeRn( ossim_uint32 resLevel )
+{
+ if ( theLimitedScopeUpdateFlag == true )
+ {
+ return writeRnPartial( resLevel );
+ }
+ else
+ {
+ return writeRnFull( resLevel );
+ }
+}
+
+bool ossimVirtualImageWriter::saveHeaderInfo( ossimKeywordlist& kwl,
+ ossim_uint32 rLevBegin,
+ ossim_uint32 rLevEnd )
+{
+ ossim_uint32 entryIdx = theImageHandler->getCurrentEntry();
+
+ ossimString prefix = "image";
+ prefix += ossimString::toString( entryIdx ) + ".";
+
+ kwl.add( prefix,
+ ossimKeywordNames::ENTRY_KW,
+ entryIdx,
+ true );
+
+ saveGeometryKeywordEntry( kwl, prefix );
+ saveGeneralKeywordEntry ( kwl, prefix );
+ saveNativeKeywordEntry ( kwl, prefix,
+ rLevBegin,
+ rLevEnd );
+
+ kwl.add( ossimKeywordNames::NUMBER_ENTRIES_KW, 1, true );
+
+ return true;
+}
+
+// Note be sure to theImageHandler->setCurrentEntry before calling.
+bool ossimVirtualImageWriter::isExternalOverview() const
+{
+ bool result = false; // Have to prove it.
+
+ ossimString s = "imag";
+ ossimRefPtr<ossimProperty> prop = theImageHandler->getProperty( s );
+ if ( prop.valid() )
+ {
+ ossimString s;
+ prop->valueToString( s );
+ if ( s.toFloat32() < 1.0 )
+ {
+ result = true;
+ }
+ }
+
+ return result;
+}
+
+void ossimVirtualImageWriter::saveNativeKeywordEntry( ossimKeywordlist& kwl,
+ const ossimString& prefix,
+ ossim_uint32 rLevBegin,
+ ossim_uint32 rLevEnd ) const
+{
+ ossimString nativeStr = ossimString( "virtual" ) + ".";
+
+ kwl.add( prefix,
+ nativeStr+"subdirectory",
+ theOutputSubdirectory,
+ true );
+ kwl.add( prefix,
+ nativeStr+"writer_type",
+ theVirtualWriterType,
+ true );
+ kwl.add( prefix,
+ nativeStr+"frame_size_x",
+ theOutputFrameSize.x,
+ true );
+ kwl.add( prefix,
+ nativeStr+"frame_size_y",
+ theOutputFrameSize.y,
+ true );
+ kwl.add( prefix,
+ nativeStr+"tile_size_x",
+ theOutputTileSize.x,
+ true );
+ kwl.add( prefix,
+ nativeStr+"tile_size_y",
+ theOutputTileSize.y,
+ true );
+ kwl.add( prefix,
+ nativeStr+"version_major",
+ theMajorVersion,
+ true );
+ kwl.add( prefix,
+ nativeStr+"version_minor",
+ theMinorVersion,
+ true );
+ kwl.add( prefix,
+ nativeStr+"overview_flag",
+ theOverviewFlag ? "true" : "false",
+ true );
+ kwl.add( prefix,
+ nativeStr+"includes_r0",
+ theCopyAllFlag ? "true" : "false",
+ true );
+ kwl.add( prefix,
+ nativeStr+"bits_per_sample",
+ theBitsPerSample,
+ true );
+ kwl.add( prefix,
+ nativeStr+"bytes_per_pixel",
+ theBytesPerPixel,
+ true );
+ kwl.add( prefix,
+ nativeStr+"resolution_level_starting",
+ rLevBegin,
+ true );
+ kwl.add( prefix,
+ nativeStr+"resolution_level_ending",
+ rLevEnd,
+ true );
+
+ nativeStr += ossimString( "resolution_level_" );
+
+ ossim_uint32 r;
+ for ( r=rLevBegin; r<=rLevEnd; ++r )
+ {
+ ossimString fullStr = nativeStr + ossimString::toString( r ) + ".";
+
+ ossimIpt nFrames = getNumberOfOutputFrames( r );
+
+ kwl.add( prefix,
+ fullStr+"number_of_frames_x",
+ nFrames.x,
+ true );
+ kwl.add( prefix,
+ fullStr+"number_of_frames_y",
+ nFrames.y,
+ true );
+ }
+}
+
+// Modified from image_info.cpp outputGeometryEntry() routine
+void ossimVirtualImageWriter::saveGeometryKeywordEntry( ossimKeywordlist& kwl,
+ const ossimString& prefix )
+{
+ if( theInputProjection.valid() )
+ {
+ ossimDrect outputRect = theImageHandler->getBoundingRect();
+ theInputProjection->saveState( kwl, prefix );
+
+ ossimGpt ulg,llg,lrg,urg;
+ theInputProjection->lineSampleToWorld( outputRect.ul(), ulg );
+ theInputProjection->lineSampleToWorld( outputRect.ll(), llg );
+ theInputProjection->lineSampleToWorld( outputRect.lr(), lrg );
+ theInputProjection->lineSampleToWorld( outputRect.ur(), urg );
+
+ kwl.add( prefix, "ul_lat", ulg.latd(), true );
+ kwl.add( prefix, "ul_lon", ulg.lond(), true );
+ kwl.add( prefix, "ll_lat", llg.latd(), true );
+ kwl.add( prefix, "ll_lon", llg.lond(), true );
+ kwl.add( prefix, "lr_lat", lrg.latd(), true );
+ kwl.add( prefix, "lr_lon", lrg.lond(), true );
+ kwl.add( prefix, "ur_lat", urg.latd(), true );
+ kwl.add( prefix, "ur_lon", urg.lond(), true );
+
+ // ESH 01/2009: The following are still needed by EW 4.4.
+ if( !kwl.find( ossimKeywordNames::TIE_POINT_LAT_KW ) )
+ {
+ kwl.add( prefix,
+ ossimKeywordNames::TIE_POINT_LAT_KW,
+ ulg.latd(),
+ true );
+ kwl.add( prefix,
+ ossimKeywordNames::TIE_POINT_LON_KW,
+ ulg.lond(),
+ true );
+
+ if ( outputRect.height()-1.0 > DBL_EPSILON )
+ {
+ kwl.add( prefix,
+ ossimKeywordNames::DECIMAL_DEGREES_PER_PIXEL_LAT,
+ fabs( ulg.latd()-llg.latd() ) / (outputRect.height()-1.0),
+ true );
+ }
+ if ( outputRect.width()-1.0 > DBL_EPSILON )
+ {
+ kwl.add( prefix,
+ ossimKeywordNames::DECIMAL_DEGREES_PER_PIXEL_LON,
+ fabs( ulg.lond()-urg.lond()) / (outputRect.width()-1.0),
+ true );
+ }
+ }
+
+ ossimDpt gsd = theInputProjection->getMetersPerPixel();
+ kwl.add( prefix,
+ ossimKeywordNames::METERS_PER_PIXEL_X_KW,
+ gsd.x,
+ true );
+ kwl.add( prefix,
+ ossimKeywordNames::METERS_PER_PIXEL_Y_KW,
+ gsd.y,
+ true );
+ }
+ else
+ {
+ cerr << "No projection geometry for file " << theImageHandler->getFilename() << endl;
+ }
+}
+
+// Modified from image_info.cpp outputGeneralImageInfo() routine
+void ossimVirtualImageWriter::saveGeneralKeywordEntry( ossimKeywordlist& kwl,
+ const ossimString& prefix ) const
+{
+ ossimDrect boundingRect = theImageHandler->getBoundingRect();
+
+ kwl.add( prefix, ossimKeywordNames::UL_X_KW, boundingRect.ul().x, true );
+ kwl.add( prefix, ossimKeywordNames::UL_Y_KW, boundingRect.ul().y, true );
+ kwl.add( prefix, ossimKeywordNames::LR_X_KW, boundingRect.lr().x, true );
+ kwl.add( prefix, ossimKeywordNames::LR_Y_KW, boundingRect.lr().y, true );
+
+ kwl.add( prefix,
+ ossimKeywordNames::NUMBER_INPUT_BANDS_KW,
+ theImageHandler->getNumberOfInputBands(),
+ true );
+ kwl.add( prefix,
+ ossimKeywordNames::NUMBER_OUTPUT_BANDS_KW,
+ theImageHandler->getNumberOfOutputBands(),
+ true );
+ kwl.add( prefix,
+ ossimKeywordNames::NUMBER_LINES_KW,
+ boundingRect.height(),
+ true );
+ kwl.add( prefix,
+ ossimKeywordNames::NUMBER_SAMPLES_KW,
+ boundingRect.width(),
+ true );
+
+ int i;
+ for( i = 0; i < (int)theImageHandler->getNumberOfInputBands(); ++i )
+ {
+ ossimString band = ossimString( "band" ) + ossimString::toString( i ) + ".";
+
+ kwl.add( prefix,
+ band+"null_value",
+ theImageHandler->getNullPixelValue( i ),
+ true );
+ kwl.add( prefix,
+ band+"min_value",
+ theImageHandler->getMinPixelValue( i ),
+ true );
+ kwl.add( prefix,
+ band+"max_value",
+ theImageHandler->getMaxPixelValue( i ),
+ true );
+ }
+
+ // Output Radiometry.
+ ossimString scalarStr("unknown");
+ ossimScalarType scalar = theImageHandler->getOutputScalarType();
+ switch( scalar )
+ {
+ case OSSIM_UINT8:
+ {
+ scalarStr = "8-bit";
+ break;
+ }
+ case OSSIM_USHORT11:
+ {
+ scalarStr = "11-bit";
+ break;
+ }
+ case OSSIM_UINT16:
+ {
+ scalarStr = "16-bit unsigned";
+ break;
+ }
+ case OSSIM_SINT16:
+ {
+ scalarStr = "16-bit signed";
+ break;
+ }
+ case OSSIM_UINT32:
+ {
+ scalarStr = "32-bit unsigned";
+ break;
+ }
+ case OSSIM_FLOAT32:
+ {
+ scalarStr = "float";
+ break;
+ }
+ case OSSIM_NORMALIZED_FLOAT:
+ {
+ scalarStr = "normalized float";
+ break;
+ }
+ default:
+ {
+ /* Do nothing */
+ break;
+ }
+ }
+
+ kwl.add( prefix, "radiometry", scalarStr, true );
+}
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimVirtualOverviewBuilder.cpp b/Utilities/otbossim/src/ossim/imaging/ossimVirtualOverviewBuilder.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..b32db6b05fb1419d4da0ea9f4a8720ad2862db5d
--- /dev/null
+++ b/Utilities/otbossim/src/ossim/imaging/ossimVirtualOverviewBuilder.cpp
@@ -0,0 +1,438 @@
+//*******************************************************************
+//
+// License: LGPL
+//
+// See LICENSE.txt file in the top level directory for more details.
+//
+// Author: Eric Hirschorn
+//
+// Description:
+//
+// Contains class definition for VirtualOverviewBuilder
+//
+//*******************************************************************
+// $Id: ossimVirtualOverviewBuilder.cpp 14780 2009-06-25 19:32:32Z dburken $
+
+#include <algorithm> /* for std::fill */
+using namespace std;
+
+#include <tiffio.h>
+#include <xtiffio.h>
+
+#include <ossim/base/ossimCommon.h>
+#include <ossim/base/ossimErrorCodes.h>
+#include <ossim/base/ossimErrorContext.h>
+#include <ossim/base/ossimNotify.h>
+#include <ossim/base/ossimStdOutProgress.h>
+#include <ossim/base/ossimIpt.h>
+#include <ossim/base/ossimDpt3d.h>
+#include <ossim/base/ossimIrect.h>
+#include <ossim/base/ossimFilename.h>
+#include <ossim/base/ossimTrace.h>
+#include <ossim/base/ossimKeywordNames.h>
+#include <ossim/parallel/ossimMpi.h>
+#include <ossim/support_data/ossimRpfToc.h>
+#include <ossim/support_data/ossimRpfTocEntry.h>
+#include <ossim/imaging/ossimImageHandler.h>
+#include <ossim/imaging/ossimImageData.h>
+#include <ossim/imaging/ossimImageMetaData.h>
+#include <ossim/imaging/ossimImageDataFactory.h>
+#include <ossim/imaging/ossimCibCadrgTileSource.h>
+#include <ossim/imaging/ossimVirtualImageTiffWriter.h>
+#include <ossim/imaging/ossimVirtualOverviewBuilder.h>
+
+const char* ossimVirtualOverviewBuilder::OUTPUT_FRAME_SIZE_KW =
+ "output_frame_size";
+
+RTTI_DEF1(ossimVirtualOverviewBuilder,
+ "ossimVirtualOverviewBuilder",
+ ossimOverviewBuilderBase)
+
+static ossimTrace traceDebug("ossimVirtualOverviewBuilder:debug");
+
+// Property keywords.
+static const char COPY_ALL_KW[] = "copy_all_flag";
+
+#ifdef OSSIM_ID_ENABLED
+static const char OSSIM_ID[] = "$Id: ossimVirtualOverviewBuilder.cpp 14780 2009-06-25 19:32:32Z dburken $";
+#endif
+
+//*******************************************************************
+// Public Constructor:
+//*******************************************************************
+ossimVirtualOverviewBuilder::ossimVirtualOverviewBuilder()
+ :
+ ossimOverviewBuilderBase(),
+ theImageHandler(0),
+ theOutputFile(ossimFilename::NIL),
+ theOutputTileSize(OSSIM_DEFAULT_TILE_WIDTH, OSSIM_DEFAULT_TILE_HEIGHT),
+ theOutputFrameSize(OSSIM_DEFAULT_FRAME_WIDTH, OSSIM_DEFAULT_FRAME_HEIGHT),
+ theResamplerType(ossimFilterResampler::ossimFilterResampler_BOX),
+ theCopyAllFlag(false),
+ theCompressType(""),
+ theCompressQuality(0),
+ theProgressListener(0),
+ theWriterType(WRITER_TYPE_UNKNOWN)
+{
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "ossimVirtualOverviewBuilder::ossimVirtualOverviewBuilder DEBUG:\n";
+#ifdef OSSIM_ID_ENABLED
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "OSSIM_ID: "
+ << OSSIM_ID
+ << "\n";
+#endif
+ }
+
+ //---
+ // Check for a listeners. If the list is empty, add a standard out
+ // listener so that command line apps like img2rr will get some
+ // progress.
+ //---
+ if ( theListenerList.empty() )
+ {
+ theProgressListener = new ossimStdOutProgress( 0, true );
+ addListener(theProgressListener);
+ }
+
+ ossim::defaultTileSize(theOutputTileSize);
+}
+
+ossimVirtualOverviewBuilder::~ossimVirtualOverviewBuilder()
+{
+ theImageHandler = 0;
+
+ if (theProgressListener)
+ {
+ removeListener(theProgressListener);
+ delete theProgressListener;
+ theProgressListener = 0;
+ }
+}
+
+void ossimVirtualOverviewBuilder::setResampleType(
+ ossimFilterResampler::ossimFilterResamplerType resampleType )
+{
+ theResamplerType = resampleType;
+}
+
+bool ossimVirtualOverviewBuilder::buildOverview(
+ const ossimFilename& overview_file, bool copy_all )
+{
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "ossimVirtualOverviewBuilder::buildOverview DEBUG:"
+ << "\noverview file: " << overview_file.c_str()
+ << "\ncopy_all flag: " << (copy_all?"true":"false")
+ << std::endl;
+ }
+
+ theOutputFile = overview_file;
+ theCopyAllFlag = copy_all;
+
+ return execute();
+}
+
+bool ossimVirtualOverviewBuilder::execute()
+{
+ static const char MODULE[] = "ossimVirtualOverviewBuilder::execute";
+
+ if (theErrorStatus == ossimErrorCodes::OSSIM_ERROR)
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nError status has been previously set! Returning..."
+ << std::endl;
+ return false;
+ }
+
+ if ( !theImageHandler.valid() )
+ {
+ return false;
+ }
+
+ // Let's initialize our helper class...
+ ossimRefPtr<ossimVirtualImageWriter> pWriter = 0;
+ switch( theWriterType )
+ {
+ case WRITER_TYPE_TIFF:
+ pWriter = new ossimVirtualImageTiffWriter( theOutputFile,
+ theImageHandler.get(),
+ true );
+ break;
+
+ case WRITER_TYPE_UNKNOWN:
+ default:
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nError The overview type has not been set to a known value..."
+ << std::endl;
+ return false;
+ }
+
+ // Configure the writer
+ pWriter->setOutputTileSize ( theOutputTileSize );
+ pWriter->setOutputFrameSize ( theOutputFrameSize );
+ pWriter->setResampleType ( theResamplerType );
+ pWriter->setCompressionType ( theCompressType );
+ pWriter->setCompressionQuality( theCompressQuality );
+
+ // The setCopyAllFlag() call forces the building of R0 in the virtual
+ // image. Keep in ming that OSSIM does not count of number of decimation
+ // levels correctly when the virtual image is labeled as an overview in
+ // the header .ovr file but is loaded directly into OSSIM (i.e. not
+ // used as an overview but as a standalone image).
+ pWriter->setCopyAllFlag( theCopyAllFlag );
+
+ // Set the RPF frames to update to the virtual writer.
+ ossimCibCadrgTileSource* pRpf = PTR_CAST( ossimCibCadrgTileSource, theImageHandler.get() );
+ int nFrames = (int)theDirtyFrameList.size();
+ if ( pRpf != NULL && nFrames > 0 )
+ {
+ int idx;
+ for( idx=0; idx<nFrames; ++idx )
+ {
+ // Add the name of a frame to the dirty frame list of
+ // the virtual image writer.
+ pWriter->setDirtyFrame( theDirtyFrameList[idx] );
+ }
+ }
+
+ // Check the output filename. Disallow same file overview building.
+ theOutputFile = pWriter->getOutputFile();
+ if ( theImageHandler->getFilename() == theOutputFile )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "Source image file and overview file cannot be the same!"
+ << std::endl;
+ return false;
+ }
+
+ // Have the writer build the virtual overview
+ bool bResult = pWriter->execute();
+
+ /* Let's delete our helper class... */
+ pWriter = 0;
+
+ return bResult;
+}
+
+bool ossimVirtualOverviewBuilder::getCopyAllFlag() const
+{
+ return theCopyAllFlag;
+}
+
+void ossimVirtualOverviewBuilder::setCopyAllFlag( bool flag )
+{
+ theCopyAllFlag = flag;
+}
+
+ossimObject* ossimVirtualOverviewBuilder::getObject()
+{
+ return this;
+}
+
+const ossimObject* ossimVirtualOverviewBuilder::getObject() const
+{
+ return this;
+}
+
+ossimFilename ossimVirtualOverviewBuilder::getOutputFile() const
+{
+ return theOutputFile;
+}
+
+void ossimVirtualOverviewBuilder::setOutputFile( const ossimFilename& file )
+{
+ theOutputFile = file;
+}
+
+void ossimVirtualOverviewBuilder::setOutputTileSize( const ossimIpt& tileSize )
+{
+ theOutputTileSize = tileSize;
+}
+
+void ossimVirtualOverviewBuilder::setOutputFrameSize( const ossimIpt& frameSize )
+{
+ theOutputFrameSize = frameSize;
+}
+
+bool ossimVirtualOverviewBuilder::setInputSource( ossimImageHandler* imageSource )
+{
+ static const char MODULE[] =
+ "ossimVirtualOverviewBuilder::setInputSource";
+
+ theImageHandler = imageSource;
+
+ if ( !theImageHandler.valid() )
+ {
+ // Set the error...
+ theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nNull image handler pointer passed to constructor! Returning..."
+ << std::endl;
+ ossimSetError(getClassName(),
+ ossimErrorCodes::OSSIM_ERROR,
+ "%s File %s line %d\nNULL pointer passed to constructor!",
+ MODULE,
+ __FILE__,
+ __LINE__);
+ return false;
+ }
+ else if (theImageHandler->getErrorStatus() ==
+ ossimErrorCodes::OSSIM_ERROR)
+ {
+ // Set the error...
+ theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nError detected in image handler! Returning..."
+ << std::endl;
+ ossimSetError(getClassName(),
+ ossimErrorCodes::OSSIM_ERROR,
+ "%s file %s line %d\nImageHandler error detected!",
+ MODULE,
+ __FILE__,
+ __LINE__);
+ return false;
+ }
+
+ if (traceDebug())
+ {
+ CLOG << "DEBUG:"
+ << "\nTile Width: " << theOutputTileSize.x
+ << "\nTile Height: " << theOutputTileSize.y
+ << "\nFrame Width: " << theOutputFrameSize.x
+ << "\nFrame Height: " << theOutputFrameSize.y
+ << "\nSource image is tiled: "
+ << (theImageHandler->isImageTiled()?"true":"false")
+ << "\ntheImageHandler->getTileWidth(): "
+ << theImageHandler->getTileWidth()
+ << "\ntheImageHandler->getTileHeight(): "
+ << theImageHandler->getTileHeight()
+ << "\ntheImageHandler->getImageTileWidth(): "
+ << theImageHandler->getImageTileWidth()
+ << "\ntheImageHandler->getImageTileHeight(): "
+ << theImageHandler->getImageTileHeight()
+ << std::endl;
+ }
+
+ return true;
+}
+
+bool ossimVirtualOverviewBuilder::setOverviewType( const ossimString& type )
+{
+ bool result = true;
+ if ( ossimVirtualImageTiffWriter::isOverviewTypeHandled(type) )
+ {
+ theWriterType = WRITER_TYPE_TIFF;
+ theResamplerType = ossimVirtualImageTiffWriter::getResamplerType(type);
+ }
+ else
+ {
+ result = false;
+ }
+
+ return result;
+}
+
+ossimString ossimVirtualOverviewBuilder::getOverviewType() const
+{
+ static const char MODULE[] = "ossimVirtualOverviewBuilder::getOverviewType";
+
+ ossimString overviewType("unknown");
+
+ // Let's initialize our helper class...
+ switch( theWriterType )
+ {
+ case WRITER_TYPE_TIFF:
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nError The tiff-based virtual overview type has not been implemented yet..."
+ << std::endl;
+ }
+ overviewType = ossimVirtualImageTiffWriter::getOverviewType( theResamplerType );
+ break;
+
+ case WRITER_TYPE_UNKNOWN:
+ default:
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nError The overview type has not been set to a known value..."
+ << std::endl;
+ }
+ break;
+ }
+
+ return overviewType;
+}
+
+void ossimVirtualOverviewBuilder::getTypeNameList(
+ std::vector<ossimString>& typeList )const
+{
+ ossimVirtualImageTiffWriter::getTypeNameList( typeList );
+}
+
+void ossimVirtualOverviewBuilder::setProperty( ossimRefPtr<ossimProperty> prop )
+{
+ if( prop->getName() == ossimKeywordNames::COMPRESSION_QUALITY_KW )
+ {
+ theCompressQuality = prop->valueToString().toInt32();
+ }
+ else
+ if( prop->getName() == ossimKeywordNames::COMPRESSION_TYPE_KW )
+ {
+ ossimString tempStr = prop->valueToString();
+ theCompressType = tempStr.downcase();
+ }
+ else
+ if( prop->getName() == COPY_ALL_KW )
+ {
+ theCopyAllFlag = prop->valueToString().toBool();
+ }
+ else
+ if( prop->getName() == ossimKeywordNames::OUTPUT_TILE_SIZE_KW )
+ {
+ ossimIpt ipt;
+
+ ipt.toPoint( prop->valueToString() );
+
+ setOutputTileSize( ipt );
+ }
+ else
+ if( prop->getName() == ossimVirtualOverviewBuilder::OUTPUT_FRAME_SIZE_KW)
+ {
+ ossimIpt ipt;
+
+ ipt.toPoint( prop->valueToString() );
+
+ setOutputFrameSize(ipt);
+ }
+}
+
+void ossimVirtualOverviewBuilder::getPropertyNames( std::vector<ossimString>& propNames )const
+{
+ propNames.push_back( ossimKeywordNames::COMPRESSION_QUALITY_KW );
+ propNames.push_back( ossimKeywordNames::COMPRESSION_TYPE_KW );
+ propNames.push_back( COPY_ALL_KW );
+ propNames.push_back( ossimOverviewBuilderBase::OVERVIEW_STOP_DIMENSION_KW );
+}
+
+bool ossimVirtualOverviewBuilder::canConnectMyInputTo(
+ ossim_int32 index,
+ const ossimConnectableObject* obj ) const
+{
+ return ( ( index == 0 ) && PTR_CAST( ossimImageHandler, obj ) ) ? true : false;
+}
+
+void ossimVirtualOverviewBuilder::setDirtyFrame( const ossimString& name )
+{
+ // Add the name of a frame to the dirty frame list.
+ theDirtyFrameList.push_back(name);
+}
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationCoverageInfo.cpp b/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationCoverageInfo.cpp
index 5b457016d12f96c6aa070884c87f41bb9bf6c06c..a7f1d928746d127827b11cfef4c40d876db8476a 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationCoverageInfo.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationCoverageInfo.cpp
@@ -8,7 +8,7 @@
// Author: Garrett Potts
//
//**************************************************************************
-// $Id: ossimVpfAnnotationCoverageInfo.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimVpfAnnotationCoverageInfo.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <vector>
#include <algorithm>
@@ -182,7 +182,7 @@ bool ossimVpfAnnotationCoverageInfo::loadState(const ossimKeywordlist& kwl,
vector<ossimString> keys =
kwl.getSubstringKeyList( regExpression );
std::vector<int> theNumberList(keys.size());
- int offset = (ossimString(prefix)+"feature").size();
+ int offset = (int)(ossimString(prefix)+"feature").size();
int idx = 0;
for(idx = 0; idx < (int)theNumberList.size();++idx)
{
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationFeatureInfo.cpp b/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationFeatureInfo.cpp
index 8c986aeffd6e9afe426856d6da01f3bd633aff67..5d423d39a7b6e08e2db4f1c6479508d851a09fc1 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationFeatureInfo.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationFeatureInfo.cpp
@@ -35,7 +35,9 @@ ossimVpfAnnotationFeatureInfo::ossimVpfAnnotationFeatureInfo(const ossimString&
theThickness(thickness),
theFillEnabledFlag(false),
theEnabledFlag(enabledFlag),
- theFeatureType(ossimVpfAnnotationFeatureType_UNKNOWN)
+ theFeatureType(ossimVpfAnnotationFeatureType_UNKNOWN),
+ theFontInformation(),
+ theAnnotationArray(0)
{
ossimFont* font = ossimFontFactoryRegistry::instance()->getDefaultFont();
@@ -64,7 +66,7 @@ void ossimVpfAnnotationFeatureInfo::transform(ossimImageGeometry* proj)
{
for(int idx = 0; idx < (int)theAnnotationArray.size();++idx)
{
- if(theAnnotationArray[idx])
+ if(theAnnotationArray[idx].valid())
{
theAnnotationArray[idx]->transform(proj);
theAnnotationArray[idx]->computeBoundingRect();
@@ -81,7 +83,7 @@ ossimIrect ossimVpfAnnotationFeatureInfo::getBoundingProjectedRect()const
{
for(int idx = 0; idx < (int)theAnnotationArray.size();++idx)
{
- if(theAnnotationArray[idx])
+ if(theAnnotationArray[idx].valid())
{
ossimIrect tempRect = theAnnotationArray[idx]->getBoundingRect();
if(!tempRect.hasNans())
@@ -417,7 +419,7 @@ ossimVpfAnnotationFeatureInfo::ossimVpfAnnotationFeatureType ossimVpfAnnotationF
void ossimVpfAnnotationFeatureInfo::deleteAllObjects()
{
- theAnnotationArray.clear();
+ theAnnotationArray.clear();
}
void ossimVpfAnnotationFeatureInfo::setDrawingFeaturesToAnnotation()
@@ -426,10 +428,10 @@ void ossimVpfAnnotationFeatureInfo::setDrawingFeaturesToAnnotation()
{
case ossimVpfAnnotationFeatureType_POINT:
{
- ossimGeoAnnotationMultiEllipseObject* annotation = NULL;
+ ossimGeoAnnotationMultiEllipseObject* annotation = 0;
for(int idx = 0; idx < (int)theAnnotationArray.size();++idx)
{
- annotation = (ossimGeoAnnotationMultiEllipseObject*)theAnnotationArray[idx];
+ annotation = (ossimGeoAnnotationMultiEllipseObject*)theAnnotationArray[idx].get();
annotation->setColor(thePenColor.getR(),
thePenColor.getG(),
@@ -443,12 +445,12 @@ void ossimVpfAnnotationFeatureInfo::setDrawingFeaturesToAnnotation()
}
case ossimVpfAnnotationFeatureType_TEXT:
{
- ossimGeoAnnotationFontObject* annotation = NULL;
+ ossimGeoAnnotationFontObject* annotation = 0;
ossimRefPtr<ossimFont> font = ossimFontFactoryRegistry::instance()->createFont(theFontInformation);
for(int idx = 0; idx < (int)theAnnotationArray.size();++idx)
{
- annotation = (ossimGeoAnnotationFontObject*)theAnnotationArray[idx];
+ annotation = (ossimGeoAnnotationFontObject*)theAnnotationArray[idx].get();
annotation->setColor(thePenColor.getR(),
thePenColor.getG(),
thePenColor.getB());
@@ -467,10 +469,10 @@ void ossimVpfAnnotationFeatureInfo::setDrawingFeaturesToAnnotation()
}
case ossimVpfAnnotationFeatureType_LINE:
{
- ossimGeoAnnotationMultiPolyLineObject* annotation = NULL;
+ ossimGeoAnnotationMultiPolyLineObject* annotation = 0;
for(int idx = 0; idx < (int)theAnnotationArray.size();++idx)
{
- annotation = (ossimGeoAnnotationMultiPolyLineObject*)theAnnotationArray[idx];
+ annotation = (ossimGeoAnnotationMultiPolyLineObject*)theAnnotationArray[idx].get();
annotation->setColor(thePenColor.getR(),
thePenColor.getG(),
thePenColor.getB());
@@ -481,10 +483,10 @@ void ossimVpfAnnotationFeatureInfo::setDrawingFeaturesToAnnotation()
}
case ossimVpfAnnotationFeatureType_POLYGON:
{
- ossimGeoAnnotationMultiPolyObject* annotation = NULL;
+ ossimGeoAnnotationMultiPolyObject* annotation = 0;
for(int idx = 0; idx < (int)theAnnotationArray.size();++idx)
{
- annotation = (ossimGeoAnnotationMultiPolyObject*)theAnnotationArray[idx];
+ annotation = (ossimGeoAnnotationMultiPolyObject*)theAnnotationArray[idx].get();
annotation->setColor(thePenColor.getR(),
thePenColor.getG(),
thePenColor.getB());
@@ -983,112 +985,112 @@ ossimDpt *ossimVpfAnnotationFeatureInfo::getXy(vpf_table_type table,
long pos,
long *count)
{
- long i;
- ossimDpt *coord = NULL;
+ long i;
+ ossimDpt *coord = 0;
- switch (table.header[pos].type)
- {
- case 'C':
+ switch (table.header[pos].type)
+ {
+ case 'C':
{
- coordinate_type temp, *ptr;
- ptr = (coordinate_type*)get_table_element(pos, row, table, &temp, count);
- coord = new ossimDpt[*count];
- if ((*count == 1) && (ptr == (coordinate_type*)NULL))
- {
+ coordinate_type temp, *ptr;
+ ptr = (coordinate_type*)get_table_element(pos, row, table, &temp, count);
+ coord = new ossimDpt[*count];
+ if ((*count == 1) && (ptr == (coordinate_type*)0))
+ {
coord->x = (double)temp.x;
coord->y = (double)temp.y;
- }
- else
- {
+ }
+ else
+ {
for (i=0; i<*count; i++)
- {
- coord[i].x = (double)ptr[i].x;
- coord[i].y = (double)ptr[i].y;
- }
- }
- if (ptr)
- {
+ {
+ coord[i].x = (double)ptr[i].x;
+ coord[i].y = (double)ptr[i].y;
+ }
+ }
+ if (ptr)
+ {
free((char *)ptr);
- }
- break;
+ }
+ break;
}
- case 'Z':
+ case 'Z':
{
tri_coordinate_type temp, *ptr;
ptr = (tri_coordinate_type*)get_table_element (pos, row, table, &temp, count);
coord = new ossimDpt[*count];
- if ((*count == 1) && (ptr == (tri_coordinate_type*)NULL))
- {
- coord->x = (double)temp.x;
- coord->y = (double)temp.y;
- }
+ if ((*count == 1) && (ptr == (tri_coordinate_type*)0))
+ {
+ coord->x = (double)temp.x;
+ coord->y = (double)temp.y;
+ }
else
- {
- for (i=0; i<*count; i++)
- {
- coord[i].x = (double)ptr[i].x;
- coord[i].y = (double)ptr[i].y;
- }
- }
+ {
+ for (i=0; i<*count; i++)
+ {
+ coord[i].x = (double)ptr[i].x;
+ coord[i].y = (double)ptr[i].y;
+ }
+ }
if (ptr)
- {
- free ((char*)ptr);
- }
+ {
+ free ((char*)ptr);
+ }
break;
}
- case 'B':
+ case 'B':
{
- double_coordinate_type temp, *ptr;
- ptr = (double_coordinate_type*)get_table_element (pos, row, table, &temp, count);
- coord = new ossimDpt[*count];
- if ((*count == 1) && (ptr == (double_coordinate_type*)NULL))
- {
+ double_coordinate_type temp, *ptr;
+ ptr = (double_coordinate_type*)get_table_element (pos, row, table, &temp, count);
+ coord = new ossimDpt[*count];
+ if ((*count == 1) && (ptr == (double_coordinate_type*)0))
+ {
coord->x = temp.x;
coord->y = temp.y;
- }
- else
- {
+ }
+ else
+ {
for (i=0; i<*count; i++)
- {
- coord[i].x = ptr[i].x;
- coord[i].y = ptr[i].y;
- }
- }
- if (ptr)
- {
+ {
+ coord[i].x = ptr[i].x;
+ coord[i].y = ptr[i].y;
+ }
+ }
+ if (ptr)
+ {
free ((char*)ptr);
- }
- break;
+ }
+ break;
}
- case 'Y':
+ case 'Y':
{
- double_tri_coordinate_type temp, *ptr;
- ptr = (double_tri_coordinate_type*)get_table_element (pos, row, table, &temp, count);
- coord = new ossimDpt[*count];
- if ((*count == 1) && (ptr == (double_tri_coordinate_type*)NULL))
- {
+ double_tri_coordinate_type temp, *ptr;
+ ptr = (double_tri_coordinate_type*)get_table_element (pos, row, table, &temp, count);
+ coord = new ossimDpt[*count];
+ if ((*count == 1) && (ptr == (double_tri_coordinate_type*)0))
+ {
coord->x = temp.x;
coord->y = temp.y;
- }
- else
- {
+ }
+ else
+ {
for (i=0; i<*count; i++)
- {
- coord[i].x = ptr[i].x;
- coord[i].y = ptr[i].y;
- }
- }
- if (ptr)
- {
+ {
+ coord[i].x = ptr[i].x;
+ coord[i].y = ptr[i].y;
+ }
+ }
+ if (ptr)
+ {
free((char*)ptr);
- }
- break;
+ }
+ break;
}
- default:
- break;
- } /* switch type */
- return (coord);
+ default:
+ break;
+ } /* switch type */
+ return (coord);
}
int ossimVpfAnnotationFeatureInfo::readTableCellAsInt (int rowNumber,
@@ -1379,30 +1381,33 @@ void ossimVpfAnnotationFeatureInfo::readGeoPolygon(ossimGeoPolygon& polygon,
&count);
if(ptArray)
- {
- int rightFace = getEdgeKeyId( *edgTable.getVpfTableData(), row, rightFaceCol );
-
- if (rightFace == faceId) {
+ {
+ int rightFace = getEdgeKeyId( *edgTable.getVpfTableData(), row, rightFaceCol );
+
+ if (rightFace == faceId)
+ {
for(int p = 0; p < count; ++p)
- {
- if((fabs(ptArray[p].x) <= 180.0)&&
- (fabs(ptArray[p].y) <= 90.0))
- {
- polygon.addPoint(ptArray[p].y, ptArray[p].x);
- }
- }
- } else {
+ {
+ if((fabs(ptArray[p].x) <= 180.0)&&
+ (fabs(ptArray[p].y) <= 90.0))
+ {
+ polygon.addPoint(ptArray[p].y, ptArray[p].x);
+ }
+ }
+ }
+ else
+ {
for(int p = count - 1; p >= 0; --p)
- {
- if((fabs(ptArray[p].x) <= 180.0)&&
- (fabs(ptArray[p].y) <= 90.0))
- {
- polygon.addPoint(ptArray[p].y, ptArray[p].x);
- }
- }
- }
- delete [] ptArray;
- }
+ {
+ if((fabs(ptArray[p].x) <= 180.0)&&
+ (fabs(ptArray[p].y) <= 90.0))
+ {
+ polygon.addPoint(ptArray[p].y, ptArray[p].x);
+ }
+ }
+ }
+ delete [] ptArray;
+ }
}
free_row(row, *edgTable.getVpfTableData());
}
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationLibraryInfo.cpp b/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationLibraryInfo.cpp
index 4f8385afbf371ca6bd3a924cc908e7a63839497b..dcb2134f7092a85e8fd72ad2f97faeaeeb7b8ce7 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationLibraryInfo.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationLibraryInfo.cpp
@@ -1,5 +1,4 @@
//*************************************************************************
-// Copyright (C) 2004 Intelligence Data Systems, Inc. All rights reserved.
//
// License: LGPL
//
@@ -8,7 +7,7 @@
// Author: Garrett Potts
//
//**************************************************************************
-// $Id: ossimVpfAnnotationLibraryInfo.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimVpfAnnotationLibraryInfo.cpp 15836 2009-10-30 12:29:09Z dburken $
#include <algorithm>
@@ -233,7 +232,7 @@ bool ossimVpfAnnotationLibraryInfo::loadState(const ossimKeywordlist& kwl,
vector<ossimString> keys =
kwl.getSubstringKeyList( regExpression );
std::vector<int> theNumberList(keys.size());
- int offset = (ossimString(prefix)+"coverage").size();
+ int offset = (int)(ossimString(prefix)+"coverage").size();
int idx = 0;
for(idx = 0; idx < (int)theNumberList.size();++idx)
{
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationSource.cpp b/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationSource.cpp
index 847a7e920fa3ab096779f5a8b8eddffb45f79051..a63a1b4ec5d7f5ca4094036c0e006a14405e68f3 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationSource.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationSource.cpp
@@ -223,7 +223,7 @@ bool ossimVpfAnnotationSource::loadState(const ossimKeywordlist& kwl,
vector<ossimString> keys =
kwl.getSubstringKeyList( regExpression );
std::vector<int> theNumberList(keys.size());
- int offset = (ossimString(prefix)+"library").size();
+ int offset = (int)(ossimString(prefix)+"library").size();
for(idx = 0; idx < (int)theNumberList.size();++idx)
{
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimWorldFileWriter.cpp b/Utilities/otbossim/src/ossim/imaging/ossimWorldFileWriter.cpp
index d54612788e15ac9260a71caa682a452fe544ce2d..ecf4771571ba2d587451967a984537114d928a1b 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimWorldFileWriter.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimWorldFileWriter.cpp
@@ -6,7 +6,7 @@
// Author: Kenneth Melero (kmelero@sanz.com)
//
//*******************************************************************
-// $Id: ossimWorldFileWriter.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimWorldFileWriter.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimWorldFileWriter.h>
#include <ossim/base/ossimKeywordNames.h>
@@ -15,6 +15,8 @@
#include <ossim/projection/ossimMapProjection.h>
#include <ossim/projection/ossimMapProjectionInfo.h>
#include <ossim/projection/ossimProjectionFactoryRegistry.h>
+#include <ossim/projection/ossimStatePlaneProjectionInfo.h>
+#include <ossim/projection/ossimStatePlaneProjectionFactory.h>
#include <ossim/base/ossimUnitConversionTool.h>
#include <ossim/base/ossimUnitTypeLut.h>
#include <ossim/imaging/ossimImageSource.h>
@@ -84,6 +86,20 @@ bool ossimWorldFileWriter::writeFile()
// Convert projection info to proper units:
ossimDpt gsd = mapProj->getMetersPerPixel();
ossimDpt ul = mapProj->getUlEastingNorthing();
+
+ // ESH 05/2008 -- If the pcs code has been given, we
+ // make use of the implied units.
+ ossim_uint16 pcsCode = mapProj->getPcsCode();
+ if ( pcsCode > 0 )
+ {
+ const ossimStatePlaneProjectionInfo* info =
+ ossimStatePlaneProjectionFactory::instance()->getInfo(pcsCode);
+ if (info)
+ {
+ theUnits = info->getUnitType();
+ }
+ }
+
if (theUnits == OSSIM_FEET)
{
gsd.x = ossimUnitConversionTool(gsd.x, OSSIM_METERS).getFeet();
diff --git a/Utilities/otbossim/src/ossim/matrix/myexcept.cpp b/Utilities/otbossim/src/ossim/matrix/myexcept.cpp
index bd2d1fb705298c4443a05cb6a7f62c5e537db195..653de264cf59c1d73e8621b848561a3c206dfcc4 100644
--- a/Utilities/otbossim/src/ossim/matrix/myexcept.cpp
+++ b/Utilities/otbossim/src/ossim/matrix/myexcept.cpp
@@ -68,7 +68,7 @@ void BaseException::AddMessage(const char* a_what)
{
if (a_what)
{
- int l = strlen(a_what); int r = LastOne - SoFar;
+ int l = (int)strlen(a_what); int r = LastOne - SoFar;
if (l < r) { strcpy(what_error+SoFar, a_what); SoFar += l; }
else if (r > 0)
{
diff --git a/Utilities/otbossim/src/ossim/matrix/newmatex.cpp b/Utilities/otbossim/src/ossim/matrix/newmatex.cpp
index fc8618248c91ca44416700a51946cbd16e31ffe6..541696dfc6a0b72884d9b9ff0655bbd1e4f3ac15 100644
--- a/Utilities/otbossim/src/ossim/matrix/newmatex.cpp
+++ b/Utilities/otbossim/src/ossim/matrix/newmatex.cpp
@@ -4,6 +4,9 @@
#define WANT_STREAM // include.h will get stream fns
+#include <iostream>
+#include <iomanip>
+
#include <ossim/matrix/include.h>
#include <ossim/matrix/newmat.h>
@@ -277,9 +280,9 @@ ExeCounter::ExeCounter(int xl, int xf) : line(xl), fileid(xf), nexe(0) {}
ExeCounter::~ExeCounter()
{
nreports++;
- cout << "REPORT " << setw(6) << nreports << " "
- << setw(6) << fileid << " " << setw(6) << line
- << " " << setw(6) << nexe << "\n";
+ std::cout << "REPORT " << std::setw(6) << nreports << " "
+ << std::setw(6) << fileid << " " << std::setw(6) << line
+ << " " << std::setw(6) << nexe << "\n";
}
#endif
diff --git a/Utilities/otbossim/src/ossim/parallel/ossimOrthoIgen.cpp b/Utilities/otbossim/src/ossim/parallel/ossimOrthoIgen.cpp
index 12c2cb0e61a80d8b2eeeea96ab2352a57af9d603..32c2a1cf6afa2355235e3664ff0249c58a61e8a9 100644
--- a/Utilities/otbossim/src/ossim/parallel/ossimOrthoIgen.cpp
+++ b/Utilities/otbossim/src/ossim/parallel/ossimOrthoIgen.cpp
@@ -1,4 +1,13 @@
-// $Id: ossimOrthoIgen.cpp 15785 2009-10-21 14:55:04Z dburken $
+// $Id: ossimOrthoIgen.cpp 15849 2009-11-04 15:19:35Z dburken $
+
+// In Windows, standard output is ASCII by default.
+// Let's include the following in case we have
+// to change it over to binary mode.
+#if defined(_WIN32)
+#include <io.h>
+#include <fcntl.h>
+#endif
+
#include <sstream>
#include <ossim/parallel/ossimOrthoIgen.h>
#include <ossim/parallel/ossimIgen.h>
@@ -80,6 +89,7 @@ ossimOrthoIgen::ossimOrthoIgen()
theCombinerTemplate(""),
theAnnotationTemplate(""),
theWriterTemplate(""),
+ theSupplementaryDirectory(""),
theSlaveBuffers("2"),
theCutOriginType(ossimOrthoIgen::OSSIM_CENTER_ORIGIN),
theCutOrigin(ossim::nan(), ossim::nan()),
@@ -132,6 +142,8 @@ void ossimOrthoIgen::addArguments(ossimArgumentParser& argumentParser)
argumentParser.getApplicationUsage()->addCommandLineOption("--hist-auto-minmax","uses the automatic search for the best min and max clip values");
+ argumentParser.getApplicationUsage()->addCommandLineOption("--supplementary-directory","Specify the supplementary directory path where overviews are located");
+
argumentParser.getApplicationUsage()->addCommandLineOption("--scale-to-8-bit","Scales output to eight bits if not already.");
argumentParser.getApplicationUsage()->addCommandLineOption("--writer-prop","Passes a name=value pair to the writer for setting it's property. Any number of these can appear on the line.");
@@ -273,6 +285,20 @@ void ossimOrthoIgen::initialize(ossimArgumentParser& argumentParser)
if (argumentParser.read("--stdout"))
{
+#if defined(_WIN32)
+ // In Windows, cout is ASCII by default.
+ // Let's change it over to binary mode.
+ int result = _setmode( _fileno(stdout), _O_BINARY );
+ if( result == -1 )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "ossimOrthoIgen::initialize WARNING:"
+ << "\nCannot set standard output mode to binary."
+ << std::endl;
+ return;
+ }
+#endif
+
theStdoutFlag = true;
}
@@ -351,6 +377,10 @@ void ossimOrthoIgen::initialize(ossimArgumentParser& argumentParser)
{
theResamplerType = tempString;
}
+ if(argumentParser.read("--supplementary-directory", stringParam))
+ {
+ theSupplementaryDirectory = ossimFilename(tempString);
+ }
if(traceDebug())
{
ossimNotify(ossimNotifyLevel_DEBUG)
@@ -407,11 +437,8 @@ bool ossimOrthoIgen::execute()
{
if (traceDebug())
{
- ossimNotify(ossimNotifyLevel_DEBUG)
- << "ossimOrthoIgen::execute DEBUG: setupIgenKwl caught exception."
- << std::endl;
+ ossimNotify(ossimNotifyLevel_DEBUG) << e.what() << std::endl;
}
-
throw; // re-throw exception
}
@@ -426,7 +453,7 @@ bool ossimOrthoIgen::execute()
}
}
}
-
+
ossimIgen *igen = new ossimIgen;
igen->initialize(igenKwl);
@@ -436,18 +463,15 @@ bool ossimOrthoIgen::execute()
}
catch(const ossimException& e)
{
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG) << e.what() << std::endl;
+ }
delete igen;
igen = 0;
throw; // re-throw
}
-// if(ossimMpi::instance()->getRank() == 0)
-// {
-// stop = ossimMpi::instance()->getTime();
-// ossimNotify(ossimNotifyLevel_NOTICE)
-// << "Time elapsed: " << (stop-start)
-// << std::endl;
-// }
delete igen;
igen = 0;
@@ -496,6 +520,7 @@ void ossimOrthoIgen::setDefaultValues()
theResamplerType = "nearest neighbor";
theTilingTemplate = "";
theTilingFilename = "";
+ theSupplementaryDirectory = "";
theSlaveBuffers = "2";
clearFilenameList();
theLowPercentClip = ossim::nan();
@@ -593,9 +618,7 @@ void ossimOrthoIgen::setupIgenKwl(ossimKeywordlist& kwl)
{
if (traceDebug())
{
- ossimNotify(ossimNotifyLevel_DEBUG)
- << "ossimOrthoIgen::execute DEBUG: setupView through exception!"
- << std::endl;
+ ossimNotify(ossimNotifyLevel_DEBUG) << e.what() << std::endl;
}
throw; // re-throw exception
}
@@ -670,7 +693,7 @@ void ossimOrthoIgen::setupIgenKwl(ossimKeywordlist& kwl)
chain = tempChain;
}
- ossim_uint32 fileSize = theFilenames.size()-1;
+ ossim_uint32 fileSize = (ossim_uint32)theFilenames.size()-1;
ossim_uint32 idx;
ossim_uint32 chainIdx = 1;
ossimRefPtr<ossimImageChain> rootChain = new ossimImageChain;
@@ -684,6 +707,13 @@ void ossimOrthoIgen::setupIgenKwl(ossimKeywordlist& kwl)
ossimHistogramRemapper* histRemapper = 0;
if(handler.valid())
{
+ if ( theSupplementaryDirectory.empty() == false )
+ {
+ handler->setSupplementaryDirectory( theSupplementaryDirectory );
+ ossimFilename overviewFilename = handler->getFilenameWithThisExtension(ossimString(".ovr"));
+ handler->openOverview( overviewFilename );
+ }
+
std::vector<ossim_uint32> entryList;
if(theFilenames[idx].theEntry >-1)
{
@@ -699,6 +729,13 @@ void ossimOrthoIgen::setupIgenKwl(ossimKeywordlist& kwl)
{
ossimImageHandler* h = (ossimImageHandler*)handler->dup();
h->setCurrentEntry(entryList[entryIdx]);
+ if ( theSupplementaryDirectory.empty() == false )
+ {
+ h->setSupplementaryDirectory( theSupplementaryDirectory );
+ ossimFilename overviewFilename = h->getFilenameWithThisExtension(ossimString(".ovr"));
+ h->openOverview( overviewFilename );
+ }
+
ossimImageChain* tempChain = (ossimImageChain*)chain->dup();
tempChain->addLast(h);
if( ( (ossim::isnan(theHighPercentClip) == false) &&
@@ -810,9 +847,7 @@ void ossimOrthoIgen::setupIgenKwl(ossimKeywordlist& kwl)
{
if (traceDebug())
{
- ossimNotify(ossimNotifyLevel_DEBUG)
- << "ossimOrthoIgen::execute DEBUG: setupWriter returned false..."
- << std::endl;
+ ossimNotify(ossimNotifyLevel_DEBUG) << e.what() << std::endl;
}
throw; // re-throw exception
}
@@ -1169,6 +1204,13 @@ void ossimOrthoIgen::setupView(ossimKeywordlist& kwl)
throw(ossimException(errMsg));
}
+ if ( theSupplementaryDirectory.empty() == false )
+ {
+ handler->setSupplementaryDirectory( theSupplementaryDirectory );
+ ossimFilename overviewFilename = handler->getFilenameWithThisExtension(ossimString(".ovr"));
+ handler->openOverview( overviewFilename );
+ }
+
const ossimProjection* inputProj = 0;
const ossimImageGeometry* inputGeom = handler->getImageGeometry();
if (inputGeom)
diff --git a/Utilities/otbossim/src/ossim/plugin/ossimSharedPluginRegistry.cpp b/Utilities/otbossim/src/ossim/plugin/ossimSharedPluginRegistry.cpp
index 68ba8b2e0eb18c1d4414d57510db5118efe1b8fd..d584d39176e8d78f0e319e15bb563dd958d912d0 100644
--- a/Utilities/otbossim/src/ossim/plugin/ossimSharedPluginRegistry.cpp
+++ b/Utilities/otbossim/src/ossim/plugin/ossimSharedPluginRegistry.cpp
@@ -6,7 +6,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimSharedPluginRegistry.cpp 14046 2009-03-03 02:23:38Z gpotts $
+// $Id: ossimSharedPluginRegistry.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <algorithm>
#include <iterator>
#include <ossim/plugin/ossimSharedPluginRegistry.h>
@@ -179,7 +179,7 @@ const ossimPluginLibrary* ossimSharedPluginRegistry::getPlugin(ossim_uint32 idx)
ossim_uint32 ossimSharedPluginRegistry::getNumberOfPlugins()const
{
- return theLibraryList.size();
+ return (ossim_uint32)theLibraryList.size();
}
diff --git a/Utilities/otbossim/src/ossim/projection/ossimBngProjection.cpp b/Utilities/otbossim/src/ossim/projection/ossimBngProjection.cpp
index 1f1d846fbffca52d23e4a4eab92e54b919ac9a4f..21a0be01ecfcfcc8afafd79b0147defcfd781535 100644
--- a/Utilities/otbossim/src/ossim/projection/ossimBngProjection.cpp
+++ b/Utilities/otbossim/src/ossim/projection/ossimBngProjection.cpp
@@ -6,7 +6,7 @@
// Author: Garrett Potts
//
//*******************************************************************
-// $Id: ossimBngProjection.cpp 11949 2007-10-31 14:33:29Z gpotts $
+// $Id: ossimBngProjection.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/projection/ossimBngProjection.h>
#include <ossim/projection/ossimTranmerc.h>
#include <ossim/base/ossimDatumFactory.h>
@@ -183,7 +183,7 @@ long ossimBngProjection::Find_Index (char letter,
*/
ossim_uint32 i = 0;
ossim_uint32 not_Found = 1;
- ossim_uint32 length = strlen(letter_Array);
+ ossim_uint32 length = (ossim_uint32)strlen(letter_Array);
ossim_uint32 Error_Code = BNG_NO_ERROR;
while ((i < length) && (not_Found))
@@ -267,7 +267,7 @@ long ossimBngProjection::Break_BNG_String (char* BNG,
long num_digits = 0;
long num_letters;
long temp_error = 0;
- long length = strlen(BNG);
+ long length = (long)strlen(BNG);
long error_code = BNG_NO_ERROR;
string_Broken = 1;
diff --git a/Utilities/otbossim/src/ossim/projection/ossimIkonosRpcModel.cpp b/Utilities/otbossim/src/ossim/projection/ossimIkonosRpcModel.cpp
index 854745f7b278deeea127273b050a1cbf3877a5d2..4da387c6cc8e6b17593afecf4f95287c3a425a74 100644
--- a/Utilities/otbossim/src/ossim/projection/ossimIkonosRpcModel.cpp
+++ b/Utilities/otbossim/src/ossim/projection/ossimIkonosRpcModel.cpp
@@ -13,7 +13,7 @@
// LIMITATIONS: None.
//
//*****************************************************************************
-// $Id: ossimIkonosRpcModel.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimIkonosRpcModel.cpp 15828 2009-10-28 13:11:31Z dburken $
#include <cstdlib>
#include <ossim/projection/ossimIkonosRpcModel.h>
@@ -425,14 +425,24 @@ void ossimIkonosRpcModel::parseMetaData(const ossimFilename& data_file)
//*****************************************************************************
bool ossimIkonosRpcModel::parseHdrData(const ossimFilename& data_file)
{
- if (traceExec()) ossimNotify(ossimNotifyLevel_DEBUG) << "DEBUG ossimIkonosRpcModel::parseHdrData(data_file): entering..." << std::endl;
+ if (traceExec())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "DEBUG ossimIkonosRpcModel::parseHdrData(data_file): entering..."
+ << std::endl;
+ }
- if( !data_file.exists() )
- {
- if (traceExec()) ossimNotify(ossimNotifyLevel_WARN)<< "ossimIkonosRpcModel::parseHdrData(data_file) WARN:"<< "\nrpc data file <" << data_file << ">. "<< "doesn't exist..." << std::endl;
+ if( !data_file.exists() )
+ {
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "ossimIkonosRpcModel::parseHdrData(data_file) WARN:"
+ << "\nrpc data file <" << data_file << ">. "<< "doesn't exist..."
+ << std::endl;
+ }
return false;
- }
-
+ }
FILE* fptr = fopen (data_file, "r");
if (!fptr)
@@ -543,24 +553,36 @@ bool ossimIkonosRpcModel::parseHdrData(const ossimFilename& data_file)
//*****************************************************************************
void ossimIkonosRpcModel::parseRpcData(const ossimFilename& data_file)
{
- if (traceExec()) ossimNotify(ossimNotifyLevel_DEBUG) << "DEBUG ossimIkonosRpcModel::parseRpcData(data_file): entering..." << std::endl;
-
+ if (traceExec())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "DEBUG ossimIkonosRpcModel::parseRpcData(data_file): entering..."
+ << std::endl;
+ }
+
if( !data_file.exists() )
- {
- if (traceExec()) ossimNotify(ossimNotifyLevel_WARN)<< "ossimIkonosRpcModel::parseRpcData(data_file) WARN:"<< "\nrpc data file <" << data_file << ">. "<< "doesn't exist..." << std::endl;
+ {
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "ossimIkonosRpcModel::parseRpcData(data_file) WARN:"
+ << "\nrpc data file <" << data_file << ">. "<< "doesn't exist..."
+ << std::endl;
+ }
return;
}
-
+
//***
// The Ikonos RPC data file is conveniently formatted as KWL file:
//***
ossimKeywordlist kwl (data_file);
if (kwl.getErrorStatus())
{
- ossimNotify(ossimNotifyLevel_FATAL) << "ERROR ossimIkonosRpcModel::parseRpcData(data_file): Could not open RPC data file <" << data_file << ">. "
- << "Aborting..." << std::endl;
+ ossimNotify(ossimNotifyLevel_FATAL)
+ << "ERROR ossimIkonosRpcModel::parseRpcData(data_file): Could not open RPC data file <" << data_file << ">. " << "Aborting..." << std::endl;
theErrorStatus++;
- if (traceExec()) ossimNotify(ossimNotifyLevel_DEBUG) << "returning with error..." << std::endl;
+ if (traceExec()) ossimNotify(ossimNotifyLevel_DEBUG)
+ << "returning with error..." << std::endl;
return;
}
@@ -658,6 +680,12 @@ void ossimIkonosRpcModel::parseRpcData(const ossimFilename& data_file)
<< keyword << std::endl;
return;
}
+ else
+ {
+ // copy ossimIkonosMetada-sensor into ossimIkonosRpcModel-sensorId
+ theSensorID = theSupportData->getSensorID();
+ }
+
theLatScale = atof(buf);
diff --git a/Utilities/otbossim/src/ossim/projection/ossimPolynomProjection.cpp b/Utilities/otbossim/src/ossim/projection/ossimPolynomProjection.cpp
index a8ff9fb6053cbec66d66b71f3ea2e65452154509..5962b90a0c3fdf57595deefbd6be3760d28ffb39 100644
--- a/Utilities/otbossim/src/ossim/projection/ossimPolynomProjection.cpp
+++ b/Utilities/otbossim/src/ossim/projection/ossimPolynomProjection.cpp
@@ -526,7 +526,7 @@ ossim_uint32
ossimPolynomProjection::degreesOfFreedom()const
{
//is number of desired monoms * 2
- return theExpSet.size() * 2;
+ return (ossim_uint32)theExpSet.size() * 2;
}
bool
diff --git a/Utilities/otbossim/src/ossim/projection/ossimRpcSolver.cpp b/Utilities/otbossim/src/ossim/projection/ossimRpcSolver.cpp
index b20b5fb9aa1edd7fbbafbbdfb3fb00d7ef33eb22..148869c5b14d4b25e725d23eb968ba9d5dd0b07e 100644
--- a/Utilities/otbossim/src/ossim/projection/ossimRpcSolver.cpp
+++ b/Utilities/otbossim/src/ossim/projection/ossimRpcSolver.cpp
@@ -8,7 +8,7 @@
// AUTHOR: Garrett Potts
//
//*****************************************************************************
-// $Id: ossimRpcSolver.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimRpcSolver.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <cstdlib>
#include <ctime>
@@ -546,7 +546,7 @@ void ossimRpcSolver::solveCoefficients(NEWMAT::ColumnVector& coeff,
ossim_uint32 idx = 0;
NEWMAT::Matrix m;
- NEWMAT::ColumnVector r(f.size());
+ NEWMAT::ColumnVector r((int)f.size());
for(idx = 0; idx < f.size(); ++idx)
{
@@ -554,7 +554,7 @@ void ossimRpcSolver::solveCoefficients(NEWMAT::ColumnVector& coeff,
}
NEWMAT::ColumnVector tempCoeff;
- NEWMAT::DiagonalMatrix weights(f.size());
+ NEWMAT::DiagonalMatrix weights((int)f.size());
NEWMAT::ColumnVector denominator(20);
// initialize the weight matrix to the identity
diff --git a/Utilities/otbossim/src/ossim/projection/ossimStatePlaneProjectionFactory.cpp b/Utilities/otbossim/src/ossim/projection/ossimStatePlaneProjectionFactory.cpp
index 45e8a0a5bb215c872bf47a95ac185bd9872d9f81..7d099479fa3d9bf25a050408e25d92efc360e404 100644
--- a/Utilities/otbossim/src/ossim/projection/ossimStatePlaneProjectionFactory.cpp
+++ b/Utilities/otbossim/src/ossim/projection/ossimStatePlaneProjectionFactory.cpp
@@ -4,7 +4,7 @@
//
// Author: Garrett Potts
//*******************************************************************
-// $Id: ossimStatePlaneProjectionFactory.cpp 15080 2009-08-15 19:32:07Z dburken $
+// $Id: ossimStatePlaneProjectionFactory.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <fstream>
#include <sstream>
@@ -411,10 +411,13 @@ bool ossimStatePlaneProjectionFactory::findLine(
return false;
}
+#define EPSG_CODE_MAX 32767
bool ossimStatePlaneProjectionFactory::findLine(
const ossimString& name, std::vector<ossimString> &result) const
{
OpenThreads::ScopedReadLock lock(theMutex);
+ std::string savedLine;
+ bool bSavedLine = false;
// Iterate throught the cvs files to try and find pcs code.
std::vector<ossimFilename>::const_iterator i = theCsvFiles.begin();
while (i != theCsvFiles.end())
@@ -449,11 +452,28 @@ bool ossimStatePlaneProjectionFactory::findLine(
if (result[NAME_INDEX] == name)
{
- return true;
+ // ESH 05/2008 -- Return EPSG codes preferentially
+ if ( result[PCS_CODE_INDEX].toInt() < EPSG_CODE_MAX )
+ return true;
+ else
+ {
+ savedLine.assign(line.c_str());
+ bSavedLine = true;
+ break;
+ }
}
}
++i; // go to next csv file
}
+
+ // ESH 05/2008 -- If we've found an ESRI-style or user-defined
+ // pcs code and nothing else, we'll try to make do with it.
+ if ( bSavedLine == true )
+ {
+ // Split the line between commas stripping quotes.
+ splitLine(savedLine, result);
+ return ( (result.size() == KEYS_SIZE) && (result[NAME_INDEX] == name) );
+ }
return false;
}
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimEnviHeader.cpp b/Utilities/otbossim/src/ossim/support_data/ossimEnviHeader.cpp
index f29fe5354f915c941854beb670e14478389dfdde..95c18e5beb314de8cb24321db160d12fbdff88fc 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimEnviHeader.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimEnviHeader.cpp
@@ -10,7 +10,7 @@
// Images) header file.
//
//----------------------------------------------------------------------------
-// $Id: ossimEnviHeader.cpp 11347 2007-07-23 13:01:59Z gpotts $
+// $Id: ossimEnviHeader.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <fstream>
#include <string>
@@ -265,7 +265,7 @@ std::ostream& ossimEnviHeader::print(std::ostream& out) const
{
out << "\nband names = {";
ossim_uint32 i;
- ossim_uint32 size = theBandName.size();
+ ossim_uint32 size = (ossim_uint32)theBandName.size();
for (i = 0; i < size; ++i)
{
out << "\n " << theBandName[i];
@@ -301,7 +301,7 @@ std::ostream& ossimEnviHeader::print(std::ostream& out) const
{
out << "\nwavelength = {\n";
ossim_uint32 i;
- ossim_uint32 size = theWavelength.size();
+ ossim_uint32 size = (ossim_uint32)theWavelength.size();
for (i = 0; i < size; ++i)
{
out << theWavelength[i];
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimFfL7.cpp b/Utilities/otbossim/src/ossim/support_data/ossimFfL7.cpp
index 7dbc220fe847212d12ab8a590a14591575c8e369..c00bb13f09b363e804a0b52b45495f31de926c32 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimFfL7.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimFfL7.cpp
@@ -8,7 +8,7 @@
// Description: Container class for LandSat7 Fast Format header files.
//
//********************************************************************
-// $Id: ossimFfL7.cpp 13663 2008-10-02 18:47:32Z gpotts $
+// $Id: ossimFfL7.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
// #include <cstdlib>
@@ -692,7 +692,7 @@ unsigned int ossimFfL7::getBandCount()const
{
ossimString tmp(theBandsPresentString);
tmp.trim(); //remove spaces
- return tmp.length();
+ return (unsigned int)tmp.length();
// return strlen(tmp.chars()); //beurk! should implement length in ossimString
}
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimGeoTiff.cpp b/Utilities/otbossim/src/ossim/support_data/ossimGeoTiff.cpp
index 4cd33ecf20b9f8ed47d0eeeade4521f1ce0b0ad4..e9be23b9f047507f70feb787905224c624bd1a55 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimGeoTiff.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimGeoTiff.cpp
@@ -9,7 +9,7 @@
// information.
//
//***************************************************************************
-// $Id: ossimGeoTiff.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimGeoTiff.cpp 15868 2009-11-06 22:30:38Z dburken $
#include <ossim/support_data/ossimGeoTiff.h>
#include <ossim/base/ossimTrace.h>
@@ -23,6 +23,7 @@
#include <ossim/base/ossimNotifyContext.h>
#include <ossim/base/ossimNotifyContext.h>
#include <ossim/projection/ossimMapProjection.h>
+#include <ossim/projection/ossimProjection.h>
#include <ossim/projection/ossimUtmProjection.h>
#include <ossim/projection/ossimPcsCodeProjectionFactory.h>
#include <ossim/projection/ossimStatePlaneProjectionFactory.h>
@@ -50,7 +51,7 @@ static const ossimGeoTiffDatumLut DATUM_LUT;
OpenThreads::Mutex ossimGeoTiff::theMutex;
#ifdef OSSIM_ID_ENABLED
-static const char OSSIM_ID[] = "$Id: ossimGeoTiff.cpp 15766 2009-10-20 12:37:09Z gpotts $";
+static const char OSSIM_ID[] = "$Id: ossimGeoTiff.cpp 15868 2009-11-06 22:30:38Z dburken $";
#endif
//---
@@ -377,7 +378,7 @@ bool ossimGeoTiff::writeTags(TIFF* tifPtr,
gcs = USER_DEFINED;
std::ostringstream os;
- os << "IMAGINE GeoTIFF Support\nCopyright 1991 - 2001 by ERDAS, Inc. All Rights Reserved\n@(#)$RCSfile$ $Revision: 15766 $ $Date: 2009-10-20 20:37:09 +0800 (Tue, 20 Oct 2009) $\nUnable to match Ellipsoid (Datum) to a GeographicTypeGeoKey value\nEllipsoid = Clarke 1866\nDatum = NAD27 (CONUS)";
+ os << "IMAGINE GeoTIFF Support\nCopyright 1991 - 2001 by ERDAS, Inc. All Rights Reserved\n@(#)$RCSfile$ $Revision: 15868 $ $Date: 2009-11-07 06:30:38 +0800 (Sat, 07 Nov 2009) $\nUnable to match Ellipsoid (Datum) to a GeographicTypeGeoKey value\nEllipsoid = Clarke 1866\nDatum = NAD27 (CONUS)";
GTIFKeySet(gtif,
GeogCitationGeoKey,
@@ -853,10 +854,118 @@ bool ossimGeoTiff::writeTags(TIFF* tifPtr,
return true;
}
-bool ossimGeoTiff::readTags(const ossimFilename& file, ossim_uint32 entryIdx)
+bool ossimGeoTiff::writeJp2GeotiffBox(const ossimFilename& tmpFile,
+ const ossimIrect& rect,
+ const ossimProjection* proj,
+ std::vector<ossim_uint8>& buf)
{
- OpenThreads::ScopedLock<OpenThreads::Mutex> lock(theMutex);
+ //---
+ // Snip from The "GeoTIFF Box" Specification for JPEG 2000 Metadata:
+ // This box contains a valid GeoTIFF image. The image is "degenerate", in
+ // that it represents a very simple image with specific constraints:
+ // . the image height and width are both 1
+ // . the datatype is 8-bit
+ // . the colorspace is grayscale
+ // . the (single) pixel must have a value of 0 for its (single) sample
+ //
+ // NOTE: It also states little endian but I think libtiff writes whatever
+ // endianesss the host is.
+ //
+ // Also assuming class tiff for now. Not big tiff.
+ //---
+ bool result = true;
+
+ TIFF* tiff = XTIFFOpen(tmpFile.c_str(), "w");
+ if (tiff)
+ {
+ // Write the projection info out.
+ ossimMapProjection* mapProj = PTR_CAST(ossimMapProjection, proj);
+ if(mapProj)
+ {
+ ossimRefPtr<ossimMapProjectionInfo> projectionInfo
+ = new ossimMapProjectionInfo(mapProj, rect);
+ ossimGeoTiff::writeTags(tiff, projectionInfo, false);
+ }
+
+ // Basic tiff tags.
+ TIFFSetField( tiff, TIFFTAG_IMAGEWIDTH, 1 );
+ TIFFSetField( tiff, TIFFTAG_IMAGELENGTH, 1 );
+ TIFFSetField( tiff, TIFFTAG_BITSPERSAMPLE, 8 );
+ TIFFSetField( tiff, TIFFTAG_SAMPLESPERPIXEL, 1 );
+ TIFFSetField( tiff, TIFFTAG_ROWSPERSTRIP, 1 );
+ TIFFSetField( tiff, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG );
+ TIFFSetField( tiff, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK );
+ // One pixel image:
+ ossim_uint8 pixel = 0;
+ TIFFWriteEncodedStrip( tiff, 0, (char *) &pixel, 1 );
+
+ TIFFWriteDirectory( tiff );
+ XTIFFClose( tiff );
+
+ // Get the size. Note 16 bytes added for the JP2 UUID:
+ const std::vector<ossim_uint8>::size_type UUID_SIZE = 16;
+ const std::vector<ossim_uint8>::size_type BOX_SIZE = UUID_SIZE +
+ static_cast<std::vector<ossim_uint8>::size_type>(tmpFile.fileSize());
+
+ // Create the buffer.
+ buf.resize( BOX_SIZE );
+
+ if ( BOX_SIZE == buf.size() )
+ {
+ const ossim_uint8 GEOTIFF_UUID[UUID_SIZE] =
+ {
+ 0xb1, 0x4b, 0xf8, 0xbd,
+ 0x08, 0x3d, 0x4b, 0x43,
+ 0xa5, 0xae, 0x8c, 0xd7,
+ 0xd5, 0xa6, 0xce, 0x03
+ };
+
+ // Copy the UUID.
+ std::vector<ossim_uint8>::size_type i;
+ for (i = 0; i < UUID_SIZE; ++i)
+ {
+ buf[i] = GEOTIFF_UUID[i];
+ }
+
+ // Copy the tiff.
+ std::ifstream str;
+ str.open(tmpFile.c_str(), ios::in | ios::binary);
+ if (str.is_open())
+ {
+ char ch;
+ for (; i < BOX_SIZE; ++i)
+ {
+ str.get(ch);
+ buf[i] = static_cast<ossim_uint8>(ch);
+ }
+ }
+ }
+ else
+ {
+ result = false;
+ }
+
+ // Remove the temp file.
+ tmpFile.remove();
+
+ }
+ else
+ {
+ result = false;
+
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "ossimGeoTiff::writeJp2GeotiffBox ERROR:\n"
+ << "Could not open " << tmpFile << std::endl;
+ }
+ }
+ return result;
+}
+
+bool ossimGeoTiff::readTags(const ossimFilename& file, ossim_uint32 entryIdx)
+{
bool result = false;
TIFF* tiff = XTIFFOpen(file.c_str(), "r");
@@ -1307,7 +1416,7 @@ bool ossimGeoTiff::addImageGeometry(ossimKeywordlist& kwl,
ossimString copyPrefix(prefix);
double x_tie_point = 0.0;
double y_tie_point = 0.0;
- ossim_uint32 tieCount = theTiePoint.size()/6;
+ ossim_uint32 tieCount = (ossim_uint32)theTiePoint.size()/6;
if( (theScale.size() == 3) && (tieCount == 1))
{
@@ -2215,7 +2324,7 @@ bool ossimGeoTiff::getModelTransformFlag() const
void ossimGeoTiff::getTieSet(ossimTieGptSet& tieSet) const
{
ossim_uint32 idx = 0;
- ossim_uint32 tieCount = theTiePoint.size()/6;
+ ossim_uint32 tieCount = (ossim_uint32)theTiePoint.size()/6;
const double* tiePointsPtr = &theTiePoint.front();
double offset = 0;
if (hasOneBasedTiePoints())
@@ -2249,7 +2358,7 @@ bool ossimGeoTiff::hasOneBasedTiePoints() const
ossim_float64 maxX = 0.0;
ossim_float64 maxY = 0.0;
- const ossim_uint32 SIZE = theTiePoint.size();
+ const ossim_uint32 SIZE = (ossim_uint32)theTiePoint.size();
ossim_uint32 tieIndex = 0;
while (tieIndex < SIZE)
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimIkonosMetaData.cpp b/Utilities/otbossim/src/ossim/support_data/ossimIkonosMetaData.cpp
index 1e29290bb0dfcca2d3fcd883a29c51719e4d47bf..bd8f108e34dddf6f51de613170fac55688240674 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimIkonosMetaData.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimIkonosMetaData.cpp
@@ -11,7 +11,7 @@
// This class parses a Space Imaging Ikonos meta data file.
//
//********************************************************************
-// $Id: ossimIkonosMetaData.cpp 14546 2009-05-18 18:58:05Z dburken $
+// $Id: ossimIkonosMetaData.cpp 15828 2009-10-28 13:11:31Z dburken $
#include <cstdio>
#include <iostream>
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimNitfEngrdaTag.cpp b/Utilities/otbossim/src/ossim/support_data/ossimNitfEngrdaTag.cpp
index f0c8a6e75749d30a793f57357622246587f7cffa..9541d1d613e240ee4927d93001230594ac30a5bf 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimNitfEngrdaTag.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimNitfEngrdaTag.cpp
@@ -110,7 +110,7 @@ void ossimNitfEngrdaTag::parseStream(std::istream& in)
// ENGDATA - Engineering Data
element.theEngDat.resize(engDatC);
- in.read((char*)&(element.theEngDat.front()), element.theEngDat.size());
+ in.read((char*)&(element.theEngDat.front()), (std::streamsize)element.theEngDat.size());
theTreLength += engDatC;
theData.push_back(element);
@@ -136,7 +136,7 @@ void ossimNitfEngrdaTag::writeStream(std::ostream& out)
out.write(s.data(), ENGLN_SIZE);
// ENGLBL - label field
- out.write(theData[i].theEngLbl.data(), theData[i].theEngLbl.size());
+ out.write(theData[i].theEngLbl.data(), (std::streamsize)theData[i].theEngLbl.size());
// ENGMTXC - data column count
getValueAsString(theData[i].theEngMtxC, ENGMTXC_SIZE, s);
@@ -161,7 +161,7 @@ void ossimNitfEngrdaTag::writeStream(std::ostream& out)
// ENGDATA - Engineering Data NOTE: should be big endian...
out.write((char*)&(theData[i].theEngDat.front()),
- theData[i].theEngDat.size());
+ (std::streamsize)theData[i].theEngDat.size());
} // Matches: for (ossim_uint16 i = 0; i < ELEMENT_COUNT; ++i)
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimNitfFileHeader.cpp b/Utilities/otbossim/src/ossim/support_data/ossimNitfFileHeader.cpp
index 463c7321fdceef2b43340b0fd79f141f66e250ed..e617963bc44d8157655f0e3e108e4f189e4595f7 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimNitfFileHeader.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimNitfFileHeader.cpp
@@ -9,7 +9,7 @@
// Description: Nitf support class
//
//********************************************************************
-// $Id: ossimNitfFileHeader.cpp 14241 2009-04-07 19:59:23Z dburken $
+// $Id: ossimNitfFileHeader.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/support_data/ossimNitfFileHeader.h>
#include <ossim/base/ossimContainerProperty.h>
#include <iostream>
@@ -116,7 +116,7 @@ bool ossimNitfFileHeader::getTagInformation(ossimNitfTagInformation& tag,
int ossimNitfFileHeader::getNumberOfTags()const
{
- return theTagList.size();
+ return (int)theTagList.size();
}
ossim_uint32 ossimNitfFileHeader::getTotalTagLength()const
@@ -142,7 +142,7 @@ ossimRefPtr<ossimProperty> ossimNitfFileHeader::getProperty(const ossimString& n
if(name == TAGS_KW)
{
- ossim_uint32 idxMax = theTagList.size();
+ ossim_uint32 idxMax = (ossim_uint32)theTagList.size();
if(idxMax > 0)
{
ossimContainerProperty* containerProperty = new ossimContainerProperty;
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimNitfFileHeaderV2_0.cpp b/Utilities/otbossim/src/ossim/support_data/ossimNitfFileHeaderV2_0.cpp
index a6feb8621f00f4eb498627f6d6442110ba7384c2..4b713712b077b0c2befbef5c08c86b95f57d427c 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimNitfFileHeaderV2_0.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimNitfFileHeaderV2_0.cpp
@@ -9,7 +9,7 @@
// Description: Nitf support class
//
//********************************************************************
-// $Id: ossimNitfFileHeaderV2_0.cpp 14662 2009-06-07 16:15:23Z dburken $
+// $Id: ossimNitfFileHeaderV2_0.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <sstream>
@@ -980,17 +980,17 @@ bool ossimNitfFileHeaderV2_0::isEncrypted()const
ossim_int32 ossimNitfFileHeaderV2_0::getNumberOfImages()const
{
- return theNitfImageInfoRecords.size();
+ return (ossim_int32)theNitfImageInfoRecords.size();
}
ossim_int32 ossimNitfFileHeaderV2_0::getNumberOfLabels()const
{
- return (theNitfLabelInfoRecords.size());
+ return ((ossim_int32)theNitfLabelInfoRecords.size());
}
ossim_int32 ossimNitfFileHeaderV2_0::getNumberOfSymbols()const
{
- return (theNitfSymbolInfoRecords.size());
+ return ((ossim_int32)theNitfSymbolInfoRecords.size());
}
ossim_int32 ossimNitfFileHeaderV2_0::getNumberOfGraphics()const
@@ -1000,12 +1000,12 @@ ossim_int32 ossimNitfFileHeaderV2_0::getNumberOfGraphics()const
ossim_int32 ossimNitfFileHeaderV2_0::getNumberOfTextSegments()const
{
- return theNitfTextInfoRecords.size();
+ return (ossim_int32)theNitfTextInfoRecords.size();
}
ossim_int32 ossimNitfFileHeaderV2_0::getNumberOfDataExtSegments()const
{
- return theNitfDataExtSegInfoRecords.size();
+ return (ossim_int32)theNitfDataExtSegInfoRecords.size();
}
ossim_int32 ossimNitfFileHeaderV2_0::getHeaderSize()const
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimNitfFileHeaderV2_1.cpp b/Utilities/otbossim/src/ossim/support_data/ossimNitfFileHeaderV2_1.cpp
index a07c25a0481165bcec021dce227c81d87c421a44..725e2568028ede23e3410b702ecae6864560412c 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimNitfFileHeaderV2_1.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimNitfFileHeaderV2_1.cpp
@@ -9,7 +9,7 @@
// Description: Nitf support class
//
//********************************************************************
-// $Id: ossimNitfFileHeaderV2_1.cpp 15411 2009-09-11 19:46:32Z dburken $
+// $Id: ossimNitfFileHeaderV2_1.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <iostream>
#include <iomanip>
@@ -674,7 +674,7 @@ bool ossimNitfFileHeaderV2_1::isEncrypted()const
ossim_int32 ossimNitfFileHeaderV2_1::getNumberOfImages()const
{
- return theNitfImageInfoRecords.size();
+ return (ossim_int32)theNitfImageInfoRecords.size();
}
ossim_int32 ossimNitfFileHeaderV2_1::getNumberOfTextSegments()const
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimNitfProjectionParameterTag.cpp b/Utilities/otbossim/src/ossim/support_data/ossimNitfProjectionParameterTag.cpp
index 78a2d3e9bfdd1f698a2d3f94f073e52f42ab3478..8f3048fc74296f0149a51357393d985d45bc9260 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimNitfProjectionParameterTag.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimNitfProjectionParameterTag.cpp
@@ -8,7 +8,7 @@
// Description: Nitf support class
//
//********************************************************************
-// $Id: ossimNitfProjectionParameterTag.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimNitfProjectionParameterTag.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/support_data/ossimNitfProjectionParameterTag.h>
#include <sstream>
#include <iomanip>
@@ -75,7 +75,7 @@ void ossimNitfProjectionParameterTag::writeStream(std::ostream& out)
ossim_uint32 ossimNitfProjectionParameterTag::getSizeInBytes()const
{
- return (113 + theProjectionParameters.size()*15);
+ return (113 + (ossim_uint32)theProjectionParameters.size()*15);
}
std::ostream& ossimNitfProjectionParameterTag::print(
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimNitfVqCompressionHeader.cpp b/Utilities/otbossim/src/ossim/support_data/ossimNitfVqCompressionHeader.cpp
index 0399a59f26d1d3d7118ee54b16774ee46bc0bd5b..7ba5dae1d06780bad1d1cd5d213ee588a04d906f 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimNitfVqCompressionHeader.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimNitfVqCompressionHeader.cpp
@@ -7,7 +7,7 @@
// Description: Nitf support class
//
//********************************************************************
-// $Id: ossimNitfVqCompressionHeader.cpp 9094 2006-06-13 19:12:40Z dburken $
+// $Id: ossimNitfVqCompressionHeader.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <iostream>
@@ -250,7 +250,7 @@ ossim_uint32 ossimNitfVqCompressionHeader::getImageCodeBitLength()const
ossim_uint32 ossimNitfVqCompressionHeader::getNumberOfTables()const
{
- return theTable.size();
+ return (ossim_uint32)theTable.size();
}
const std::vector<ossimNitfVqCompressionOffsetTableData>& ossimNitfVqCompressionHeader::getTable()const
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimRpfToc.cpp b/Utilities/otbossim/src/ossim/support_data/ossimRpfToc.cpp
index 8cada97275312699d32c6561a7bdfc386930eff6..829462ca23e8e68fd97b8ef613357d784a60c886 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimRpfToc.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimRpfToc.cpp
@@ -9,7 +9,7 @@
// Description: Rpf support class
//
//********************************************************************
-// $Id: ossimRpfToc.cpp 15810 2009-10-24 14:54:27Z dburken $
+// $Id: ossimRpfToc.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <iostream>
@@ -231,6 +231,54 @@ ossim_int32 ossimRpfToc::getTocEntryIndex(const ossimRpfTocEntry* entry)
return -1;
}
+ossim_uint32 ossimRpfToc::getNumberOfFramesHorizontal(ossim_uint32 idx) const
+{
+ ossim_uint32 nFrames = 0;
+ const ossimRpfTocEntry* pEntry = getTocEntry( idx );
+ if ( pEntry != NULL )
+ {
+ nFrames = pEntry->getNumberOfFramesHorizontal();
+ }
+ return nFrames;
+}
+
+ossim_uint32 ossimRpfToc::getNumberOfFramesVertical(ossim_uint32 idx) const
+{
+ ossim_uint32 nFrames = 0;
+ const ossimRpfTocEntry* pEntry = getTocEntry( idx );
+ if ( pEntry != NULL )
+ {
+ nFrames = pEntry->getNumberOfFramesVertical();
+ }
+ return nFrames;
+}
+
+bool ossimRpfToc::getRpfFrameEntry(ossim_uint32 entryIdx,
+ ossim_uint32 row,
+ ossim_uint32 col,
+ ossimRpfFrameEntry& result)const
+{
+ const ossimRpfTocEntry* pEntry = getTocEntry( entryIdx );
+ if ( pEntry != NULL )
+ {
+ return pEntry->getEntry( row, col, result );
+ }
+ return false;
+}
+
+const ossimString ossimRpfToc::getRelativeFramePath( ossim_uint32 entryIdx,
+ ossim_uint32 row,
+ ossim_uint32 col) const
+{
+ ossimRpfFrameEntry frameEntry;
+ bool bResult = getRpfFrameEntry( entryIdx, row, col, frameEntry );
+ if ( bResult == true )
+ {
+ return frameEntry.getPathToFrameFileFromRoot();
+ }
+ return ossimString("");
+}
+
void ossimRpfToc::deleteAll()
{
if(theRpfHeader)
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimRpfTocEntry.cpp b/Utilities/otbossim/src/ossim/support_data/ossimRpfTocEntry.cpp
index 0a58b0359b66c4213065d891f49aa41a3aa19597..00a7587ddbcd9c156f8d91306748abfe638d7435 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimRpfTocEntry.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimRpfTocEntry.cpp
@@ -7,7 +7,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimRpfTocEntry.cpp 14241 2009-04-07 19:59:23Z dburken $
+// $Id: ossimRpfTocEntry.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <istream>
#include <ostream>
@@ -79,9 +79,9 @@ void ossimRpfTocEntry::setEntry(const ossimRpfFrameEntry& entry,
long row,
long col)
{
- if(row < (long)theFrameEntryArray.size())
+ if(row < (long)theFrameEntryArray.size() && row >= 0)
{
- if(col < (long)theFrameEntryArray[row].size())
+ if(col < (long)theFrameEntryArray[row].size() && col >= 0)
{
theFrameEntryArray[row][col] = entry;
}
@@ -92,9 +92,9 @@ bool ossimRpfTocEntry::getEntry(long row,
long col,
ossimRpfFrameEntry& result)const
{
- if(row < (long)theFrameEntryArray.size())
+ if(row < (long)theFrameEntryArray.size() && row >= 0)
{
- if(col < (long)theFrameEntryArray[row].size())
+ if(col < (long)theFrameEntryArray[row].size() && col >= 0)
{
result = theFrameEntryArray[row][col];
}
@@ -117,11 +117,11 @@ bool ossimRpfTocEntry::getEntry(long row,
*/
bool ossimRpfTocEntry::isEmpty()const
{
- long rows = theFrameEntryArray.size();
+ long rows = (long)theFrameEntryArray.size();
long cols = 0;
if(rows > 0)
{
- cols = theFrameEntryArray[0].size();
+ cols = (long)theFrameEntryArray[0].size();
for(long rowIndex = 0; rowIndex < rows; ++ rowIndex)
{
for(long colIndex = 0; colIndex < cols; ++colIndex)
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimSpotDimapSupportData.cpp b/Utilities/otbossim/src/ossim/support_data/ossimSpotDimapSupportData.cpp
index 1a2a07a556a6b0695f2061e63ad1c7b5e14c5881..bc0b6b6b781e93b81be15fdeacb0c23f30b04cfa 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimSpotDimapSupportData.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimSpotDimapSupportData.cpp
@@ -9,7 +9,7 @@
// Contains definition of class ossimSpotDimapSupportData.
//
//*****************************************************************************
-// $Id: ossimSpotDimapSupportData.cpp 14208 2009-04-01 18:18:06Z dburken $
+// $Id: ossimSpotDimapSupportData.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <iostream>
@@ -267,7 +267,7 @@ bool ossimSpotDimapSupportData::loadXmlFile(const ossimFilename& file,
if(testString.contains("xml"))
{
in.seekg(0);
- in.read(&fullBuffer.front(), fullBuffer.size());
+ in.read(&fullBuffer.front(), (std::streamsize)fullBuffer.size());
if(!in.fail())
{
bufferedIo = ossimString(fullBuffer.begin(),
@@ -437,7 +437,7 @@ void ossimSpotDimapSupportData::getPositionEcf(ossim_uint32 sample,
ossim_uint32 idxEnd = (ossim_uint32)ceil(tempIdx);
if(idxEnd >= thePosEcfSamples.size())
{
- idxEnd = thePosEcfSamples.size()-1;
+ idxEnd = (ossim_uint32)thePosEcfSamples.size()-1;
}
if(idxStart > idxEnd)
{
@@ -496,7 +496,7 @@ void ossimSpotDimapSupportData::getVelocityEcf(ossim_uint32 sample, ossimEcefPoi
ossim_uint32 idxEnd = (ossim_uint32)ceil(tempIdx);
if(idxEnd >= theVelEcfSamples.size())
{
- idxEnd = theVelEcfSamples.size()-1;
+ idxEnd = (ossim_uint32)theVelEcfSamples.size()-1;
}
if(idxStart > idxEnd)
{
@@ -555,7 +555,7 @@ void ossimSpotDimapSupportData::getEphSampTime(ossim_uint32 sample,
ossim_uint32 idxEnd = (ossim_uint32)ceil(tempIdx);
if(idxEnd >= theEphSampTimes.size())
{
- idxEnd = theEphSampTimes.size()-1;
+ idxEnd = (ossim_uint32)theEphSampTimes.size()-1;
}
if(idxStart > idxEnd)
{
@@ -740,7 +740,7 @@ void ossimSpotDimapSupportData::getLagrangeInterpolation(
if(T.size() <= filter_size)
{
- filter_size = T.size()/2;
+ filter_size = (ossim_uint32)T.size()/2;
lagrange_half_filter = filter_size/2;
}
if ((time < T[lagrange_half_filter]) ||
@@ -1015,17 +1015,17 @@ void ossimSpotDimapSupportData::getRefLineTimeLine(ossim_float64& rtl) const
ossim_uint32 ossimSpotDimapSupportData::getNumEphSamples() const
{
- return theEphSampTimes.size();
+ return (ossim_uint32)theEphSampTimes.size();
}
ossim_uint32 ossimSpotDimapSupportData::getNumAttSamples() const
{
- return theAttSampTimes.size();
+ return (ossim_uint32)theAttSampTimes.size();
}
ossim_uint32 ossimSpotDimapSupportData::getNumGeoPosPoints() const
{
- return theGeoPosImagePoints.size();
+ return (ossim_uint32)theGeoPosImagePoints.size();
}
void ossimSpotDimapSupportData::getUlCorner(ossimGpt& pt) const
@@ -1937,7 +1937,7 @@ bool ossimSpotDimapSupportData::parsePart2(
sub_nodes.clear();
xml_nodes[band_index]->findChildNodes(xpath, sub_nodes);
- theDetectorCount = sub_nodes.size();
+ theDetectorCount = (ossim_uint32)sub_nodes.size();
if (theMetadataVersion == OSSIM_SPOT_METADATA_VERSION_1_1)
{
@@ -1980,7 +1980,7 @@ bool ossimSpotDimapSupportData::parsePart2(
idxEnd = (ossim_int32)ceil(tempIdx);
if(idxEnd >= (ossim_int32)sub_nodes.size())
{
- idxEnd = sub_nodes.size()-1;
+ idxEnd = (ossim_int32)sub_nodes.size()-1;
}
thePixelLookAngleX.push_back(tempV[idxStart] + tempIdxFraction*(tempV[idxEnd] - tempV[idxStart]));
@@ -2037,7 +2037,7 @@ bool ossimSpotDimapSupportData::parsePart2(
idxEnd = (ossim_int32)ceil(tempIdx);
if(idxEnd >= (ossim_int32)sub_nodes.size())
{
- idxEnd = sub_nodes.size()-1;
+ idxEnd = (ossim_int32)sub_nodes.size()-1;
}
if(idxStart > idxEnd)
{
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimSrtmSupportData.cpp b/Utilities/otbossim/src/ossim/support_data/ossimSrtmSupportData.cpp
index 34beacc26ec654046775cc27c26d13a3ef057ab7..7b5616f792b77d601e7abc397964b0b4de076281 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimSrtmSupportData.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimSrtmSupportData.cpp
@@ -9,7 +9,7 @@
// Support data class for a Shuttle Radar Topography Mission (SRTM) file.
//
//----------------------------------------------------------------------------
-// $Id: ossimSrtmSupportData.cpp 13094 2008-06-27 15:41:45Z dburken $
+// $Id: ossimSrtmSupportData.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <cmath>
#include <fstream>
@@ -871,7 +871,7 @@ bool ossimSrtmSupportData::computeMinMaxTemplate(T dummy,
ossimByteOrder endianType = ossim::byteOrder();
for (ossim_uint32 line = 0; line < theNumberOfLines; ++line)
{
- theFileStream->read(char_buf, BYTES_IN_LINE);
+ theFileStream->read(char_buf, (std::streamsize)BYTES_IN_LINE);
if(endianType == OSSIM_LITTLE_ENDIAN)
{
swapper.swap(line_buf, theNumberOfSamples);
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimTiffInfo.cpp b/Utilities/otbossim/src/ossim/support_data/ossimTiffInfo.cpp
index aa5468cc91e38c5c9cc30614661eb953ead3602a..677bcee6ce1a5d596176fa4cd80abce1891d21d6 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimTiffInfo.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimTiffInfo.cpp
@@ -1047,7 +1047,7 @@ bool ossimTiffInfo::getImageGeometry(std::ifstream& inStr,
// NOTE: It takes six doubles to make one tie point ie:
// x,y,z,longitude,latitude,height or x,y,z,easting,northing,height
//---
- ossim_uint32 tieCount = ties.size()/6;
+ ossim_uint32 tieCount = (ossim_uint32)ties.size()/6;
// Get the model transform.
std::vector<ossim_float64> xfrm;
@@ -3338,7 +3338,7 @@ void ossimTiffInfo::getTieSets(const std::vector<ossim_float64>& ties,
ossimTieGptSet& tieSet) const
{
ossim_uint32 idx = 0;
- ossim_uint32 tieCount = ties.size()/6;
+ ossim_uint32 tieCount = (ossim_uint32)ties.size()/6;
const double* tiePointsPtr = &ties.front();
double offset = 0;
if (hasOneBasedTiePoints(ties, width, height))
@@ -3374,7 +3374,7 @@ bool ossimTiffInfo::hasOneBasedTiePoints(
ossim_float64 maxX = 0.0;
ossim_float64 maxY = 0.0;
- const ossim_uint32 SIZE = ties.size();
+ const ossim_uint32 SIZE = (ossim_uint32)ties.size();
ossim_uint32 tieIndex = 0;
while (tieIndex < SIZE)
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimTiffWorld.cpp b/Utilities/otbossim/src/ossim/support_data/ossimTiffWorld.cpp
index 860a156312dd0c0149dcbac76afe03a439074a00..1dcb76d1b0376a8d15633a71a99a0f8e42c5fbf9 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimTiffWorld.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimTiffWorld.cpp
@@ -9,7 +9,7 @@
// Description: Container class for a tiff world file data.
//
//********************************************************************
-// $Id: ossimTiffWorld.cpp 14777 2009-06-25 14:43:52Z dburken $
+// $Id: ossimTiffWorld.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <iostream>
#include <fstream>
@@ -72,7 +72,7 @@ ossimTiffWorld::ossimTiffWorld(const char* file,
filename, result );
if ( bSuccess == true )
{
- int numResults = result.size();
+ int numResults = (int)result.size();
int i;
for ( i=0; i<numResults && !is.is_open(); ++i )
{
diff --git a/Utilities/otbossim/src/ossim/vec/ossimVpfLibrary.cpp b/Utilities/otbossim/src/ossim/vec/ossimVpfLibrary.cpp
index 65387362d5b3a3a08a4302402e35cbfd1dd0c756..5ee204f19e28dff15d5c1051317bebd1d8535e96 100644
--- a/Utilities/otbossim/src/ossim/vec/ossimVpfLibrary.cpp
+++ b/Utilities/otbossim/src/ossim/vec/ossimVpfLibrary.cpp
@@ -6,7 +6,7 @@
// Description: This class extends the stl's string class.
//
//********************************************************************
-// $Id: ossimVpfLibrary.cpp 13023 2008-06-10 16:26:24Z dburken $
+// $Id: ossimVpfLibrary.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <algorithm>
#include <ossim/vec/ossimVpfLibrary.h>
@@ -55,7 +55,7 @@ bool ossimVpfLibrary::openLibrary(ossimVpfDatabase* database,
ossimVpfTable table;
- theNumberOfCoverages = theCoverageNames.size();
+ theNumberOfCoverages = (ossim_uint32)theCoverageNames.size();
returnCode = (theNumberOfCoverages> 0);
}
diff --git a/Utilities/otbossim/src/ossim/vec/ossimVpfTable.cpp b/Utilities/otbossim/src/ossim/vec/ossimVpfTable.cpp
index a965559fa8890f86d55d01859c252eab0d35af27..43cfef2df3fe2b4188f45ff687fb6aea38f6c337 100644
--- a/Utilities/otbossim/src/ossim/vec/ossimVpfTable.cpp
+++ b/Utilities/otbossim/src/ossim/vec/ossimVpfTable.cpp
@@ -9,7 +9,7 @@
// vpf file.
//
//********************************************************************
-// $Id: ossimVpfTable.cpp 13025 2008-06-13 17:06:30Z sbortman $
+// $Id: ossimVpfTable.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/vec/ossimVpfTable.h>
#include <ossim/vec/vpf.h>
#include <ossim/base/ossimErrorCodes.h>
@@ -496,7 +496,7 @@ void ossimVpfTable::print(std::ostream& out)const
else
{
buf = (char *)get_table_element(j,row,table,NULL,&n);
- n = strlen(table.header[j].name) + 2;
+ n = (long)strlen(table.header[j].name) + 2;
for (k=0;k<(long)strlen(buf);k++)
{
out << buf[k];
diff --git a/Utilities/otbossim/src/ossim/vpfutil/vpfcntnt.c b/Utilities/otbossim/src/ossim/vpfutil/vpfcntnt.c
index 9f16ab3ea7bc5e5276883b34ed32081345ed1542..82590bf41280c7851aab2af60307cfb678f978a9 100644
--- a/Utilities/otbossim/src/ossim/vpfutil/vpfcntnt.c
+++ b/Utilities/otbossim/src/ossim/vpfutil/vpfcntnt.c
@@ -134,7 +134,7 @@ void vpf_dump_table( char *tablename, char *outname )
fprintf(fp,"%c\n",ch);
} else {
buf = (char *)get_table_element(j,row,table,NULL,&n);
- n = strlen(table.header[j].name) + 2;
+ n = (long)strlen(table.header[j].name) + 2;
for (k=0;(unsigned int)k<strlen(buf);k++) {
fprintf(fp,"%c",buf[k]);
n++;
diff --git a/Utilities/otbossim/src/ossim/vpfutil/vpfptply.c b/Utilities/otbossim/src/ossim/vpfutil/vpfptply.c
index 143f36a015b062c658756eda6e8734d4bfa8b5bb..adb1bb3367585e28745dac8270681ec0adf50b8e 100644
--- a/Utilities/otbossim/src/ossim/vpfutil/vpfptply.c
+++ b/Utilities/otbossim/src/ossim/vpfutil/vpfptply.c
@@ -437,7 +437,7 @@ static void dirpath( char *path )
{
register unsigned int i;
- i = strlen(path)-1;
+ i = (int)strlen(path)-1;
while ( (i>0) && (path[i] != '\\') ) i--;
if (i<(strlen(path)-1)) i++;
path[i] = '\0';
diff --git a/Utilities/otbossim/src/ossim/vpfutil/vpfquery.c b/Utilities/otbossim/src/ossim/vpfutil/vpfquery.c
index c319cc8e919e962922ea6c4e4825ad64b6969666..6622865a37cb4e31fc43cb302d344c5f19aa4d91 100644
--- a/Utilities/otbossim/src/ossim/vpfutil/vpfquery.c
+++ b/Utilities/otbossim/src/ossim/vpfutil/vpfquery.c
@@ -175,7 +175,7 @@ static void return_token( char *expr, char *token )
stopflag=0;
while (expr[0] == ' ') {
for (i=0;i<ndelim;i++)
- if (ossim_strncasecmp(expr,delimstr[i],strlen(delimstr[i])) == 0) {
+ if (ossim_strncasecmp(expr,delimstr[i],(unsigned int)strlen(delimstr[i])) == 0) {
stopflag=1;
break;
}
@@ -185,7 +185,7 @@ static void return_token( char *expr, char *token )
strcpy(token,expr);
for (i=0;(unsigned int)i<strlen(token);i++) {
for (j=0;j<ndelim;j++) {
- if (ossim_strncasecmp(expr,delimstr[j],strlen(delimstr[j]))==0) {
+ if (ossim_strncasecmp(expr,delimstr[j],(unsigned int)strlen(delimstr[j]))==0) {
if (n>0)
token[i] = '\0';
else
@@ -270,7 +270,7 @@ static char *get_token( char *expression,
stopflag = 0;
while ((expression[0] == '\"') || (expression[0] == ' ')) {
for (i=0;i<ndelim;i++)
- if (ossim_strncasecmp(expression,delimstr[i],strlen(delimstr[i]))==0) {
+ if (ossim_strncasecmp(expression,delimstr[i],(unsigned int)strlen(delimstr[i]))==0) {
stopflag=1;
break;
}
@@ -324,7 +324,7 @@ static char *get_token( char *expression,
expression++;
token[i] = '\0';
*token_type = STRING;
- *token_value = strlen(token);
+ *token_value = (int)strlen(token);
return expression;
}
diff --git a/Utilities/otbossim/src/ossim/vpfutil/vpfread.c b/Utilities/otbossim/src/ossim/vpfutil/vpfread.c
index 1fc007d7bfccb5f78878e0f4e118f893e138c0e1..ff929d1f27b3125ecd2755da782c452298d0f527 100644
--- a/Utilities/otbossim/src/ossim/vpfutil/vpfread.c
+++ b/Utilities/otbossim/src/ossim/vpfutil/vpfread.c
@@ -156,14 +156,14 @@ long int VpfRead ( void *to, VpfDataType type, long int count, FILE *from )
switch ( type ) {
case VpfChar:
- retval = fread ( to, sizeof (char), count, from ) ;
+ retval = (long)fread ( to, sizeof (char), count, from ) ;
break ;
case VpfShort:
{
short int stemp ,
*sptr = (short *) to ;
for ( i=0; i < count; i++ ) {
- retval = fread ( &stemp, sizeof (short), 1, from ) ;
+ retval = (long)fread ( &stemp, sizeof (short), 1, from ) ;
if (STORAGE_BYTE_ORDER != MACHINE_BYTE_ORDER)
swap_two ( (char*)&stemp, (char*)sptr ) ;
else
@@ -178,12 +178,12 @@ long int VpfRead ( void *to, VpfDataType type, long int count, FILE *from )
long int itemp,
*iptr = (long int *) to ;
for ( i=0; i < count; i++ ) {
- retval = fread ( &itemp, sizeof (long int), 1, from ) ;
+ retval = (long)fread ( &itemp, sizeof (long int), 1, from ) ;
swap_four ( (char*)&itemp, (char*)iptr ) ;
iptr++ ;
}
} else {
- retval = fread ( to, sizeof (long int), count, from ) ;
+ retval = (long)fread ( to, sizeof (long int), count, from ) ;
}
}
break ;
@@ -192,7 +192,7 @@ long int VpfRead ( void *to, VpfDataType type, long int count, FILE *from )
float ftemp ,
*fptr = (float *) to ;
for ( i=0; i < count; i++ ) {
- retval = fread ( &ftemp, sizeof (float), 1, from ) ;
+ retval = (long)fread ( &ftemp, sizeof (float), 1, from ) ;
if (STORAGE_BYTE_ORDER != MACHINE_BYTE_ORDER)
swap_four ( (char*)&ftemp, (char*)fptr ) ;
else
@@ -206,7 +206,7 @@ long int VpfRead ( void *to, VpfDataType type, long int count, FILE *from )
double dtemp ,
*dptr = (double *) to ;
for ( i=0; i < count; i++ ) {
- retval = fread ( &dtemp, sizeof (double), 1, from ) ;
+ retval = (long)fread ( &dtemp, sizeof (double), 1, from ) ;
if (STORAGE_BYTE_ORDER != MACHINE_BYTE_ORDER)
swap_eight ( (char*)&dtemp, (char*)dptr ) ;
else
@@ -218,7 +218,7 @@ long int VpfRead ( void *to, VpfDataType type, long int count, FILE *from )
case VpfDate:
{
date_type *dp = (date_type *) to ;
- retval = fread(dp,sizeof(date_type)-1,count,from);
+ retval = (long)fread(dp,sizeof(date_type)-1,count,from);
}
break ;
case VpfCoordinate:
@@ -227,13 +227,13 @@ long int VpfRead ( void *to, VpfDataType type, long int count, FILE *from )
coordinate_type ctemp ,
*cptr = (coordinate_type *) to ;
for ( i=0; i < count; i++ ) {
- retval = fread ( &ctemp, sizeof (coordinate_type), 1, from ) ;
+ retval = (long)fread ( &ctemp, sizeof (coordinate_type), 1, from ) ;
swap_four ( (char*)&ctemp.x, (char*)&cptr->x ) ;
swap_four ( (char*)&ctemp.y, (char*)&cptr->y ) ;
cptr++ ;
}
} else {
- retval = fread ( to, sizeof (coordinate_type), count, from ) ;
+ retval = (long)fread ( to, sizeof (coordinate_type), count, from ) ;
}
}
break ;
@@ -242,7 +242,7 @@ long int VpfRead ( void *to, VpfDataType type, long int count, FILE *from )
double_coordinate_type dctemp ,
*dcptr = (double_coordinate_type *) to ;
for ( i=0; i < count; i++ ) {
- retval = fread ( &dctemp, sizeof (double_coordinate_type), 1, from ) ;
+ retval = (long)fread ( &dctemp, sizeof (double_coordinate_type), 1, from ) ;
if (STORAGE_BYTE_ORDER != MACHINE_BYTE_ORDER) {
swap_eight ( (char*)&dctemp.x, (char*)&dcptr->x ) ;
swap_eight ( (char*)&dctemp.y, (char*)&dcptr->y ) ;
@@ -259,7 +259,7 @@ long int VpfRead ( void *to, VpfDataType type, long int count, FILE *from )
tri_coordinate_type ttemp ,
*tptr = (tri_coordinate_type *) to ;
for ( i=0; i < count; i++ ) {
- retval = fread ( &ttemp, sizeof (tri_coordinate_type), 1, from ) ;
+ retval = (long)fread ( &ttemp, sizeof (tri_coordinate_type), 1, from ) ;
if (STORAGE_BYTE_ORDER != MACHINE_BYTE_ORDER) {
swap_four ( (char*)&ttemp.x, (char*)&tptr->x ) ;
swap_four ( (char*)&ttemp.y, (char*)&tptr->y ) ;
@@ -278,7 +278,7 @@ long int VpfRead ( void *to, VpfDataType type, long int count, FILE *from )
double_tri_coordinate_type dttemp ,
*dtptr = (double_tri_coordinate_type *) to ;
for ( i=0; i < count; i++ ) {
- retval = fread ( &dttemp,sizeof (double_tri_coordinate_type), 1, from);
+ retval = (long)fread ( &dttemp, sizeof (double_tri_coordinate_type), 1, from);
if (STORAGE_BYTE_ORDER != MACHINE_BYTE_ORDER) {
swap_eight ( (char*)&dttemp.x, (char*)&dtptr->x ) ;
swap_eight ( (char*)&dttemp.y, (char*)&dtptr->y ) ;
@@ -394,7 +394,7 @@ int add_null_values ( char *name, vpf_table_type table, FILE *fpout )
case 'T':
cval = get_string ( &ptr, line, FIELD_SEPERATOR ) ;
free ( table.header[i].nullval.Char ) ; /* get rid of default */
- table.header[i].nullval.Char = (char *) vpfmalloc ( strlen (cval)+1) ;
+ table.header[i].nullval.Char = (char *) vpfmalloc ( (unsigned long)strlen (cval)+1) ;
strcpy ( table.header[i].nullval.Char, cval ) ;
free (cval) ;
break ;
@@ -492,11 +492,11 @@ long int index_length( long int row_number,
fseek( table.xfp, (long int)(row_number*recsize), SEEK_SET );
if ( ! Read_Vpf_Int(&pos,table.xfp,1) ) {
- len = (long int)NULL ;
+ len = (long int)0 ;
}
if ( ! Read_Vpf_Int(&ulen,table.xfp,1) ) {
- return (long int)NULL ;
+ return (long int)0 ;
}
len = ulen;
break;
@@ -508,7 +508,7 @@ long int index_length( long int row_number,
/* Just an error check, should never get here in writing */
fprintf(stderr,"\nindex_length: error trying to access row %d",
(int)row_number ) ;
- len = (long int)NULL ;
+ len = (long int)0 ;
}
break;
}
@@ -581,7 +581,7 @@ long int index_pos( long int row_number,
recsize = sizeof(index_cell);
fseek( table.xfp, (long int)(row_number*recsize), SEEK_SET );
if ( ! Read_Vpf_Int(&pos,table.xfp,1) ) {
- pos = (unsigned long int)NULL ;
+ pos = (unsigned long int)0 ;
}
break;
case RAM:
@@ -592,7 +592,7 @@ long int index_pos( long int row_number,
/* Just an error check, should never get here in writing */
fprintf(stderr,"\nindex_length: error trying to access row %d",
(int)row_number ) ;
- pos = (unsigned long int)NULL;
+ pos = (unsigned long int)0;
}
break;
}
diff --git a/Utilities/otbossim/src/ossim/vpfutil/vpftable.c b/Utilities/otbossim/src/ossim/vpfutil/vpftable.c
index b5f5ad51bd596636103a4135ac4f7ebb6bdc75a8..cfac3dab0219109359c2c9901618e240a3c44699 100644
--- a/Utilities/otbossim/src/ossim/vpfutil/vpftable.c
+++ b/Utilities/otbossim/src/ossim/vpfutil/vpftable.c
@@ -215,7 +215,7 @@ static char *cpy_del(char *src, char delimiter, long int *ind )
/* Start with temporary string value */
- tempstr = (char *)vpfmalloc ( strlen ( temp ) + 10 ) ;
+ tempstr = (char *)vpfmalloc ( (unsigned long)strlen ( temp ) + 10 ) ;
if ( *temp == '"' ) { /* If field is quoted, do no error checks */
@@ -371,7 +371,7 @@ long int parse_data_def( vpf_table_type *table )
swap_four((char *)&k,(char *)&ddlen);
}
if ( ddlen < 0 ) {
- return (long int)NULL ;
+ return (long int)0 ;
}
STORAGE_BYTE_ORDER = table->byte_order;
@@ -382,7 +382,7 @@ long int parse_data_def( vpf_table_type *table )
buf[0] = byte; /* already have the first byte of the buffer */
Read_Vpf_Char(&buf[1],table->fp,ddlen-1) ;
} else {
- table->ddlen = strlen ( table->defstr ) ;
+ table->ddlen = (long)strlen ( table->defstr ) ;
ddlen = table->ddlen ;
buf = (char *)vpfmalloc((ddlen+3)*sizeof(char));
strncpy ( buf, table->defstr, ddlen ) ;
@@ -435,7 +435,7 @@ long int parse_data_def( vpf_table_type *table )
if ( i == 0 )
if ( ossim_strcasecmp ( table->header[0].name, "ID" ) ) {
- return (long int)NULL ;
+ return (long int)0 ;
}
if(table->header[i].count == -1)
@@ -521,7 +521,7 @@ long int parse_data_def( vpf_table_type *table )
break ;
} /** switch type **/
- if (status) return (long int)NULL;
+ if (status) return (long int)0;
table->header[i].keytype = vpf_get_char (&p,buf);
des = get_string(&p,buf, FIELD_SEPERATOR );
@@ -544,7 +544,7 @@ long int parse_data_def( vpf_table_type *table )
end_of_rec = TRUE;
} else {
if (strcmp(tdx,"-") != 0) {
- table->header[i].tdx =(char*) vpfmalloc ( strlen ( tdx ) +1 ) ;
+ table->header[i].tdx =(char*) vpfmalloc ( (unsigned long)strlen ( tdx ) +1 ) ;
strcpy (table->header[i].tdx, tdx );
} else table->header[i].tdx = (char *)NULL;
}
@@ -556,7 +556,7 @@ long int parse_data_def( vpf_table_type *table )
end_of_rec = TRUE;
} else {
if (strcmp(doc,"-") != 0) {
- table->header[i].narrative = (char*)vpfmalloc ( strlen(doc) +1) ;
+ table->header[i].narrative = (char*)vpfmalloc ( (unsigned long)strlen(doc) +1) ;
strcpy (table->header[i].narrative, doc );
} else table->header[i].narrative = (char *)NULL;
}
@@ -780,7 +780,7 @@ vpf_table_type vpf_open_table( const char * tablename,
/* Parse out name and path */
j = -1;
- i=strlen(tablepath);
+ i=(long)strlen(tablepath);
while (i>0) {
#ifdef __MSDOS__
if (tablepath[i] == '\\') {
@@ -795,7 +795,7 @@ vpf_table_type vpf_open_table( const char * tablename,
strncpy(table.name,&(tablepath[j+1]),12);
rightjust(table.name);
strupr(table.name);
- table.path = (char *)vpfmalloc((strlen(tablepath)+5)*sizeof(char));
+ table.path = (char *)vpfmalloc(((unsigned long)strlen(tablepath)+5)*(unsigned long)sizeof(char));
strcpy(table.path, tablepath);
table.path[j+1] = '\0';
diff --git a/Utilities/otbossim/src/ossim/vpfutil/vpftidx.c b/Utilities/otbossim/src/ossim/vpfutil/vpftidx.c
index 0f9d5144398179444b25d14acec690764c915222..5e323ce9f32591b3d88389f538a9c5a5467dd7da 100644
--- a/Utilities/otbossim/src/ossim/vpfutil/vpftidx.c
+++ b/Utilities/otbossim/src/ossim/vpfutil/vpftidx.c
@@ -109,7 +109,7 @@
void *vpfmalloc(unsigned long size);
#define Whimper(str) {\
- return ((long int)NULL) ; }
+ return ((long int)0) ; }
#define SWhimper(str) {\
set_type err; err = set_init (1) ;\
@@ -376,8 +376,8 @@ long int create_thematic_index ( char indextype,
/* initialize */
buf = (char *) table_element (tablepos,1,table,NULL,&n);
REALLOC_DIRECTORY ( 0 ) ;
- d[0].value.strval = (char *) vpfmalloc ( strlen ( buf ) +1) ;
- memcpy( d[0].value.strval, buf, strlen(buf) ) ;
+ d[0].value.strval = (char *) vpfmalloc ( (unsigned long)strlen ( buf ) +1) ;
+ memcpy( d[0].value.strval, buf, (unsigned long)strlen(buf) ) ;
free (buf) ;
h.nbins++ ;
@@ -393,7 +393,7 @@ long int create_thematic_index ( char indextype,
if ( k == h.nbins ) { /* New value in column */
REALLOC_DIRECTORY ( k ) ;
- d[k].value.strval = (char *) vpfmalloc ( strlen ( buf ) +1) ;
+ d[k].value.strval = (char *) vpfmalloc ( (unsigned long)strlen ( buf ) +1) ;
memcpy( d[0].value.strval, buf, strlen(buf) ) ;
h.nbins++ ;
}
@@ -496,14 +496,14 @@ long int create_thematic_index ( char indextype,
/* only write the table name, no pathname */
- for ( i = strlen ( tablename ); i > 0; i-- )
+ for ( i = (unsigned int)strlen ( tablename ); i > 0; i-- )
if ( tablename[i] == '/' ) break ;
if ( i && i < strlen (tablename) )
strcpy ( h.vpf_table_name, strupr ( &tablename[i+1] ) ) ;
else
strcpy( h.vpf_table_name, strupr ( tablename) );
- for ( i=strlen(h.vpf_table_name); i < 12 ; i++ )
+ for ( i=(unsigned int)strlen(h.vpf_table_name); i < 12 ; i++ )
h.vpf_table_name[i] = ' ' ;
h.vpf_table_name[11] = '\0';
@@ -511,12 +511,12 @@ long int create_thematic_index ( char indextype,
h.table_nrows = table.nrows ;
- if ( write_thematic_index_header ( h, ifp ) == (long int)NULL )
+ if ( write_thematic_index_header ( h, ifp ) == (long int)0 )
Whimper ( "error writing index header" ) ;
/* Now write out the rest of the header directory */
- if ( write_thematic_index_directory ( h, d, idsize, ifp ) == (long int)NULL )
+ if ( write_thematic_index_directory ( h, d, idsize, ifp ) == (long int)0 )
Whimper ( "error writing index directory" ) ;
/* now write the data */
@@ -619,7 +619,7 @@ set_type read_thematic_index ( char *idxname,
SWhimper ( hack ) ;
}
- if ( read_thematic_index_header ( &h, ifp ) == (long int)NULL )
+ if ( read_thematic_index_header ( &h, ifp ) == (long int)0 )
SWhimper ( "error reading index header" ) ;
if ( h.index_type == 'G' ) {
@@ -803,15 +803,14 @@ ThematicIndex open_thematic_index ( char *idxname )
OWhimper ( hack ) ;
}
- if ( read_thematic_index_header ( &idx.h, idx.fp ) == (long int)NULL )
+ if ( read_thematic_index_header ( &idx.h, idx.fp ) == (long int)0 )
OWhimper ( "error reading index header" ) ;
if ( idx.h.index_type == 'G' ) {
/* gazetteer_index */
- if (read_gazetteer_index_directory(&idx.gid,&idx.h,idx.fp)
- ==(long int)NULL) {
- fclose(idx.fp);
- idx.fp = NULL;
+ if (read_gazetteer_index_directory(&idx.gid,&idx.h,idx.fp) == (long int)0) {
+ fclose(idx.fp);
+ idx.fp = NULL;
}
}
@@ -1156,7 +1155,7 @@ long int create_gazetteer_index (char *tablename,
/* only write out the table name, not the rest */
- for ( i = strlen ( tablename ); i > 0; i-- )
+ for ( i = (long)strlen ( tablename ); i > 0; i-- )
if ( tablename[i] == '/' ) break ;
if ( i && (unsigned int)i < strlen (tablename) )
strcpy ( gi.vpf_table_name, strupr ( &tablename[i+1] ) ) ;
@@ -1168,7 +1167,7 @@ long int create_gazetteer_index (char *tablename,
gi.index_type = 'G';
gi.type_count = 1 ;
gi.id_data_type = 'S' ;
- gi.nbins = strlen(idx_set);
+ gi.nbins = (long)strlen(idx_set);
gi.table_nrows = t.nrows;
set_byte_size = (unsigned int)ceil(t.nrows/8.0);
@@ -1216,7 +1215,7 @@ long int create_gazetteer_index (char *tablename,
vpf_close_table(&t);
- if (write_thematic_index_header(gi, idx_fp) == (long int)NULL) {
+ if (write_thematic_index_header(gi, idx_fp) == (long int)0) {
fclose(idx_fp);
for (i = 0; i < gi.nbins; i++)
set_nuke(&idx_bit_sets[i]);
@@ -1337,7 +1336,7 @@ set_type read_gazetteer_index (char *idx_fname, char *query_str )
set_type query_set = {0, 0},
xsect_set,
result_set;
- register int query_len = strlen(query_str),
+ register int query_len = (int)strlen(query_str),
i,
j;
unsigned long set_byte_size;
@@ -1348,12 +1347,12 @@ set_type read_gazetteer_index (char *idx_fname, char *query_str )
if (idx_fp == NULL)
return query_set;
- if (read_thematic_index_header (&gi, idx_fp) == (long int)NULL) {
+ if (read_thematic_index_header (&gi, idx_fp) == (long int)0) {
fclose(idx_fp);
return query_set;
}
- if (read_gazetteer_index_directory (&gid, &gi, idx_fp) == (long int)NULL) {
+ if (read_gazetteer_index_directory (&gid, &gi, idx_fp) == (long int)0) {
fclose(idx_fp);
return query_set;
}
@@ -1478,7 +1477,7 @@ set_type search_gazetteer_index (ThematicIndex *idx, char *query_str )
set_type query_set = {0, 0, 0, 0},
xsect_set,
result_set;
- register int query_len = strlen(query_str),
+ register int query_len = (int)strlen(query_str),
i,
j;
unsigned long set_byte_size;
@@ -1608,7 +1607,7 @@ long int read_gazetteer_index_directory(
if ( ( ! Read_Vpf_Char( &( (*gid)[i].value.cval ), idx_fp, 1) ) ||
( ! Read_Vpf_Int( &( (*gid)[i].start_offset ), idx_fp, 1) ) ||
( ! Read_Vpf_Int( &( (*gid)[i].num_items ), idx_fp, 1) )) {
- return (long int)NULL ;
+ return (long int)0 ;
}
}
return 1;
@@ -1659,7 +1658,7 @@ long int read_gazetteer_index_directory(
*************************************************************************/
#define RWhimper() {\
- return (long int)NULL ; }
+ return (long int)0 ; }
long int read_thematic_index_header ( ThematicIndexHeader *h, FILE *ifp )
{
@@ -1733,7 +1732,7 @@ long int read_thematic_index_header ( ThematicIndexHeader *h, FILE *ifp )
*************************************************************************/
#define WWhimper() {\
- return (long int)NULL ; }
+ return (long int)0 ; }
long int write_thematic_index_header ( ThematicIndexHeader h, FILE *ifp )
{
@@ -1812,7 +1811,7 @@ long int write_thematic_index_header ( ThematicIndexHeader h, FILE *ifp )
*************************************************************************/
#define WTWhimper() {\
- return (long int)NULL ; }
+ return (long int)0 ; }
long int write_thematic_index_directory ( ThematicIndexHeader h,
ThematicIndexDirectory *d,
@@ -1921,7 +1920,7 @@ long int write_thematic_index_directory ( ThematicIndexHeader h,
*************************************************************************/
#define WTGWhimper() {\
- return (long int)NULL ; }
+ return (long int)0 ; }
long int write_gazetteer_index_directory ( ThematicIndexHeader h,
ThematicIndexDirectory *d,
diff --git a/Utilities/otbossim/src/ossim/vpfutil/vpfwrite.c b/Utilities/otbossim/src/ossim/vpfutil/vpfwrite.c
index 5ad3610e6d305095273780d01ea70fc8bb6586e3..612dd3fa58506ef87bde4b38e9c04afbc4825f59 100644
--- a/Utilities/otbossim/src/ossim/vpfutil/vpfwrite.c
+++ b/Utilities/otbossim/src/ossim/vpfutil/vpfwrite.c
@@ -582,7 +582,7 @@ long int put_table_element( long int field,
str = (char *) vpfmalloc( len + 1 );
row[field].ptr = (char *) vpfmalloc ( len + 1 ) ;
strcpy( (char*)str, (char*)value );
- for ( i = strlen((char*)value) ; i < table.header[field].count; i++ )
+ for ( i = (long)strlen((char*)value) ; i < table.header[field].count; i++ )
str[i] = SPACE ;
str[len] = '\0';
memcpy(row[field].ptr, str, len+1);
@@ -701,7 +701,7 @@ long int VpfWrite ( void *from, VpfDataType type, long int count, FILE *to )
switch ( type ) {
case VpfChar:
- retval = fwrite ( from, sizeof (char), count, to ) ;
+ retval = (long)fwrite ( from, sizeof (char), count, to ) ;
break ;
case VpfShort:
{
@@ -710,10 +710,10 @@ long int VpfWrite ( void *from, VpfDataType type, long int count, FILE *to )
*sptr = (short *) from ;
for ( i=0; i < count; i++, sptr++ ) {
swap_two ( (char*)sptr, (char*)&stemp ) ;
- retval = fwrite ( &stemp, sizeof (short), 1, to ) ;
+ retval = (long)fwrite ( &stemp, sizeof (short), 1, to ) ;
}
} else {
- retval = fwrite ( from, sizeof (short), count, to ) ;
+ retval = (long)fwrite ( from, sizeof (short), count, to ) ;
}
}
break ;
@@ -724,10 +724,10 @@ long int VpfWrite ( void *from, VpfDataType type, long int count, FILE *to )
*iptr = (long int *) from ;
for ( i=0; i < count; i++, iptr++ ) {
swap_four ( (char*)iptr, (char*)&itemp ) ;
- retval = fwrite ( &itemp, sizeof (long int), 1, to ) ;
+ retval = (long)fwrite ( &itemp, sizeof (long int), 1, to ) ;
}
} else {
- retval = fwrite ( from, sizeof (long int), count, to ) ;
+ retval = (long)fwrite ( from, sizeof (long int), count, to ) ;
}
}
break ;
@@ -738,10 +738,10 @@ long int VpfWrite ( void *from, VpfDataType type, long int count, FILE *to )
*fptr = (float *) from ;
for ( i=0; i < count; i++, fptr++ ) {
swap_four ( (char*)fptr, (char*)&ftemp ) ;
- retval = fwrite ( &ftemp, sizeof (float), 1, to ) ;
+ retval = (long)fwrite ( &ftemp, sizeof (float), 1, to ) ;
}
} else {
- retval = fwrite ( from, sizeof (long int), count, to ) ;
+ retval = (long)fwrite ( from, sizeof (long int), count, to ) ;
}
}
break ;
@@ -752,15 +752,15 @@ long int VpfWrite ( void *from, VpfDataType type, long int count, FILE *to )
*dptr = (double *) from ;
for ( i=0; i < count; i++, dptr++ ) {
swap_eight ( (char*)dptr, (char*)&dtemp ) ;
- retval = fwrite ( &dtemp, sizeof (double), 1, to ) ;
+ retval = (long)fwrite ( &dtemp, sizeof (double), 1, to ) ;
}
} else {
- retval = fwrite ( from, sizeof (double), count, to ) ;
+ retval = (long)fwrite ( from, sizeof (double), count, to ) ;
}
}
break ;
case VpfDate: /* only write out 20, not 21 chars */
- retval = fwrite ( from, sizeof ( date_type ) - 1, count, to ) ;
+ retval = (long)fwrite ( from, sizeof ( date_type ) - 1, count, to ) ;
break ;
case VpfCoordinate:
{
@@ -770,10 +770,10 @@ long int VpfWrite ( void *from, VpfDataType type, long int count, FILE *to )
for ( i=0; i < count; i++, cptr++ ) {
swap_four ( (char*)&cptr->x, (char*)&ctemp.x ) ;
swap_four ( (char*)&cptr->y, (char*)&ctemp.y ) ;
- retval = fwrite ( &ctemp, sizeof (coordinate_type), 1, to ) ;
+ retval = (long)fwrite ( &ctemp, sizeof (coordinate_type), 1, to ) ;
}
} else {
- retval = fwrite ( from, sizeof (coordinate_type), count, to ) ;
+ retval = (long)fwrite ( from, sizeof (coordinate_type), count, to ) ;
}
}
break ;
@@ -785,11 +785,11 @@ long int VpfWrite ( void *from, VpfDataType type, long int count, FILE *to )
for ( i=0; i < count; i++, dcptr++ ) {
swap_eight ( (char*)&dcptr->x, (char*)&dctemp.x ) ;
swap_eight ( (char*)&dcptr->y, (char*)&dctemp.y ) ;
- retval = fwrite ( &dctemp, sizeof (double_coordinate_type),
+ retval = (long)fwrite ( &dctemp, sizeof (double_coordinate_type),
1, to ) ;
}
} else {
- retval = fwrite ( from, sizeof (double_coordinate_type),
+ retval = (long)fwrite ( from, sizeof (double_coordinate_type),
count, to ) ;
}
}
@@ -803,10 +803,10 @@ long int VpfWrite ( void *from, VpfDataType type, long int count, FILE *to )
swap_four ( (char*)&tptr->x, (char*)&ttemp.x ) ;
swap_four ( (char*)&tptr->y, (char*)&ttemp.y ) ;
swap_four ( (char*)&tptr->z, (char*)&ttemp.z ) ;
- retval = fwrite ( &ttemp, sizeof (tri_coordinate_type), 1, to ) ;
+ retval = (long)fwrite ( &ttemp, sizeof (tri_coordinate_type), 1, to ) ;
}
} else {
- retval = fwrite ( from, sizeof (tri_coordinate_type), count, to ) ;
+ retval = (long)fwrite ( from, sizeof (tri_coordinate_type), count, to ) ;
}
}
break ;
@@ -819,11 +819,11 @@ long int VpfWrite ( void *from, VpfDataType type, long int count, FILE *to )
swap_eight ( (char*)&dtptr->x, (char*)&dttemp.x ) ;
swap_eight ( (char*)&dtptr->y, (char*)&dttemp.y ) ;
swap_eight ( (char*)&dtptr->z, (char*)&dttemp.z ) ;
- retval = fwrite ( &dttemp,sizeof (double_tri_coordinate_type),
+ retval = (long)fwrite ( &dttemp,sizeof (double_tri_coordinate_type),
1, to);
}
} else {
- retval = fwrite ( from,sizeof (double_tri_coordinate_type),
+ retval = (long)fwrite ( from,sizeof (double_tri_coordinate_type),
count, to);
}
}