[libcvd-members] libcvd/cvd_src/Linux dvbuffer.cc dvbuffer3_dc13...

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Edward Rosten <edrosten>        09/06/04 17:10:20

Modified files:
        cvd_src/Linux  : dvbuffer.cc dvbuffer3_dc1394v1.cc v4lcontrol.cc 

Log message:
        Fix some warnings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/Linux/dvbuffer.cc?cvsroot=libcvd&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/Linux/dvbuffer3_dc1394v1.cc?cvsroot=libcvd&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/Linux/v4lcontrol.cc?cvsroot=libcvd&r1=1.2&r2=1.3

Patches:
Index: dvbuffer.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/Linux/dvbuffer.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- dvbuffer.cc 25 Nov 2008 12:08:57 -0000      1.15
+++ dvbuffer.cc 4 Jun 2009 17:10:20 -0000       1.16
@@ -21,8 +21,8 @@
 /**************************************************************************
 **       Title: grab one gray image using libdc1394
 **    $RCSfile: dvbuffer.cc,v $
-**   $Revision: 1.15 $$Name:  $
-**       $Date: 2008/11/25 12:08:57 $
+**   $Revision: 1.16 $$Name:  $
+**       $Date: 2009/06/04 17:10:20 $
 **   Copyright: LGPL $Author: edrosten $
 ** Description:
 **
@@ -32,6 +32,9 @@
 **-------------------------------------------------------------------------
 **
 **  $Log: dvbuffer.cc,v $
+**  Revision 1.16  2009/06/04 17:10:20  edrosten
+**  Fix some warnings.
+**
 **  Revision 1.15  2008/11/25 12:08:57  edrosten
 **  Fixed mad return.
 **
@@ -444,7 +447,7 @@
  This releases memory that was mapped by
  dc1394_dma_setup_camera
 *****************************************************/
-void tom_dc1394_dma_release_camera(raw1394handle_t handle, const unsigned 
char* ring_buffer, int buffer_size, int dma_fd){
+void tom_dc1394_dma_release_camera(raw1394handle_t, const unsigned char* 
ring_buffer, int buffer_size, int dma_fd){
   if (ring_buffer){
     munmap((void*)ring_buffer,buffer_size);
   }

Index: dvbuffer3_dc1394v1.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/Linux/dvbuffer3_dc1394v1.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- dvbuffer3_dc1394v1.cc       6 May 2009 18:12:05 -0000       1.4
+++ dvbuffer3_dc1394v1.cc       4 Jun 2009 17:10:20 -0000       1.5
@@ -59,14 +59,16 @@
        case ZOOM:          return FEATURE_ZOOM;
        case PAN:           return FEATURE_PAN;
        case TILT:          return FEATURE_TILT;
+       case FRAME_RATE:                return FEATURE_FRAME_RATE;
        }
+               return -1;
     }
 
     RawDVBuffer3::RawDVBuffer3(DV3ColourSpace colourspace,
                               unsigned int nCamNumber,
-                              ImageRef irSize,
+                              ImageRef ,
                               float fFrameRate,
-                              ImageRef irOffset)
+                              ImageRef )
     {
       
       int mode;
@@ -148,7 +150,7 @@
       mpLDCP->pRawDCV->auto_on_off(DC_from_DV3_Feature(nFeature), bValue);
     }
    
-    void RawDVBuffer3::power_on_off(DV3Feature nFeature, bool bValue)
+    void RawDVBuffer3::power_on_off(DV3Feature, bool)
     {
         // not implemented
         std::cout << "! Warning: DVBuffer3/libdc1394v1 power_on_off is only 
implemented for V2!" << std::endl;

Index: v4lcontrol.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/Linux/v4lcontrol.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- v4lcontrol.cc       16 Aug 2008 17:22:03 -0000      1.2
+++ v4lcontrol.cc       4 Jun 2009 17:10:20 -0000       1.3
@@ -299,7 +299,7 @@
     int last;
     const struct v4l2_queryctrl & data = controlData.find(id)->second;
 
-    for (querymenu.index = data.minimum; querymenu.index <= data.maximum; 
querymenu.index++) {
+    for (querymenu.index = data.minimum; (int)querymenu.index <= data.maximum; 
querymenu.index++) {
         if (0 != (last = ioctl (device, VIDIOC_QUERYMENU, &querymenu)))
             throw Exceptions::V4LControl::QueryParameters("reading menu item");
         menu.push_back(querymenu);