Commit 34c6e4af authored by Emmanuel Christophe's avatar Emmanuel Christophe

Backed out changeset 7c90958e13c3

parent 9fb20ceb
......@@ -100,19 +100,19 @@ IF(WIN32)
IF (MSVC)
IF(OTB_BUILD_PEDANTIC)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
ENDIF()
ENDIF(OTB_BUILD_PEDANTIC)
IF (MSVC80)
ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
ADD_DEFINITIONS(-D_CRT_NONSTDC_NO_WARNING)
ENDIF()
ENDIF()
ELSE()
ENDIF(MSVC80)
ENDIF(MSVC)
ELSE(WIN32)
IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
IF(OTB_BUILD_PEDANTIC)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic")
ENDIF()
ENDIF()
ENDIF(OTB_BUILD_PEDANTIC)
ENDIF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
ENDIF(WIN32)
#-----------------------------------------------------------------------------
......
......@@ -66,7 +66,7 @@ public:
* \param labelObject the label object to vectorize
* \return The vectorized label object as a polygon.
*/
inline PolygonPointerType operator()(const LabelObjectType * labelObject);
inline PolygonType * operator()(const LabelObjectType * labelObject);
private:
/// Internal structures
......@@ -109,6 +109,8 @@ private:
/// Walk right to update the finite states machine.
inline void WalkRight(unsigned int line,const IndexType & startPoint, const IndexType & endPoint, PolygonType * polygon, const StateType state);
PolygonPointerType m_Polygon;
// Internal structure to store runs
RunsPerLineVectorType m_InternalDataSet;
......
......@@ -43,7 +43,7 @@ LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
template<class TLabelObject, class TPolygon>
inline typename LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
::PolygonPointerType
::PolygonType *
LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
::operator()(const LabelObjectType * labelObject)
{
......@@ -52,7 +52,7 @@ LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
m_PositionFlag = LEFT_END;
m_InternalDataSet.clear();
PolygonPointerType polygon = PolygonType::New();
m_Polygon = PolygonType::New();
// Get the internal container
LineContainerType lcontainer = labelObject->GetLineContainer();
......@@ -118,7 +118,7 @@ LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
m_CurrentRun = secondCandidateRun;
m_CurrentState = DOWN_RIGHT;
m_PositionFlag = LEFT_END;
WalkRight(m_CurrentLine-1,m_CurrentPoint,LeftEnd(m_CurrentRun),polygon, m_CurrentState);
WalkRight(m_CurrentLine-1,m_CurrentPoint,LeftEnd(m_CurrentRun),m_Polygon, m_CurrentState);
}
else
......@@ -128,7 +128,7 @@ LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
m_CurrentRun = firstCandidateRun;
m_CurrentState = UP_RIGHT;
m_PositionFlag = RIGHT_END;
WalkRight(m_CurrentLine,m_CurrentPoint,RightEnd(m_CurrentRun),polygon, m_CurrentState);
WalkRight(m_CurrentLine,m_CurrentPoint,RightEnd(m_CurrentRun),m_Polygon, m_CurrentState);
}
}
......@@ -141,7 +141,7 @@ LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
// Up-Left Case
m_CurrentState = UP_LEFT;
m_PositionFlag = RIGHT_END;
WalkLeft(m_CurrentLine,m_CurrentPoint,RightEnd(secondCandidateRun),polygon, m_CurrentState);
WalkLeft(m_CurrentLine,m_CurrentPoint,RightEnd(secondCandidateRun),m_Polygon, m_CurrentState);
m_CurrentLine--;
m_CurrentRun = secondCandidateRun;
}
......@@ -150,7 +150,7 @@ LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
// Down-Left case
m_CurrentState = DOWN_LEFT;
m_PositionFlag = LEFT_END;
WalkLeft(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),polygon, m_CurrentState);
WalkLeft(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),m_Polygon, m_CurrentState);
}
}
break;
......@@ -171,7 +171,7 @@ LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
m_CurrentRun = secondCandidateRun;
m_CurrentState = UP_LEFT;
m_PositionFlag = RIGHT_END;
WalkLeft(m_CurrentLine+1,m_CurrentPoint,RightEnd(m_CurrentRun),polygon, m_CurrentState);
WalkLeft(m_CurrentLine+1,m_CurrentPoint,RightEnd(m_CurrentRun),m_Polygon, m_CurrentState);
}
else
{
......@@ -180,7 +180,7 @@ LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
m_CurrentRun = firstCandidateRun;
m_CurrentState = DOWN_LEFT;
m_PositionFlag = LEFT_END;
WalkLeft(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),polygon, m_CurrentState);
WalkLeft(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),m_Polygon, m_CurrentState);
}
}
......@@ -195,7 +195,7 @@ LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
m_CurrentLine++;
m_CurrentState = DOWN_RIGHT;
m_PositionFlag = LEFT_END;
WalkRight(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),polygon, m_CurrentState);
WalkRight(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),m_Polygon, m_CurrentState);
}
else
......@@ -203,7 +203,7 @@ LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
// Up-Right case
m_CurrentState = UP_RIGHT;
m_PositionFlag = RIGHT_END;
WalkRight(m_CurrentLine,m_CurrentPoint,RightEnd(m_CurrentRun),polygon, m_CurrentState);
WalkRight(m_CurrentLine,m_CurrentPoint,RightEnd(m_CurrentRun),m_Polygon, m_CurrentState);
}
}
......@@ -223,7 +223,7 @@ LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
m_CurrentState = UP_LEFT;
m_PositionFlag = RIGHT_END;
m_CurrentRun = secondCandidateRun;
WalkLeft(m_CurrentLine+1,m_CurrentPoint,RightEnd(m_CurrentRun),polygon, m_CurrentState);
WalkLeft(m_CurrentLine+1,m_CurrentPoint,RightEnd(m_CurrentRun),m_Polygon, m_CurrentState);
}
else
......@@ -233,7 +233,7 @@ LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
m_CurrentRun = firstCandidateRun;
m_CurrentState = DOWN_LEFT;
m_PositionFlag = LEFT_END;
WalkLeft(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),polygon, m_CurrentState);
WalkLeft(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),m_Polygon, m_CurrentState);
}
}
......@@ -248,14 +248,14 @@ LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
m_CurrentRun = secondCandidateRun;
m_CurrentState = DOWN_RIGHT;
m_PositionFlag = LEFT_END;
WalkRight(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),polygon, m_CurrentState);
WalkRight(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),m_Polygon, m_CurrentState);
}
else
{
// Up-Right case
m_CurrentState = UP_RIGHT;
m_PositionFlag = RIGHT_END;
WalkRight(m_CurrentLine,m_CurrentPoint,RightEnd(m_CurrentRun),polygon, m_CurrentState);
WalkRight(m_CurrentLine,m_CurrentPoint,RightEnd(m_CurrentRun),m_Polygon, m_CurrentState);
}
}
......@@ -275,7 +275,7 @@ LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
m_CurrentRun = secondCandidateRun;
m_CurrentState = DOWN_RIGHT;
m_PositionFlag = LEFT_END;
WalkRight(m_CurrentLine-1,m_CurrentPoint,LeftEnd(m_CurrentRun),polygon, m_CurrentState);
WalkRight(m_CurrentLine-1,m_CurrentPoint,LeftEnd(m_CurrentRun),m_Polygon, m_CurrentState);
}
else
......@@ -285,7 +285,7 @@ LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
m_CurrentRun = firstCandidateRun;
m_CurrentState = UP_RIGHT;
m_PositionFlag = RIGHT_END;
WalkRight(m_CurrentLine,m_CurrentPoint,RightEnd(m_CurrentRun),polygon, m_CurrentState);
WalkRight(m_CurrentLine,m_CurrentPoint,RightEnd(m_CurrentRun),m_Polygon, m_CurrentState);
}
}
else
......@@ -297,7 +297,7 @@ LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
// Up-Left case
m_CurrentState = UP_LEFT;
m_PositionFlag = RIGHT_END;
WalkLeft(m_CurrentLine,m_CurrentPoint,RightEnd(secondCandidateRun),polygon, m_CurrentState);
WalkLeft(m_CurrentLine,m_CurrentPoint,RightEnd(secondCandidateRun),m_Polygon, m_CurrentState);
m_CurrentLine--;
m_CurrentRun = secondCandidateRun;
......@@ -307,7 +307,7 @@ LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
// Down-Left case
m_CurrentState = DOWN_LEFT;
m_PositionFlag = LEFT_END;
WalkLeft(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),polygon, m_CurrentState);
WalkLeft(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),m_Polygon, m_CurrentState);
}
}
......@@ -317,7 +317,7 @@ LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
goesOn = m_CurrentPoint != m_StartingPoint;
}
return polygon;
return m_Polygon;
}
template<class TLabelObject, class TPolygon>
......
......@@ -117,7 +117,7 @@ VectorDataExtractROI<TVectorData>
chrono.Start();
ProcessNode(inputRoot,outputRoot);
chrono.Stop();
std::cout<<"VectorDataExtractROI: "<<m_Kept<<" Features processed in "<<chrono.GetMeanTime()<<" seconds."<<std::endl;
otbMsgDevMacro(<<"VectorDataExtractROI: "<<m_Kept<<" Features processed in "<<chrono.GetMeanTime()<<" seconds.");
}/*End GenerateData()*/
......
......@@ -357,7 +357,11 @@ ImageFileReader<TOutputImage>
{
otbMsgDevMacro( <<"OSSIM Open Image SUCCESS ! ");
// hasMetaData = handler->getImageGeometry(geom_kwl);
hasMetaData = handler->saveState(geom_kwl);
ossimProjection* projection = handler->getImageGeometry()->getProjection();
if (projection)
{
hasMetaData = projection->saveState(geom_kwl);
}
}
// Free memory
delete handler;
......
......@@ -108,9 +108,11 @@ ImageFileWriter<TInputImage>
}
else
{
//FIXME find out exactly what we are trying to do here
//there is no meaning to blindly save the kwl if we didn't update it in the pipeline
// handler->setImageGeometry(geom_kwl);
handler->loadState(geom_kwl);
handler->saveImageGeometry();
// handler->getImageGeometry()->getProjection()->loadState(geom_kwl);
// handler->saveImageGeometry();
handler->close();
}
}
......
......@@ -124,7 +124,7 @@ private:
/** \class OTB_GCP
*
* \brief This OTB_GCP class is used to manege the GCP parameters
* \brief This OTB_GCP class is used to manage the GCP parameters
* in OTB.
*
*/
......
......@@ -552,9 +552,12 @@ StreamingImageFileWriter<TInputImage>
}
else
{
//FIXME find out exactly what we are trying to do here
//there is no meaning to blindly save the kwl if we didn't update it in the pipeline
// handler->setImageGeometry(geom_kwl);
handler->loadState(geom_kwl);
handler->saveImageGeometry();
// handler->getImageGeometry()->getProjection()->loadState(geom_kwl);
//
// handler->saveImageGeometry();
handler->close();
}
}
......
......@@ -120,7 +120,7 @@ GenericMapProjection<Transform, TScalarType, NInputDimensions, NOutputDimensions
if (!projectionInformationAvailable)
{
std::cout << "WARNING: Impossible to create the projection from string: "<< m_ProjectionRefWkt << std::endl;
otbMsgDevMacro(<<"WARNING: Impossible to create the projection from string: "<< m_ProjectionRefWkt);
return false;
}
......@@ -129,7 +129,7 @@ GenericMapProjection<Transform, TScalarType, NInputDimensions, NOutputDimensions
//a better solution might be available...
if (std::string(kwl.find("type")) == "ossimEquDistCylProjection")
{
std::cout << "WARNING: Not instanciating a ossimEquDistCylProjection"<< std::endl;
otbMsgDevMacro(<< "WARNING: Not instanciating a ossimEquDistCylProjection");
return false;
}
......
This diff is collapsed.
......@@ -51,8 +51,6 @@ public:
itkGetMacro( Lat, double );
itkGetMacro( PlaceName, std::string );
itkSetMacro( Lon, double );
itkSetMacro( Lat, double );
itkSetMacro( PlaceName, std::string );
typedef enum {ALL, GEONAMES, GOOGLE, YAHOO} SearchMethodEnum;//Not implemented yet TODO
......@@ -80,5 +78,4 @@ private:
} // namespace otb
#endif
......@@ -43,7 +43,7 @@ SensorModelBase< TScalarType,NInputDimensions,NOutputDimensions>
m_DEMHandler = DEMHandlerType::New();
m_UseDEM = false;
m_DEMIsLoaded = false;
m_AverageElevation = -32768.0;
m_AverageElevation = 0.0;
}
......
......@@ -3,7 +3,7 @@
FILE(GLOB OTBRadiometry_SRCS "*.cxx" )
ADD_LIBRARY(OTBRadiometry ${OTBRadiometry_SRCS})
TARGET_LINK_LIBRARIES (OTBRadiometry OTBCommon otb6S otbossim otbossim)
TARGET_LINK_LIBRARIES (OTBRadiometry OTBCommon otb6S)
IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(OTBRadiometry PROPERTIES ${OTB_LIBRARY_PROPERTIES})
ENDIF(OTB_LIBRARY_PROPERTIES)
......
......@@ -116,8 +116,12 @@ ADD_TEST(prTePlaceNameToLonLatExampleTest ${EXE_TESTS2}
Toulouse
)
ADD_TEST(prTeCoordinateToNameExampleTest ${EXE_TESTS2}
--compare-ascii ${TOL}
${BASELINE}/CoordinateToNameExample.txt
${TEMP}/CoordinateToNameExample.txt
CoordinateToNameExampleTest
103.78 1.29
${TEMP}/CoordinateToNameExample.txt
)
ENDIF( OTB_USE_CURL )
......
......@@ -19,21 +19,22 @@
#pragma warning ( disable : 4786 )
#endif
#include <fstream>
#include "otbCoordinateToName.h"
int main( int argc, char* argv[] )
{
if (argc!=3)
if (argc!=4)
{
std::cout << argv[0] <<" <lon> <lat>"
std::cout << argv[0] <<" <lon> <lat> <outputfile>"
<< std::endl;
return EXIT_FAILURE;
}
const char * outFileName = argv[3];
otb::CoordinateToName::Pointer conv = otb::CoordinateToName::New();
conv->SetLon(atof(argv[1]));
......@@ -46,6 +47,11 @@ int main( int argc, char* argv[] )
std::cout << "Nearby place: " << name << std::endl;
std::cout << "Country: " << country << std::endl;
std::ofstream file;
file.open(outFileName);
file << "Nearby place: " << name << std::endl;
file << "Country: " << country << std::endl;
file.close();
return EXIT_SUCCESS;
......
# data file for the Fltk User Interface Designer (fluid)
version 1.0110
version 1.0107
i18n_type 1
i18n_include "otbI18n.h"
i18n_function otbGetTextMacro
......
# data file for the Fltk User Interface Designer (fluid)
version 1.0110
version 1.0107
i18n_type 1
i18n_include "otbI18n.h"
i18n_function otbGetTextMacro
......
......@@ -23,7 +23,12 @@ IF(OTB_USE_VISU_GUI)
ADD_EXECUTABLE(SimpleViewer SimpleViewer.cxx )
TARGET_LINK_LIBRARIES(SimpleViewer OTBCommon OTBIO OTBGui OTBVisualization ${OTB_VISU_GUI_LIBRARIES})
SUBDIRS(BasicApplication)
# The basic application tutorial makes use of the otbApplicationsCommon library which is built in OTB-Applications package.
# Therefore this tutorial will not compile until we move the OTBApplcationsCommon lib to the OTB. Until then,
# the following line will be commented out.
# SUBDIRS(BasicApplication)
ENDIF(OTB_USE_VISU_GUI)
ADD_EXECUTABLE(OrthoFusion OrthoFusion.cxx )
......
This diff is collapsed.
This diff is collapsed.
......@@ -75,7 +75,7 @@ int otbCreateProjectionWithOSSIM( int argc, char* argv[] )
ossimKeywordlist geom;
otbGenericMsgDebugMacro(<< "Read ossim Keywordlist..." );
handler->saveState(geom);
handler->getImageGeometry()->getProjection()->saveState(geom);
ossimGpt ossimGPoint(0,0);
ossimDpt ossimDPoint;
otbGenericMsgDebugMacro(<< "Creating projection..." );
......
......@@ -62,10 +62,10 @@ int otbSensorModel( int argc, char* argv[] )
forwardSensorModel->SetAverageElevation(16.19688987731934);
itk::Point<double,2> imagePoint;
// imagePoint[0]=10;
// imagePoint[1]=10;
imagePoint[0]=3069;
imagePoint[1]=1218;
imagePoint[0]=10;
imagePoint[1]=10;
// imagePoint[0]=3069;
// imagePoint[1]=1218;
itk::Point<double,2> geoPoint;
geoPoint = forwardSensorModel->TransformPoint(imagePoint);
......
......@@ -90,7 +90,7 @@ int ossimIntegrationTest(int argc, char* argv[])
ossimKeywordlist geom;
// handler->getImageGeometry(geom);
handler->saveState(geom);
handler->getImageGeometry()->getProjection()->saveState(geom);
// grab a projection if it exists
//
ossimProjection* inputProjection = ossimProjectionFactoryRegistry::instance()->createProjection(geom);
......
......@@ -47,7 +47,7 @@ int ossimKeywordlistTest(int argc, char* argv[])
}
ossimKeywordlist geom;
handler->saveState(geom);
handler->getImageGeometry()->getProjection()->saveState(geom);
ofstream file;
file.open(argv[2]);
file << " keywordlist:"<<std::endl<<geom<<std::endl;
......
This diff is collapsed.
......@@ -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,
......
......@@ -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;
......
......@@ -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
......
......@@ -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.
......
......@@ -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;
......
......@@ -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:
......
......@@ -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(
......
......@@ -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;
......
......@@ -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;
......