[Personalrobots-commit] SF.net SVN: personalrobots: [604] pkg/trunk

[<hsu...@us...>]

Revision: 604
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=604&view=rev
Author:   hsujohnhsu
Date:     2008-06-03 08:53:04 -0700 (Tue, 03 Jun 2008)

Log Message:
-----------
updates to gazebo makefile for 3rd party software

Modified Paths:
--------------
    pkg/trunk/3rdparty/gazebo/Makefile
    pkg/trunk/vision/cam_viewer/cam_viewer.cpp

Modified: pkg/trunk/3rdparty/gazebo/Makefile
===================================================================
--- pkg/trunk/3rdparty/gazebo/Makefile	2008-06-03 06:15:37 UTC (rev 603)
+++ pkg/trunk/3rdparty/gazebo/Makefile	2008-06-03 15:53:04 UTC (rev 604)
@@ -4,9 +4,7 @@
 	@if [ ! -d gazebo ]; then git clone /u/pr/simpr/pr2sim.git gazebo-git; fi
 
 gazebo: gazebo-git
-	cd gazebo-git && /bin/bash -c "source setup.bash; cd packages; make"
-	cd gazebo-git && /bin/bash -c "source setup.bash; cd plugin; scons; scons install"
-	cd gazebo-git && /bin/bash -c "source setup.bash; cd examples/pr2API; scons; scons install"
+	(cd gazebo-git && /bin/bash -c "source setup.bash; make")
 
 clean:
 	-cd gazebo-git && make clean

Modified: pkg/trunk/vision/cam_viewer/cam_viewer.cpp
===================================================================
--- pkg/trunk/vision/cam_viewer/cam_viewer.cpp	2008-06-03 06:15:37 UTC (rev 603)
+++ pkg/trunk/vision/cam_viewer/cam_viewer.cpp	2008-06-03 15:53:04 UTC (rev 604)
@@ -23,7 +23,7 @@
     IplImage *cv_image = cvCreateImage( cvSize( image_msg.width, image_msg.height), IPL_DEPTH_8U, 3);
     memcpy(cv_image->imageData, image_msg.data, cv_image->imageSize);
     cvShowImage("cam_viewer", cv_image);
-    cvWaitKey(3);
+    cvWaitKey(10);
     cvReleaseImage(&cv_image);
   }
 };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.