Update of /cvsroot/playerstage/code/player/examples/libplayerc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25787/examples/libplayerc

Modified Files:
      Tag: b_thjc_dynamic_arrays
        speech_c_client.c vmap.c .cvsignore 
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/examples/libplayerc/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** .cvsignore  21 Aug 2007 23:38:57 -0000      1.4
--- .cvsignore  10 Oct 2007 09:26:08 -0000      1.4.2.1
***************
*** 4,5 ****
--- 4,7 ----
  speech_c_client
  vmap
+ .libs
+ .deps

Index: speech_c_client.c
===================================================================
RCS file: 
/cvsroot/playerstage/code/player/examples/libplayerc/speech_c_client.c,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** speech_c_client.c   21 Sep 2006 05:07:06 -0000      1.2
--- speech_c_client.c   10 Oct 2007 09:26:08 -0000      1.2.2.1
***************
*** 5,9 ****
  main(int argc, const char **argv)
  {
!   int i;
    playerc_client_t *client;
    playerc_speechrecognition_t *speech_recognition;
--- 5,9 ----
  main(int argc, const char **argv)
  {
!   //int i;
    playerc_client_t *client;
    playerc_speechrecognition_t *speech_recognition;

Index: vmap.c
===================================================================
RCS file: /cvsroot/playerstage/code/player/examples/libplayerc/vmap.c,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** vmap.c      20 Aug 2007 19:42:47 -0000      1.1
--- vmap.c      10 Oct 2007 09:26:08 -0000      1.1.2.1
***************
*** 44,55 ****
  
    PrintMapInfo(vmap);
- 
-   printf("Getting layer info\n");
-   if (playerc_vectormap_get_layer_info(vmap, 0))
-   {
-     printf("Error getting layer info\n");
-   }
- 
-   PrintMapInfo(vmap);
    PrintLayerInfo(vmap);
  
--- 44,47 ----
***************
*** 93,99 ****
  {
    printf("LayerInfo\n");
!   player_extent2d_t extent = vmap->layers[0]->info.extent;
    printf("extent = (%f %f, %f %f)\n", extent.x0, extent.y0, extent.x1, 
extent.y1);
!   printf("name = %s\n", vmap->layers[0]->info.name);
  }
  
--- 85,91 ----
  {
    printf("LayerInfo\n");
!   player_extent2d_t extent = vmap->layers_info[0]->extent;
    printf("extent = (%f %f, %f %f)\n", extent.x0, extent.y0, extent.x1, 
extent.y1);
!   printf("name = %s\n", vmap->layers_info[0]->name);
  }
  
***************
*** 101,105 ****
  {
    printf("LayerData\n");
!   printf("feature count = %d\n", vmap->layers[0]->features_count);
  }
  
--- 93,97 ----
  {
    printf("LayerData\n");
!   printf("feature count = %d\n", vmap->layers_data[0]->features_count);
  }
  
***************
*** 107,111 ****
  {
    printf("FeatureData\n");
!   printf("wkb count = %d\n", vmap->layers[0]->features[0].wkb_count);
!   printf("name = %s\n", vmap->layers[0]->features[0].name);
  }
--- 99,103 ----
  {
    printf("FeatureData\n");
!   printf("wkb count = %d\n", vmap->layers_data[0]->features[0].wkb_count);
!   printf("name = %s\n", vmap->layers_data[0]->features[0].name);
  }


-------------------------------------------------------------------------
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

Reply via email to