[GEM-cvs] SF.net SVN: pd-gem:[4383] trunk/Gem/plugins/videoPYLON

[<zmo...@us...>]

Revision: 4383
          http://pd-gem.svn.sourceforge.net/pd-gem/?rev=4383&view=rev
Author:   zmoelnig
Date:     2011-07-26 15:33:06 +0000 (Tue, 26 Jul 2011)

Log Message:
-----------
minor  fixes (out-of-range error)

Modified Paths:
--------------
    trunk/Gem/plugins/videoPYLON/CameraProperties.cpp
    trunk/Gem/plugins/videoPYLON/StreamGrabberProperties.cpp
    trunk/Gem/plugins/videoPYLON/videoPYLON.cpp
    trunk/Gem/plugins/videoPYLON/videoPYLON.h

Modified: trunk/Gem/plugins/videoPYLON/CameraProperties.cpp
===================================================================
--- trunk/Gem/plugins/videoPYLON/CameraProperties.cpp	2011-07-26 15:03:01 UTC (rev 4382)
+++ trunk/Gem/plugins/videoPYLON/CameraProperties.cpp	2011-07-26 15:33:06 UTC (rev 4383)
@@ -22,6 +22,7 @@
 #ifdef HAVE_PYLON
 #include "CameraProperties.h"
 #include <map>
+#include <sstream>
 
 namespace gem{namespace pylon{namespace cameraproperties{
   static gem::Properties writeprops, readprops;
@@ -290,9 +291,9 @@
     }                                                                   \
     static void setI_##T (DEVICE*device, const int i) {                 \
       if(i<0 || i>=enumap_##T.size()) {                                 \
-        std::string e="Out of range: ";                                 \
-        e+=i; e+=" must be within [0.."; e+=enumap_##T.size(); e+="]";  \
-        throw OUT_OF_RANGE_EXCEPTION(e);                                \
+        std::stringstream ss;                                           \
+        ss << "Out of range: " << i << " must be within [0.."<<enumap_##T.size()<<")"; \
+        throw OUT_OF_RANGE_EXCEPTION(ss.str());                         \
       }                                                                 \
       else {                                                            \
         const enum Basler_GigECameraParams::T##Enums v=static_cast<Basler_GigECameraParams:: T##Enums>(i); \

Modified: trunk/Gem/plugins/videoPYLON/StreamGrabberProperties.cpp
===================================================================
--- trunk/Gem/plugins/videoPYLON/StreamGrabberProperties.cpp	2011-07-26 15:03:01 UTC (rev 4382)
+++ trunk/Gem/plugins/videoPYLON/StreamGrabberProperties.cpp	2011-07-26 15:33:06 UTC (rev 4383)
@@ -66,9 +66,9 @@
     }                                                                   \
     static void setI_##T (DEVICE*device, const int i) {                 \
       if(i<0 || i>=enumap_##T.size()) {                                 \
-        std::string e="Out of range: ";                                 \
-        e+=i; e+=" must be within [0.."; e+=enumap_##T.size(); e+="]";  \
-        throw OUT_OF_RANGE_EXCEPTION(e);                                \
+        std::stringstream ss;                                           \
+        ss << "Out of range: " << i << " must be within [0.."<<enumap_##T.size()<<")"; \
+        throw OUT_OF_RANGE_EXCEPTION(ss.str());                         \
       }                                                                 \
       else {                                                            \
         const enum T##Enums v=static_cast<T##Enums>(i);                 \

Modified: trunk/Gem/plugins/videoPYLON/videoPYLON.cpp
===================================================================
--- trunk/Gem/plugins/videoPYLON/videoPYLON.cpp	2011-07-26 15:03:01 UTC (rev 4382)
+++ trunk/Gem/plugins/videoPYLON/videoPYLON.cpp	2011-07-26 15:33:06 UTC (rev 4383)
@@ -433,7 +433,6 @@
     close();
     return false;
   }
-
   return true;
 }
 /////////////////////////////////////////////////////////

Modified: trunk/Gem/plugins/videoPYLON/videoPYLON.h
===================================================================
--- trunk/Gem/plugins/videoPYLON/videoPYLON.h	2011-07-26 15:03:01 UTC (rev 4382)
+++ trunk/Gem/plugins/videoPYLON/videoPYLON.h	2011-07-26 15:33:06 UTC (rev 4383)
@@ -71,16 +71,16 @@
     
     //////////
     // Start up the video device
-    // [out] int - returns 0 if bad
-    bool	    	startTransfer();
+    // [out] bool - returns FALSE if bad
+    bool	    	startTransfer(void);
     //////////
     // Stop the video device
-    // [out] int - returns 0 if bad
-    bool	   	stopTransfer();
+    // [out] bool - returns FALSE if bad
+    bool	   	stopTransfer(void);
     
     //////////
     // get the next frame
-    bool grabFrame();
+    bool grabFrame(void);
 
     virtual std::vector<std::string>enumerate(void);
 


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