compilation for VC9

parent a330b0e2
......@@ -245,7 +245,7 @@ namespace lima {
struct cmpParameters
{
bool operator() (const CtSaving::Parameters &p1,
const CtSaving::Parameters &p2)
const CtSaving::Parameters &p2) const
{
return (p1.nextNumber < p2.nextNumber ||
p1.prefix < p2.prefix ||
......
......@@ -204,9 +204,7 @@ void CtSaving::Parameters::checkValid() const
"multi frame per file";
break;
#endif
#ifndef __unix
#pragma message ( "--- WARNING / TODO - no cases???" )
#endif
case EDF:
default:
break;
}
......@@ -1073,9 +1071,9 @@ void CtSaving::_getTaskList(TaskType type, long frame_nr,
task_list.push_back(save_task);
}
}
int nb_cbk = task_list.size();
size_t nb_cbk = task_list.size();
DEB_TRACE() << DEB_VAR1(nb_cbk);
FrameCbkCountMap::value_type map_pair(frame_nr, nb_cbk);
FrameCbkCountMap::value_type map_pair(frame_nr, long(nb_cbk));
m_nb_cbk.insert(map_pair);
}
/** @brief clear the common header
......@@ -2031,7 +2029,7 @@ void CtSaving::SaveContainer::setStatisticSize(int aSize)
AutoMutex aLock = AutoMutex(m_cond.mutex());
if(long(m_statistic.size()) > aSize)
{
int aDiffSize = m_statistic.size() - aSize;
size_t aDiffSize = m_statistic.size() - aSize;
for(StatisticsType::iterator i = m_statistic.begin();
aDiffSize;--aDiffSize)
m_statistic.erase(i++);
......
......@@ -324,9 +324,9 @@ __int64 SaveContainerEdf::_OfStream::tellp() const
}
SaveContainerEdf::_OfStream&
SaveContainerEdf::_OfStream::write(const char* data,int size)
SaveContainerEdf::_OfStream::write(const char* data,size_t size)
{
int nbItemsWritten = fwrite(data,size,1,m_fout);
size_t nbItemsWritten = fwrite(data,size,1,m_fout);
if(nbItemsWritten <= 0 &&
(m_exc_flag & std::ios_base::badbit))
throw std::ios_base::failure("Failed to write");
......
......@@ -104,7 +104,7 @@ namespace lima {
bool is_open() const;
void close();
_int64 tellp() const;
inline _OfStream& write(const char* data,int size);
inline _OfStream& write(const char* data,size_t size);
inline _OfStream& operator<< (const char *data);
inline _OfStream& operator<< (const std::string& data);
inline _OfStream& operator<< (const int data);
......
......@@ -93,9 +93,9 @@ namespace lima
void unregisterCallback(Callback *cbk);
protected:
virtual void _setActive(bool, int stream_idx=0) {}
virtual void _prepare(int stream_idx=0) {}
virtual void _start(int stream_idx=0) {}
virtual void _setActive(bool, int =0) {}
virtual void _prepare(int =0) {}
virtual void _start(int =0) {}
/** @brief return the full path of acquired image
*/
std::string _getFullPath(int image_number, int stream_idx=0) const;
......
......@@ -120,4 +120,7 @@ using namespace lima;
virtual void getStatus(StatusType& status /Out/) = 0;
virtual int getNbAcquiredFrames();
virtual int getNbHwAcquiredFrames() = 0;
virtual bool firstProcessingInPlace() const ;
};
......@@ -40,24 +40,30 @@ public:
explicit HwSavingCtrlObj(int capabilities = 0);
virtual ~HwSavingCtrlObj();
virtual void setActive(bool);
bool isActive() const;
virtual void setActive(bool, int stream_idx=0);
virtual bool isActive(int stream_idx=0) const;
virtual void setDirectory(const std::string&, int stream_idx=0);
virtual void setPrefix(const std::string&, int stream_idx=0);
virtual void setSuffix(const std::string&, int stream_idx=0);
virtual void setNextNumber(long number, int stream_idx=0);
virtual void setIndexFormat(const std::string&, int stream_idx=0);
virtual void setOverwritePolicy(const std::string &overwritePolicy, int stream_idx=0);
virtual void setSaveFormat(const std::string &format, int stream_idx=0);
virtual void setFramesPerFile(long, int stream_idx=0);
virtual void setOptions(const std::string&, int stream_idx=0);
void setDirectory(const std::string&);
void setPrefix(const std::string&);
void setSuffix(const std::string&);
void setNextNumber(long number);
void setIndexFormat(const std::string&);
void setOverwritePolicy(const std::string&);
void setSaveFormat(const std::string &format);
virtual void getPossibleSaveFormat(std::list<std::string> &format_list) const = 0;
int getCapabilities() const;
virtual void writeFrame(int frame_nr = -1,int nb_frames = 1);
virtual void readFrame(HwFrameInfoType&,int frame_nr);
virtual void writeFrame(HwFrameInfoType& info, int stream_idx=0);
virtual void writeFrame(int frame_nr = -1,int nb_frames = 1, int stream_idx=0);
virtual void readFrame(HwFrameInfoType&,int frame_nr, int stream_idx=0);
//virtual void setCommonHeader(const std::map<std::string,std::string>&);
virtual void resetCommonHeader();
......@@ -76,12 +82,12 @@ void setOverwritePolicy(const std::string&);
void unregisterCallback(Callback *cbk);
protected:
virtual void _setActive(bool);
virtual void _prepare();
virtual void _start();
virtual void _setActive(bool, int stream_idx=0) ;
virtual void _prepare(int stream_idx=0) ;
virtual void _start(int stream_idx=0) ;
/** @brief return the full path of acquired image
*/
std::string _getFullPath(int image_number) const;
std::string _getFullPath(int image_number, int stream_idx=0) const;
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment