diff options
-rwxr-xr-x | Gem/Gem.pd_linux | bin | 32948597 -> 32963949 bytes | |||
-rw-r--r-- | Gem/develop/include/Gem/Gem/Dylib.h | 4 | ||||
-rw-r--r-- | Gem/develop/include/Gem/Gem/Exception.h | 12 | ||||
-rw-r--r-- | Gem/develop/include/Gem/Utils/GLUtil.h | 2 | ||||
-rw-r--r-- | Gem/develop/include/Gem/Utils/GemString.h | 3 | ||||
-rw-r--r-- | Gem/develop/include/Gem/Utils/any.h | 13 | ||||
-rwxr-xr-x | Gem/gem_filmGMERLIN.so | bin | 153062 -> 153062 bytes | |||
-rwxr-xr-x | Gem/gem_filmMPEG3.so | bin | 186004 -> 186004 bytes | |||
-rwxr-xr-x | Gem/gem_filmQT4L.so | bin | 171538 -> 171522 bytes | |||
-rwxr-xr-x | Gem/gem_imageJPEG.so | bin | 197213 -> 197221 bytes | |||
-rwxr-xr-x | Gem/gem_imageMAGICK.so | bin | 280359 -> 280359 bytes | |||
-rwxr-xr-x | Gem/gem_imageSGI.so | bin | 260267 -> 260275 bytes | |||
-rwxr-xr-x | Gem/gem_imageTIFF.so | bin | 309087 -> 309087 bytes | |||
-rwxr-xr-x | Gem/gem_modelOBJ.so | bin | 634667 -> 634667 bytes | |||
-rwxr-xr-x | Gem/gem_recordQT4L.so | bin | 468298 -> 468298 bytes | |||
-rwxr-xr-x | Gem/gem_recordV4L.so | bin | 127202 -> 127363 bytes | |||
-rwxr-xr-x | Gem/gem_recordV4L2.so | bin | 126033 -> 126186 bytes | |||
-rwxr-xr-x | Gem/gem_videoDC1394.so | bin | 427007 -> 427231 bytes | |||
-rwxr-xr-x | Gem/gem_videoDV4L.so | bin | 288628 -> 288636 bytes | |||
-rwxr-xr-x | Gem/gem_videoUNICAP.so | bin | 562140 -> 562148 bytes | |||
-rwxr-xr-x | Gem/gem_videoV4L.so | bin | 486869 -> 486885 bytes | |||
-rwxr-xr-x | Gem/gem_videoV4L2.so | bin | 607969 -> 607977 bytes | |||
-rwxr-xr-x | Gem/gem_videoVNC.so | bin | 252332 -> 252340 bytes | |||
-rwxr-xr-x | Gem/gemglxwindow.pd_linux | bin | 226761 -> 228001 bytes |
24 files changed, 22 insertions, 12 deletions
diff --git a/Gem/Gem.pd_linux b/Gem/Gem.pd_linux Binary files differindex 954c293..36b1cc4 100755 --- a/Gem/Gem.pd_linux +++ b/Gem/Gem.pd_linux diff --git a/Gem/develop/include/Gem/Gem/Dylib.h b/Gem/develop/include/Gem/Gem/Dylib.h index 1af65c1..5ed7fda 100644 --- a/Gem/develop/include/Gem/Gem/Dylib.h +++ b/Gem/develop/include/Gem/Gem/Dylib.h @@ -28,10 +28,10 @@ class GEM_EXTERN GemDylib { GemDylib(const CPPExtern*obj, const std::string libname, const std::string extension=std::string("") - ) throw(GemException); + ); // throws GemException GemDylib(const std::string libname, const std::string extension=std::string("") - ) throw(GemException); + ); // throws GemException GemDylib(const GemDylib&); diff --git a/Gem/develop/include/Gem/Gem/Exception.h b/Gem/develop/include/Gem/Gem/Exception.h index 6df277f..8815b0a 100644 --- a/Gem/develop/include/Gem/Gem/Exception.h +++ b/Gem/develop/include/Gem/Gem/Exception.h @@ -39,13 +39,13 @@ typedef struct _text t_object; class GEM_EXTERN GemException { public: - GemException(void) throw(); - GemException(const char*error) throw(); - GemException(const std::string error) throw(); - virtual ~GemException(void) throw(); + GemException(void); + GemException(const char*error); + GemException(const std::string error); + virtual ~GemException(void); - virtual const char *what(void) const throw(); - virtual void report(const char*origin=0) const throw(); + virtual const char *what(void) const; + virtual void report(const char*origin=0) const; private: const std::string ErrorString; }; diff --git a/Gem/develop/include/Gem/Utils/GLUtil.h b/Gem/develop/include/Gem/Utils/GLUtil.h index c550c07..16fa492 100644 --- a/Gem/develop/include/Gem/Utils/GLUtil.h +++ b/Gem/develop/include/Gem/Utils/GLUtil.h @@ -45,7 +45,7 @@ GEM_EXTERN extern int getGLbitfield(int argc, struct _atom *argv); public: GLuintMap(const std::string&name); virtual ~GLuintMap(); - GLuint get(float) throw(GemException&); + GLuint get(float); // throws GemException /* map a GLuint to float; if float is 0, the new mapping is created, * else we just update an existing one * updating is especially useful with multiple contexts */ diff --git a/Gem/develop/include/Gem/Utils/GemString.h b/Gem/develop/include/Gem/Utils/GemString.h index d134f50..d767bf0 100644 --- a/Gem/develop/include/Gem/Utils/GemString.h +++ b/Gem/develop/include/Gem/Utils/GemString.h @@ -28,7 +28,8 @@ namespace gem { GEM_EXTERN std::wstring getVisualLine(const std::wstring&); /* convert a UTF-8 string to wchar */ - GEM_EXTERN std::wstring toWstring(const char*str) throw(int); + // throws 'int', holding the position of the char that couldn't be converted + GEM_EXTERN std::wstring toWstring(const char*str); }; }; diff --git a/Gem/develop/include/Gem/Utils/any.h b/Gem/develop/include/Gem/Utils/any.h index dff11bb..331a797 100644 --- a/Gem/develop/include/Gem/Utils/any.h +++ b/Gem/develop/include/Gem/Utils/any.h @@ -34,9 +34,18 @@ namespace gem bad_any_cast(const std::type_info& src, const std::type_info& dest) : result(std::string("bad cast (")+src.name() + "->" + dest.name()+")") { } - virtual ~bad_any_cast(void) throw() + virtual ~bad_any_cast(void) +#if __cplusplus <= 199711L + throw() +#endif { } - virtual const char* what(void) const throw() { + virtual const char* what(void) const +#if __cplusplus > 199711L + noexcept +#else + throw() +#endif + { return result.c_str(); } const std::string result; diff --git a/Gem/gem_filmGMERLIN.so b/Gem/gem_filmGMERLIN.so Binary files differindex 614f6c4..0805de4 100755 --- a/Gem/gem_filmGMERLIN.so +++ b/Gem/gem_filmGMERLIN.so diff --git a/Gem/gem_filmMPEG3.so b/Gem/gem_filmMPEG3.so Binary files differindex 2ac16d1..8e20b56 100755 --- a/Gem/gem_filmMPEG3.so +++ b/Gem/gem_filmMPEG3.so diff --git a/Gem/gem_filmQT4L.so b/Gem/gem_filmQT4L.so Binary files differindex 76f49ac..7d15b01 100755 --- a/Gem/gem_filmQT4L.so +++ b/Gem/gem_filmQT4L.so diff --git a/Gem/gem_imageJPEG.so b/Gem/gem_imageJPEG.so Binary files differindex 2441268..9c604b6 100755 --- a/Gem/gem_imageJPEG.so +++ b/Gem/gem_imageJPEG.so diff --git a/Gem/gem_imageMAGICK.so b/Gem/gem_imageMAGICK.so Binary files differindex 1e742c8..7262626 100755 --- a/Gem/gem_imageMAGICK.so +++ b/Gem/gem_imageMAGICK.so diff --git a/Gem/gem_imageSGI.so b/Gem/gem_imageSGI.so Binary files differindex 65d14f2..0734f93 100755 --- a/Gem/gem_imageSGI.so +++ b/Gem/gem_imageSGI.so diff --git a/Gem/gem_imageTIFF.so b/Gem/gem_imageTIFF.so Binary files differindex 11407cb..a95ff8c 100755 --- a/Gem/gem_imageTIFF.so +++ b/Gem/gem_imageTIFF.so diff --git a/Gem/gem_modelOBJ.so b/Gem/gem_modelOBJ.so Binary files differindex b7f9540..4828828 100755 --- a/Gem/gem_modelOBJ.so +++ b/Gem/gem_modelOBJ.so diff --git a/Gem/gem_recordQT4L.so b/Gem/gem_recordQT4L.so Binary files differindex cae94a3..f8c8521 100755 --- a/Gem/gem_recordQT4L.so +++ b/Gem/gem_recordQT4L.so diff --git a/Gem/gem_recordV4L.so b/Gem/gem_recordV4L.so Binary files differindex a511446..83b4c63 100755 --- a/Gem/gem_recordV4L.so +++ b/Gem/gem_recordV4L.so diff --git a/Gem/gem_recordV4L2.so b/Gem/gem_recordV4L2.so Binary files differindex b989360..83f15b1 100755 --- a/Gem/gem_recordV4L2.so +++ b/Gem/gem_recordV4L2.so diff --git a/Gem/gem_videoDC1394.so b/Gem/gem_videoDC1394.so Binary files differindex 3db543f..158a1fe 100755 --- a/Gem/gem_videoDC1394.so +++ b/Gem/gem_videoDC1394.so diff --git a/Gem/gem_videoDV4L.so b/Gem/gem_videoDV4L.so Binary files differindex ab4c37d..914324e 100755 --- a/Gem/gem_videoDV4L.so +++ b/Gem/gem_videoDV4L.so diff --git a/Gem/gem_videoUNICAP.so b/Gem/gem_videoUNICAP.so Binary files differindex 42b59df..f540743 100755 --- a/Gem/gem_videoUNICAP.so +++ b/Gem/gem_videoUNICAP.so diff --git a/Gem/gem_videoV4L.so b/Gem/gem_videoV4L.so Binary files differindex 5fd1dce..797700c 100755 --- a/Gem/gem_videoV4L.so +++ b/Gem/gem_videoV4L.so diff --git a/Gem/gem_videoV4L2.so b/Gem/gem_videoV4L2.so Binary files differindex d1d2d2a..ec069a1 100755 --- a/Gem/gem_videoV4L2.so +++ b/Gem/gem_videoV4L2.so diff --git a/Gem/gem_videoVNC.so b/Gem/gem_videoVNC.so Binary files differindex ec34bb1..6c831ea 100755 --- a/Gem/gem_videoVNC.so +++ b/Gem/gem_videoVNC.so diff --git a/Gem/gemglxwindow.pd_linux b/Gem/gemglxwindow.pd_linux Binary files differindex 5463d17..67c9f83 100755 --- a/Gem/gemglxwindow.pd_linux +++ b/Gem/gemglxwindow.pd_linux |