Update of /cvsroot/playerstage/code/gazebo/player
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29514/player
Modified Files:
CameraInterface.cc Makefile.am PtzInterface.cc
Log Message:
Changed libgazebo liscense to LGPL
Index: CameraInterface.cc
===================================================================
RCS file: /cvsroot/playerstage/code/gazebo/player/CameraInterface.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CameraInterface.cc 3 Mar 2006 21:11:04 -0000 1.2
--- CameraInterface.cc 16 Dec 2006 19:02:23 -0000 1.3
***************
*** 98,102 ****
this->data.bpp = 24;
this->data.fdiv = 1;
! this->data.format = PLAYER_CAMERA_FORMAT_RGB888;
this->data.compression = PLAYER_CAMERA_COMPRESS_RAW;
this->data.image_count = this->iface->data->image_size;
--- 98,103 ----
this->data.bpp = 24;
this->data.fdiv = 1;
! //this->data.format = PLAYER_CAMERA_FORMAT_RGB888;
! this->data.format = PLAYER_CAMERA_FORMAT_MONO8;
this->data.compression = PLAYER_CAMERA_COMPRESS_RAW;
this->data.image_count = this->iface->data->image_size;
Index: Makefile.am
===================================================================
RCS file: /cvsroot/playerstage/code/gazebo/player/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Makefile.am 15 Dec 2006 18:56:20 -0000 1.11
--- Makefile.am 16 Dec 2006 19:02:23 -0000 1.12
***************
*** 22,26 ****
libgazeboplugin_la_CPPFLAGS = $(AM_CPPFLAGS) @PLAYER_CFLAGS@ -I../libgazebo
libgazeboplugin_la_LDFLAGS = -L../libgazebo
! libgazeboplugin_la_LIBADD = @PLAYER_LIBS@ -lgazebo
EXTRA_DIST = gazebo.cfg
--- 22,26 ----
libgazeboplugin_la_CPPFLAGS = $(AM_CPPFLAGS) @PLAYER_CFLAGS@ -I../libgazebo
libgazeboplugin_la_LDFLAGS = -L../libgazebo
! libgazeboplugin_la_LIBADD = @PLAYER_LIBS@ -L$(top_buildir)/libgazebo -lgazebo
EXTRA_DIST = gazebo.cfg
Index: PtzInterface.cc
===================================================================
RCS file: /cvsroot/playerstage/code/gazebo/player/PtzInterface.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PtzInterface.cc 3 Mar 2006 21:11:04 -0000 1.3
--- PtzInterface.cc 16 Dec 2006 19:02:23 -0000 1.4
***************
*** 88,91 ****
--- 88,92 ----
gz_ptz_unlock(this->iface);
+ return 0;
}
***************
*** 115,119 ****
(void*)&pgeom, sizeof(pgeom), NULL );
! return(0);
}
}
--- 116,120 ----
(void*)&pgeom, sizeof(pgeom), NULL );
! return 0;
}
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
