From 5c9af39cfd345fffa826958615fd7c16f630bf52 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 7 Jan 2019 18:46:47 +0000 Subject: Gem 8d663a43c3a8c10e7ed7666131fa412a4db6bb32 linux/amd64 built 'master:8d663a43c3a8c10e7ed7666131fa412a4db6bb32' for linux/amd64 --- Gem/Gem.pd_linux | Bin 33385672 -> 33385168 bytes Gem/develop/include/Gem/Gem/State.h | 4 ++-- Gem/develop/include/Gem/Utils/any.h | 33 +++++++++++++++++++++++++++++++-- Gem/gem_filmGMERLIN.so | Bin 149755 -> 149755 bytes Gem/gem_filmMPEG3.so | Bin 176942 -> 176934 bytes Gem/gem_filmQT4L.so | Bin 167252 -> 167244 bytes Gem/gem_imageJPEG.so | Bin 190637 -> 190637 bytes Gem/gem_imageMAGICK.so | Bin 275762 -> 275754 bytes Gem/gem_imageSGI.so | Bin 259809 -> 259841 bytes Gem/gem_imageTIFF.so | Bin 304898 -> 304890 bytes Gem/gem_modelOBJ.so | Bin 694832 -> 694840 bytes Gem/gem_recordQT4L.so | Bin 456531 -> 456531 bytes Gem/gem_recordV4L.so | Bin 127337 -> 127337 bytes Gem/gem_recordV4L2.so | Bin 126128 -> 126128 bytes Gem/gem_videoDC1394.so | Bin 417498 -> 417498 bytes Gem/gem_videoDV4L.so | Bin 284368 -> 284368 bytes Gem/gem_videoUNICAP.so | Bin 546212 -> 546212 bytes Gem/gem_videoV4L.so | Bin 475554 -> 475554 bytes Gem/gem_videoV4L2.so | Bin 600100 -> 600100 bytes 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 index bc624a0..c9a2a3c 100755 Binary files a/Gem/Gem.pd_linux and b/Gem/Gem.pd_linux differ 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" */ + _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 #include +//#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 { 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(const_cast(&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 +T* unsafe_any_cast(any* this_) +{ + if (sizeof(T) <= sizeof(void*)) { + return reinterpret_cast(&this_->object); + } else { + return reinterpret_cast(this_->object); + } +} + +template +T const* unsafe_any_cast(any const* this_) +{ + return unsafe_any_cast(const_cast(this_)); +} + +template +T const& unsafe_any_cast(any const& this_) +{ + return *unsafe_any_cast(const_cast(&this_)); +} +#endif } #ifdef _MSC_VER diff --git a/Gem/gem_filmGMERLIN.so b/Gem/gem_filmGMERLIN.so index 32bc06c..379248a 100755 Binary files a/Gem/gem_filmGMERLIN.so and b/Gem/gem_filmGMERLIN.so differ diff --git a/Gem/gem_filmMPEG3.so b/Gem/gem_filmMPEG3.so index 1a701c9..65dc577 100755 Binary files a/Gem/gem_filmMPEG3.so and b/Gem/gem_filmMPEG3.so differ diff --git a/Gem/gem_filmQT4L.so b/Gem/gem_filmQT4L.so index a71ffc3..5214d91 100755 Binary files a/Gem/gem_filmQT4L.so and b/Gem/gem_filmQT4L.so differ diff --git a/Gem/gem_imageJPEG.so b/Gem/gem_imageJPEG.so index a3f80be..29bec5f 100755 Binary files a/Gem/gem_imageJPEG.so and b/Gem/gem_imageJPEG.so differ diff --git a/Gem/gem_imageMAGICK.so b/Gem/gem_imageMAGICK.so index f0f30ef..880f957 100755 Binary files a/Gem/gem_imageMAGICK.so and b/Gem/gem_imageMAGICK.so differ diff --git a/Gem/gem_imageSGI.so b/Gem/gem_imageSGI.so index 8da571b..8ff9228 100755 Binary files a/Gem/gem_imageSGI.so and b/Gem/gem_imageSGI.so differ diff --git a/Gem/gem_imageTIFF.so b/Gem/gem_imageTIFF.so index 2fcc434..125afe4 100755 Binary files a/Gem/gem_imageTIFF.so and b/Gem/gem_imageTIFF.so differ diff --git a/Gem/gem_modelOBJ.so b/Gem/gem_modelOBJ.so index b07a69d..671e671 100755 Binary files a/Gem/gem_modelOBJ.so and b/Gem/gem_modelOBJ.so differ diff --git a/Gem/gem_recordQT4L.so b/Gem/gem_recordQT4L.so index 58d8828..44633c3 100755 Binary files a/Gem/gem_recordQT4L.so and b/Gem/gem_recordQT4L.so differ diff --git a/Gem/gem_recordV4L.so b/Gem/gem_recordV4L.so index 1a119c1..c051cbf 100755 Binary files a/Gem/gem_recordV4L.so and b/Gem/gem_recordV4L.so differ diff --git a/Gem/gem_recordV4L2.so b/Gem/gem_recordV4L2.so index 264e314..e8af69a 100755 Binary files a/Gem/gem_recordV4L2.so and b/Gem/gem_recordV4L2.so differ diff --git a/Gem/gem_videoDC1394.so b/Gem/gem_videoDC1394.so index f2a30d9..dd46315 100755 Binary files a/Gem/gem_videoDC1394.so and b/Gem/gem_videoDC1394.so differ diff --git a/Gem/gem_videoDV4L.so b/Gem/gem_videoDV4L.so index cf13113..b688521 100755 Binary files a/Gem/gem_videoDV4L.so and b/Gem/gem_videoDV4L.so differ diff --git a/Gem/gem_videoUNICAP.so b/Gem/gem_videoUNICAP.so index 7031d93..5397e2c 100755 Binary files a/Gem/gem_videoUNICAP.so and b/Gem/gem_videoUNICAP.so differ diff --git a/Gem/gem_videoV4L.so b/Gem/gem_videoV4L.so index aa5c23c..9b9dd66 100755 Binary files a/Gem/gem_videoV4L.so and b/Gem/gem_videoV4L.so differ diff --git a/Gem/gem_videoV4L2.so b/Gem/gem_videoV4L2.so index 67d5654..a616797 100755 Binary files a/Gem/gem_videoV4L2.so and b/Gem/gem_videoV4L2.so differ diff --git a/Gem/gem_videoVNC.so b/Gem/gem_videoVNC.so index 17f0b58..3835ce1 100755 Binary files a/Gem/gem_videoVNC.so and b/Gem/gem_videoVNC.so differ -- cgit v1.2.1