Update of /cvsroot/playerstage/code/player/server/drivers/fiducial
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11860/server/drivers/fiducial
Modified Files:
Tag: b_thjc_dynamic_arrays
laserbarcode.cc laservisualbw.cc laserbar.cc .cvsignore
laservisualbarcode.cc
Log Message:
dynamic array changes to drivers compile, still needs testing
added lots more .cvsignore settings for eclipse
Index: laservisualbw.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/fiducial/laservisualbw.cc,v
retrieving revision 1.19.2.1
retrieving revision 1.19.2.2
diff -C2 -d -r1.19.2.1 -r1.19.2.2
*** laservisualbw.cc 10 Oct 2007 09:26:03 -0000 1.19.2.1
--- laservisualbw.cc 19 Oct 2007 21:58:57 -0000 1.19.2.2
***************
*** 384,388 ****
camera->Unsubscribe(InQueue);
! free(fdata->fiducials);
return 0;
--- 384,388 ----
camera->Unsubscribe(InQueue);
! free(fdata.fiducials);
return 0;
***************
*** 590,596 ****
{
this->fdata_allocated = this->fiducial_count+1;
! this->fdata.fiducials = realloc(this->fdata.fiducials,
sizeof(this->fdata.fiducials[0])*this->fdata_allocated);
}
! minfiducial = &this->fiducials[this->fiducial_count-1]
minfiducial->id = -1;
minfiducial->pose[0] = pose[0];
--- 590,596 ----
{
this->fdata_allocated = this->fiducial_count+1;
! this->fdata.fiducials =
(player_fiducial_item_t*)realloc(this->fdata.fiducials,
sizeof(this->fdata.fiducials[0])*this->fdata_allocated);
}
! minfiducial = &this->fiducials[this->fiducial_count-1];
minfiducial->id = -1;
minfiducial->pose[0] = pose[0];
Index: laservisualbarcode.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/fiducial/laservisualbarcode.cc,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -C2 -d -r1.15.2.1 -r1.15.2.2
*** laservisualbarcode.cc 10 Oct 2007 09:26:03 -0000 1.15.2.1
--- laservisualbarcode.cc 19 Oct 2007 21:58:57 -0000 1.15.2.2
***************
*** 401,405 ****
blobfinder->Unsubscribe(InQueue);
! free(fdata->fiducials);
return 0;
--- 401,405 ----
blobfinder->Unsubscribe(InQueue);
! free(fdata.fiducials);
return 0;
***************
*** 611,617 ****
{
this->fdata_allocated = this->fiducial_count+1;
! this->fdata.fiducials = realloc(this->fdata.fiducials,
sizeof(this->fdata.fiducials[0])*this->fdata_allocated);
}
! minfiducial = &this->fiducials[this->fiducial_count-1]
minfiducial->id = -1;
minfiducial->pose[0] = pose[0];
--- 611,617 ----
{
this->fdata_allocated = this->fiducial_count+1;
! this->fdata.fiducials =
(player_fiducial_item_t*)realloc(this->fdata.fiducials,
sizeof(this->fdata.fiducials[0])*this->fdata_allocated);
}
! minfiducial = &this->fiducials[this->fiducial_count-1];
minfiducial->id = -1;
minfiducial->pose[0] = pose[0];
***************
*** 974,978 ****
// Copy data to server.
! Publish(device_addr, PLAYER_MSGTYPE_DATA, PLAYER_FIDUCIAL_DATA_SCAN,
(void*) &data, ×tamp);
}
--- 974,978 ----
// Copy data to server.
! Publish(device_addr, PLAYER_MSGTYPE_DATA, PLAYER_FIDUCIAL_DATA_SCAN,
(void*) &data, 0, ×tamp);
}
Index: .cvsignore
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/fiducial/.cvsignore,v
retrieving revision 1.1.20.1
retrieving revision 1.1.20.2
diff -C2 -d -r1.1.20.1 -r1.1.20.2
*** .cvsignore 10 Oct 2007 09:26:03 -0000 1.1.20.1
--- .cvsignore 19 Oct 2007 21:58:57 -0000 1.1.20.2
***************
*** 4,5 ****
--- 4,7 ----
*.la
*.a
+ .libs
+ *.lo
Index: laserbarcode.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/fiducial/laserbarcode.cc,v
retrieving revision 1.19.2.1
retrieving revision 1.19.2.2
diff -C2 -d -r1.19.2.1 -r1.19.2.2
*** laserbarcode.cc 10 Oct 2007 09:26:03 -0000 1.19.2.1
--- laserbarcode.cc 19 Oct 2007 21:58:57 -0000 1.19.2.2
***************
*** 181,185 ****
// Current fiducial data
private: player_fiducial_data_t data;
! int fdata_allocated;
};
--- 181,185 ----
// Current fiducial data
private: player_fiducial_data_t data;
! unsigned int fdata_allocated;
};
***************
*** 232,236 ****
{
fdata_allocated = 0;
! fdata.fiducials = NULL;
// Subscribe to the laser.
--- 232,236 ----
{
fdata_allocated = 0;
! data.fiducials = NULL;
// Subscribe to the laser.
***************
*** 266,270 ****
laser->Unsubscribe(InQueue);
! free(fdata->fiducials);
PLAYER_MSG0(2, "laserbarcode device: shutdown");
--- 266,270 ----
laser->Unsubscribe(InQueue);
! free(data.fiducials);
PLAYER_MSG0(2, "laserbarcode device: shutdown");
***************
*** 370,377 ****
continue;
! if (this->fdata.fiducials_count+1 > this->fdata_allocated)
{
! this->fdata_allocated = this->fdata.fiducials_count+1;
! this->fdata.fiducials = realloc(this->fdata.fiducials,
sizeof(this->fdata.fiducials[0])*this->fdata_allocated);
}
--- 370,377 ----
continue;
! if (this->data.fiducials_count+1 > this->fdata_allocated)
{
! this->fdata_allocated = this->data.fiducials_count+1;
! this->data.fiducials =
(player_fiducial_item_t*)realloc(this->data.fiducials,
sizeof(this->data.fiducials[0])*this->fdata_allocated);
}
Index: laserbar.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/fiducial/laserbar.cc,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -C2 -d -r1.20.2.1 -r1.20.2.2
*** laserbar.cc 10 Oct 2007 09:26:03 -0000 1.20.2.1
--- laserbar.cc 19 Oct 2007 21:58:57 -0000 1.20.2.2
***************
*** 176,180 ****
private: struct timeval ftimestamp;
private: player_fiducial_data_t fdata;
! int fdata_allocated;
};
--- 176,180 ----
private: struct timeval ftimestamp;
private: player_fiducial_data_t fdata;
! unsigned int fdata_allocated;
};
***************
*** 252,256 ****
this->laser_device = NULL;
! free(fdata->fiducials);
return 0;
}
--- 252,256 ----
this->laser_device = NULL;
! free(fdata.fiducials);
return 0;
}
***************
*** 316,320 ****
this->Publish(this->device_addr,
PLAYER_MSGTYPE_DATA, PLAYER_FIDUCIAL_DATA_SCAN,
! reinterpret_cast<void*>(&this->fdata), &hdr->timestamp);
return 0;
--- 316,320 ----
this->Publish(this->device_addr,
PLAYER_MSGTYPE_DATA, PLAYER_FIDUCIAL_DATA_SCAN,
! reinterpret_cast<void*>(&this->fdata),0, &hdr->timestamp);
return 0;
***************
*** 502,508 ****
{
this->fdata_allocated = this->fdata.fiducials_count;
! this->fdata.fiducials = realloc(this->fdata.fiducials,
sizeof(this->fdata.fiducials[0])*this->fdata_allocated);
}
! fiducial = this->fdata.fiducials[fdata.fiducials_count-1];
fiducial->id = (int16_t) -1;
--- 502,508 ----
{
this->fdata_allocated = this->fdata.fiducials_count;
! this->fdata.fiducials =
(player_fiducial_item_t*)realloc(this->fdata.fiducials,
sizeof(this->fdata.fiducials[0])*this->fdata_allocated);
}
! fiducial = &this->fdata.fiducials[fdata.fiducials_count-1];
fiducial->id = (int16_t) -1;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
