diff options
author | Travis CI <zmoelnig@travis-ci.umlaeute.mur.at> | 2019-01-07 18:46:47 +0000 |
---|---|---|
committer | Travis CI <zmoelnig@travis-ci.umlaeute.mur.at> | 2019-01-07 18:46:47 +0000 |
commit | 5c9af39cfd345fffa826958615fd7c16f630bf52 (patch) | |
tree | 752b6fff65803c4bfd15ab3d76dd36ff3e385c53 | |
parent | 4b0ae1ca2f680a3148a65960a4aeec647b7129f3 (diff) |
Gem 8d663a43c3a8c10e7ed7666131fa412a4db6bb32 linux/amd64
built 'master:8d663a43c3a8c10e7ed7666131fa412a4db6bb32' for linux/amd64
-rwxr-xr-x | Gem/Gem.pd_linux | bin | 33385672 -> 33385168 bytes | |||
-rw-r--r-- | Gem/develop/include/Gem/Gem/State.h | 4 | ||||
-rw-r--r-- | Gem/develop/include/Gem/Utils/any.h | 33 | ||||
-rwxr-xr-x | Gem/gem_filmGMERLIN.so | bin | 149755 -> 149755 bytes | |||
-rwxr-xr-x | Gem/gem_filmMPEG3.so | bin | 176942 -> 176934 bytes | |||
-rwxr-xr-x | Gem/gem_filmQT4L.so | bin | 167252 -> 167244 bytes | |||
-rwxr-xr-x | Gem/gem_imageJPEG.so | bin | 190637 -> 190637 bytes | |||
-rwxr-xr-x | Gem/gem_imageMAGICK.so | bin | 275762 -> 275754 bytes | |||
-rwxr-xr-x | Gem/gem_imageSGI.so | bin | 259809 -> 259841 bytes | |||
-rwxr-xr-x | Gem/gem_imageTIFF.so | bin | 304898 -> 304890 bytes | |||
-rwxr-xr-x | Gem/gem_modelOBJ.so | bin | 694832 -> 694840 bytes | |||
-rwxr-xr-x | Gem/gem_recordQT4L.so | bin | 456531 -> 456531 bytes | |||
-rwxr-xr-x | Gem/gem_recordV4L.so | bin | 127337 -> 127337 bytes | |||
-rwxr-xr-x | Gem/gem_recordV4L2.so | bin | 126128 -> 126128 bytes | |||
-rwxr-xr-x | Gem/gem_videoDC1394.so | bin | 417498 -> 417498 bytes | |||
-rwxr-xr-x | Gem/gem_videoDV4L.so | bin | 284368 -> 284368 bytes | |||
-rwxr-xr-x | Gem/gem_videoUNICAP.so | bin | 546212 -> 546212 bytes | |||
-rwxr-xr-x | Gem/gem_videoV4L.so | bin | 475554 -> 475554 bytes | |||
-rwxr-xr-x | Gem/gem_videoV4L2.so | bin | 600100 -> 600100 bytes | |||
-rwxr-xr-x | Gem/gem_videoVNC.so | bin | 245539 -> 245539 bytes |
20 files changed, 33 insertions, 4 deletions
diff --git a/Gem/Gem.pd_linux b/Gem/Gem.pd_linux Binary files differindex bc624a0..c9a2a3c 100755 --- a/Gem/Gem.pd_linux +++ b/Gem/Gem.pd_linux diff --git a/Gem/develop/include/Gem/Gem/State.h b/Gem/develop/include/Gem/Gem/State.h index b09ace4..173acf9 100644 --- a/Gem/develop/include/Gem/Gem/State.h +++ b/Gem/develop/include/Gem/Gem/State.h @@ -61,8 +61,8 @@ public: typedef enum { _ILLEGAL=-1, _DIRTY, /* "dirty" */ - _TIMING_TICK, /* "timing.tick" */ - _PIX, /* "pix" */ + _TIMING_TICK, /* "timing.tick" <float> */ + _PIX, /* "pix", <*pixBuffer> */ _GL_STACKS, /* "stacks" */ _GL_DISPLAYLIST, /* */ _GL_LIGHTING, /* */ diff --git a/Gem/develop/include/Gem/Utils/any.h b/Gem/develop/include/Gem/Utils/any.h index 5841c79..0861e19 100644 --- a/Gem/develop/include/Gem/Utils/any.h +++ b/Gem/develop/include/Gem/Utils/any.h @@ -27,6 +27,7 @@ #include <algorithm> #include <string> +//#define GEM_ANY_TYPEID_HACK namespace gem { @@ -70,7 +71,7 @@ struct fxns { struct type { static const std::type_info& get_type(void) { -#if 0 +#if GEM_ANY_TYPEID_HACK const std::type_info&res=typeid(T); // the following is a dummy use of the type_info struct // to make the template engine work properly on OSX/10.9 @@ -104,7 +105,7 @@ struct fxns<false> { struct type { static const std::type_info& get_type(void) { -#if 0 +#if GEM_ANY_TYPEID_HACK const std::type_info&res=typeid(T); return res; #else @@ -353,6 +354,34 @@ T const& any_cast(any const& this_) { return *any_cast<T>(const_cast<any*>(&this_)); } +#ifdef GEM_INTERNAL +// Note: The "unsafe" versions of any_cast are not part of the +// public interface (and hence protected by GEM_INTERNAL) and may +// be removed at any time. They are required where we know what type +// is stored in the any and can't use typeid() comparison, e.g., +// when our types may travel across different shared libraries. +template<typename T> +T* unsafe_any_cast(any* this_) +{ + if (sizeof(T) <= sizeof(void*)) { + return reinterpret_cast<T*>(&this_->object); + } else { + return reinterpret_cast<T*>(this_->object); + } +} + +template<typename T> +T const* unsafe_any_cast(any const* this_) +{ + return unsafe_any_cast<T>(const_cast<any*>(this_)); +} + +template<typename T> +T const& unsafe_any_cast(any const& this_) +{ + return *unsafe_any_cast<T>(const_cast<any*>(&this_)); +} +#endif } #ifdef _MSC_VER diff --git a/Gem/gem_filmGMERLIN.so b/Gem/gem_filmGMERLIN.so Binary files differindex 32bc06c..379248a 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 1a701c9..65dc577 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 a71ffc3..5214d91 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 a3f80be..29bec5f 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 f0f30ef..880f957 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 8da571b..8ff9228 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 2fcc434..125afe4 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 b07a69d..671e671 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 58d8828..44633c3 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 1a119c1..c051cbf 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 264e314..e8af69a 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 f2a30d9..dd46315 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 cf13113..b688521 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 7031d93..5397e2c 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 aa5c23c..9b9dd66 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 67d5654..a616797 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 17f0b58..3835ce1 100755 --- a/Gem/gem_videoVNC.so +++ b/Gem/gem_videoVNC.so |