[Playerstage-commit] code/player/server/drivers/mixed/sr3000 sr3000.cc, 1.3, 1.4

[Brian G. <ge...@us...>]

Update of /cvsroot/playerstage/code/player/server/drivers/mixed/sr3000
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10464/player/server/drivers/mixed/sr3000

Modified Files:
	sr3000.cc 
Log Message:
applied Toby's autopointer patches

Index: sr3000.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/mixed/sr3000/sr3000.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sr3000.cc	11 Aug 2007 00:21:28 -0000	1.3
--- sr3000.cc	23 Aug 2007 19:58:46 -0000	1.4
***************
*** 106,111 ****
  
      // MessageHandler
!     virtual int ProcessMessage (MessageQueue * resp_queue,
!                                 player_msghdr * hdr,
                                  void * data);
  
--- 106,111 ----
  
      // MessageHandler
!     virtual int ProcessMessage (QueuePointer &resp_queue, 
!                                 player_msghdr * hdr, 
                                  void * data);
  
***************
*** 113,117 ****
  
      // Camera MessageHandler
!     int ProcessMessageCamera (MessageQueue* resp_queue,
                                player_msghdr * hdr,
                                void * data,
--- 113,117 ----
  
      // Camera MessageHandler
!     int ProcessMessageCamera (QueuePointer &resp_queue,
                                player_msghdr * hdr,
                                void * data,
***************
*** 296,300 ****
  // Process messages from/for a camera interface
  int
!     SR3000::ProcessMessageCamera (MessageQueue* resp_queue,
                                    player_msghdr * hdr,
                                    void * data,
--- 296,300 ----
  // Process messages from/for a camera interface
  int
!     SR3000::ProcessMessageCamera (QueuePointer &resp_queue, 
                                    player_msghdr * hdr,
                                    void * data,
***************
*** 472,477 ****
  ////////////////////////////////////////////////////////////////////////////////
  // ProcessMessage
! int
!     SR3000::ProcessMessage (MessageQueue* resp_queue,
                              player_msghdr * hdr,
                              void * data)
--- 472,476 ----
  ////////////////////////////////////////////////////////////////////////////////
  // ProcessMessage
! int SR3000::ProcessMessage (QueuePointer &resp_queue, 
                              player_msghdr * hdr,
                              void * data)
***************
*** 539,544 ****
      }
      // Write the Pointcloud3d data
!     Publish (pcloud_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_POINTCLOUD3D_DATA_STATE,
!              &pcloud_data, 4 + pcloud_data.points_count*sizeof (player_pointcloud3d_element_t),
               NULL);
  
--- 538,543 ----
      }
      // Write the Pointcloud3d data
!     Publish (pcloud_addr, PLAYER_MSGTYPE_DATA, PLAYER_POINTCLOUD3D_DATA_STATE,
!              &pcloud_data, 4 + pcloud_data.points_count*sizeof (player_pointcloud3d_element_t), 
               NULL);
  
***************
*** 558,562 ****
  
      // Write the distance camera data
!     Publish (d_cam_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_CAMERA_DATA_STATE,
               &d_cam_data, 28+(d_cam_data.image_count), NULL);
    }
--- 557,561 ----
  
      // Write the distance camera data
!     Publish (d_cam_addr, PLAYER_MSGTYPE_DATA, PLAYER_CAMERA_DATA_STATE,
               &d_cam_data, 28+(d_cam_data.image_count), NULL);
    }
***************
*** 575,579 ****
  
      // Write the intensity camera data
!     Publish (i_cam_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_CAMERA_DATA_STATE,
               &i_cam_data, 28+(i_cam_data.image_count), NULL);
    }
--- 574,578 ----
  
      // Write the intensity camera data
!     Publish (i_cam_addr, PLAYER_MSGTYPE_DATA, PLAYER_CAMERA_DATA_STATE,
               &i_cam_data, 28+(i_cam_data.image_count), NULL);
    }