[Playerstage-commit] code/player/server/drivers/camera/yarp .cvsignore, 1.1, 1.1.4.1 YarpImage.cc, 1.3, 1.3.2.1

[Toby C. <th...@us...>]

Update of /cvsroot/playerstage/code/player/server/drivers/camera/yarp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25787/server/drivers/camera/yarp

Modified Files:
      Tag: b_thjc_dynamic_arrays
	.cvsignore YarpImage.cc 
Log Message:
Merged some changes from head a while back

Work on updating drivers, A-J done,  laser is next

Index: .cvsignore
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/camera/yarp/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -d -r1.1 -r1.1.4.1
*** .cvsignore	8 Aug 2006 18:42:38 -0000	1.1
--- .cvsignore	10 Oct 2007 09:26:11 -0000	1.1.4.1
***************
*** 1,2 ****
--- 1,4 ----
  Makefile
  Makefile.in
+ .deps
+ *.la

Index: YarpImage.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/camera/yarp/YarpImage.cc,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** YarpImage.cc	23 Aug 2007 19:58:43 -0000	1.3
--- YarpImage.cc	10 Oct 2007 09:26:11 -0000	1.3.2.1
***************
*** 268,271 ****
--- 268,272 ----
                  cam_data.format = PLAYER_CAMERA_FORMAT_MONO8;
                  cam_data.image_count = imgIn->getRawImageSize () / 3;
+                 cam_data.image = new unsigned char [cam_data.image_count];
  
                  for (int i=0; i <= (imgIn->getRawImageSize ()/3) ; i++) {
***************
*** 285,288 ****
--- 286,290 ----
                  cam_data.format = PLAYER_CAMERA_FORMAT_RGB888;
                  cam_data.image_count = imgIn->getRawImageSize ();
+                 cam_data.image = new unsigned char [cam_data.image_count];
                  for (int i=0; i <= (imgIn->getRawImageSize ()) ; i++) {
                      unsigned char value = *(unsigned char *)
***************
*** 295,299 ****
          }
          Publish (this->cam_id, PLAYER_MSGTYPE_DATA, PLAYER_CAMERA_DATA_STATE,
!                  &cam_data, sizeof (player_camera_data_t), NULL);
      }
  }
--- 297,303 ----
          }
          Publish (this->cam_id, PLAYER_MSGTYPE_DATA, PLAYER_CAMERA_DATA_STATE,
!                  &cam_data);
!         delete [] cam_data.image;
! 
      }
  }