From: Dominic L. <ma...@us...> - 2006-12-04 19:20:08
|
Update of /cvsroot/robotflow/RobotFlow/OpenCV/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18544/OpenCV/src Modified Files: DrawPFParticle.cc GetVisualROIParam.cc PFState2VisualROI.cc VisualTargetPFInterface.cc Log Message: fixed for gcc 4.1.2 and prefix configuration Index: GetVisualROIParam.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/OpenCV/src/GetVisualROIParam.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GetVisualROIParam.cc 28 Jul 2005 14:59:47 -0000 1.1 --- GetVisualROIParam.cc 4 Dec 2006 19:19:58 -0000 1.2 *************** *** 66,70 **** { public: ! GetVisualROIParam::GetVisualROIParam(string nodeName, ParameterSet params) : BufferedNode(nodeName, params) { --- 66,70 ---- { public: ! GetVisualROIParam(string nodeName, ParameterSet params) : BufferedNode(nodeName, params) { *************** *** 78,86 **** } ! virtual GetVisualROIParam::~GetVisualROIParam() { } ! void GetVisualROIParam::calculate(int output_id, int count, Buffer &out) { try { --- 78,86 ---- } ! virtual ~GetVisualROIParam() { } ! void calculate(int output_id, int count, Buffer &out) { try { Index: VisualTargetPFInterface.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/OpenCV/src/VisualTargetPFInterface.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** VisualTargetPFInterface.cc 28 Jul 2005 14:59:47 -0000 1.1 --- VisualTargetPFInterface.cc 4 Dec 2006 19:19:58 -0000 1.2 *************** *** 93,97 **** { public: ! VisualTargetPFInterface::VisualTargetPFInterface(string nodeName, ParameterSet params) : BufferedNode(nodeName, params), m_needNewTarget(true) --- 93,97 ---- { public: ! VisualTargetPFInterface(string nodeName, ParameterSet params) : BufferedNode(nodeName, params), m_needNewTarget(true) *************** *** 129,133 **** } ! VisualTargetPFInterface::~VisualTargetPFInterface() { --- 129,133 ---- } ! ~VisualTargetPFInterface() { *************** *** 135,139 **** // Modified BufferedNode request method to support cyclic node connection ! void VisualTargetPFInterface::request(int output_id, const ParameterSet &req) { if (req.exist("LOOKAHEAD")) { --- 135,139 ---- // Modified BufferedNode request method to support cyclic node connection ! void request(int output_id, const ParameterSet &req) { if (req.exist("LOOKAHEAD")) { *************** *** 200,204 **** } ! void VisualTargetPFInterface::calculate(int output_id, int count, Buffer &out) { try { --- 200,204 ---- } ! void calculate(int output_id, int count, Buffer &out) { try { Index: DrawPFParticle.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/OpenCV/src/DrawPFParticle.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DrawPFParticle.cc 28 Jul 2005 14:59:47 -0000 1.1 --- DrawPFParticle.cc 4 Dec 2006 19:19:58 -0000 1.2 *************** *** 77,81 **** { public: ! DrawPFParticle::DrawPFParticle(string nodeName, ParameterSet params) : BufferedNode(nodeName, params) { --- 77,81 ---- { public: ! DrawPFParticle(string nodeName, ParameterSet params) : BufferedNode(nodeName, params) { *************** *** 102,106 **** } ! DrawPFParticle::~DrawPFParticle() { delete [] m_color; --- 102,106 ---- } ! ~DrawPFParticle() { delete [] m_color; *************** *** 108,112 **** // Modified BufferedNode request method to support cyclic node connection ! void DrawPFParticle::request(int output_id, const ParameterSet &req) { if (req.exist("LOOKAHEAD")) { --- 108,112 ---- // Modified BufferedNode request method to support cyclic node connection ! void request(int output_id, const ParameterSet &req) { if (req.exist("LOOKAHEAD")) { *************** *** 148,152 **** } ! void DrawPFParticle::calculate(int output_id, int count, Buffer &out) { try { --- 148,152 ---- } ! void calculate(int output_id, int count, Buffer &out) { try { Index: PFState2VisualROI.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/OpenCV/src/PFState2VisualROI.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PFState2VisualROI.cc 28 Jul 2005 14:59:47 -0000 1.1 --- PFState2VisualROI.cc 4 Dec 2006 19:19:58 -0000 1.2 *************** *** 65,69 **** { public: ! PFState2VisualROI::PFState2VisualROI(string nodeName, ParameterSet params) : BufferedNode(nodeName, params) { --- 65,69 ---- { public: ! PFState2VisualROI(string nodeName, ParameterSet params) : BufferedNode(nodeName, params) { *************** *** 94,103 **** } ! PFState2VisualROI::~PFState2VisualROI() { } ! void PFState2VisualROI::calculate(int output_id, int count, Buffer &out) { try { --- 94,103 ---- } ! ~PFState2VisualROI() { } ! void calculate(int output_id, int count, Buffer &out) { try { |