From 63845621e2a4a3013dd410db3212b9500dd23768 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 7 Jan 2019 18:48:45 +0000 Subject: Gem 8d663a43c3a8c10e7ed7666131fa412a4db6bb32 osx/x86_64 built 'master:8d663a43c3a8c10e7ed7666131fa412a4db6bb32' for osx/x86_64 --- Gem/Gem.pd_darwin | Bin 5239672 -> 5239672 bytes Gem/develop/include/Gem/Gem/State.h | 4 ++-- Gem/develop/include/Gem/Utils/any.h | 33 +++++++++++++++++++++++++++++++-- Gem/gem_filmAVF.so | Bin 55604 -> 55604 bytes Gem/gem_imageIO.so | Bin 34376 -> 34376 bytes Gem/gem_imageJPEG.so | Bin 50780 -> 50780 bytes Gem/gem_imageMAGICK.so | Bin 52772 -> 52772 bytes Gem/gem_imageSGI.so | Bin 58188 -> 58188 bytes Gem/gem_imageTIFF.so | Bin 66320 -> 66320 bytes Gem/gem_modelOBJ.so | Bin 96624 -> 96624 bytes Gem/gem_videoAVF.so | Bin 61156 -> 61156 bytes Gem/gemcocoawindow.pd_darwin | Bin 37024 -> 37024 bytes Gem/gemglutwindow.pd_darwin | Bin 43704 -> 43704 bytes Gem/gemmacoswindow.pd_darwin | Bin 36912 -> 36912 bytes Gem/pix_drum.pd_darwin | Bin 26224 -> 26224 bytes Gem/pix_fiducialtrack.pd_darwin | Bin 75404 -> 75404 bytes Gem/pix_hit.pd_darwin | Bin 24448 -> 24448 bytes Gem/pix_mano.pd_darwin | Bin 40552 -> 40552 bytes 18 files changed, 33 insertions(+), 4 deletions(-) diff --git a/Gem/Gem.pd_darwin b/Gem/Gem.pd_darwin index 7741320..144f556 100755 Binary files a/Gem/Gem.pd_darwin and b/Gem/Gem.pd_darwin 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_filmAVF.so b/Gem/gem_filmAVF.so index 50ab5e1..1570039 100755 Binary files a/Gem/gem_filmAVF.so and b/Gem/gem_filmAVF.so differ diff --git a/Gem/gem_imageIO.so b/Gem/gem_imageIO.so index 8f1d198..01cce2b 100755 Binary files a/Gem/gem_imageIO.so and b/Gem/gem_imageIO.so differ diff --git a/Gem/gem_imageJPEG.so b/Gem/gem_imageJPEG.so index 473949a..c18d764 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 11faf64..9c67b53 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 61bc36b..79abe2f 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 b0faf0a..9e7cc5c 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 a093316..040643f 100755 Binary files a/Gem/gem_modelOBJ.so and b/Gem/gem_modelOBJ.so differ diff --git a/Gem/gem_videoAVF.so b/Gem/gem_videoAVF.so index 3fe67cd..3080ed1 100755 Binary files a/Gem/gem_videoAVF.so and b/Gem/gem_videoAVF.so differ diff --git a/Gem/gemcocoawindow.pd_darwin b/Gem/gemcocoawindow.pd_darwin index 72f3955..0de24a9 100755 Binary files a/Gem/gemcocoawindow.pd_darwin and b/Gem/gemcocoawindow.pd_darwin differ diff --git a/Gem/gemglutwindow.pd_darwin b/Gem/gemglutwindow.pd_darwin index 9bebee7..2602dec 100755 Binary files a/Gem/gemglutwindow.pd_darwin and b/Gem/gemglutwindow.pd_darwin differ diff --git a/Gem/gemmacoswindow.pd_darwin b/Gem/gemmacoswindow.pd_darwin index f6a8a87..96f75fe 100755 Binary files a/Gem/gemmacoswindow.pd_darwin and b/Gem/gemmacoswindow.pd_darwin differ diff --git a/Gem/pix_drum.pd_darwin b/Gem/pix_drum.pd_darwin index d7dcb5a..9d1df55 100755 Binary files a/Gem/pix_drum.pd_darwin and b/Gem/pix_drum.pd_darwin differ diff --git a/Gem/pix_fiducialtrack.pd_darwin b/Gem/pix_fiducialtrack.pd_darwin index 076077e..d4ee7f2 100755 Binary files a/Gem/pix_fiducialtrack.pd_darwin and b/Gem/pix_fiducialtrack.pd_darwin differ diff --git a/Gem/pix_hit.pd_darwin b/Gem/pix_hit.pd_darwin index 0ba70b3..431b84c 100755 Binary files a/Gem/pix_hit.pd_darwin and b/Gem/pix_hit.pd_darwin differ diff --git a/Gem/pix_mano.pd_darwin b/Gem/pix_mano.pd_darwin index 7e5774d..990f818 100755 Binary files a/Gem/pix_mano.pd_darwin and b/Gem/pix_mano.pd_darwin differ -- cgit v1.2.1