aboutsummaryrefslogtreecommitdiff
path: root/Gem
diff options
context:
space:
mode:
authorTravis CI <zmoelnig@travis-ci.umlaeute.mur.at>2019-01-07 18:48:45 +0000
committerTravis CI <zmoelnig@travis-ci.umlaeute.mur.at>2019-01-07 18:48:45 +0000
commit63845621e2a4a3013dd410db3212b9500dd23768 (patch)
tree3842979eb3753199b090be897dbd45b508300fc4 /Gem
parent76bf125fe7030a8a5381e98fa2d227e91fbfb798 (diff)
Gem 8d663a43c3a8c10e7ed7666131fa412a4db6bb32 osx/x86_64
built 'master:8d663a43c3a8c10e7ed7666131fa412a4db6bb32' for osx/x86_64
Diffstat (limited to 'Gem')
-rwxr-xr-xGem/Gem.pd_darwinbin5239672 -> 5239672 bytes
-rw-r--r--Gem/develop/include/Gem/Gem/State.h4
-rw-r--r--Gem/develop/include/Gem/Utils/any.h33
-rwxr-xr-xGem/gem_filmAVF.sobin55604 -> 55604 bytes
-rwxr-xr-xGem/gem_imageIO.sobin34376 -> 34376 bytes
-rwxr-xr-xGem/gem_imageJPEG.sobin50780 -> 50780 bytes
-rwxr-xr-xGem/gem_imageMAGICK.sobin52772 -> 52772 bytes
-rwxr-xr-xGem/gem_imageSGI.sobin58188 -> 58188 bytes
-rwxr-xr-xGem/gem_imageTIFF.sobin66320 -> 66320 bytes
-rwxr-xr-xGem/gem_modelOBJ.sobin96624 -> 96624 bytes
-rwxr-xr-xGem/gem_videoAVF.sobin61156 -> 61156 bytes
-rwxr-xr-xGem/gemcocoawindow.pd_darwinbin37024 -> 37024 bytes
-rwxr-xr-xGem/gemglutwindow.pd_darwinbin43704 -> 43704 bytes
-rwxr-xr-xGem/gemmacoswindow.pd_darwinbin36912 -> 36912 bytes
-rwxr-xr-xGem/pix_drum.pd_darwinbin26224 -> 26224 bytes
-rwxr-xr-xGem/pix_fiducialtrack.pd_darwinbin75404 -> 75404 bytes
-rwxr-xr-xGem/pix_hit.pd_darwinbin24448 -> 24448 bytes
-rwxr-xr-xGem/pix_mano.pd_darwinbin40552 -> 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
--- a/Gem/Gem.pd_darwin
+++ b/Gem/Gem.pd_darwin
Binary files 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" <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_filmAVF.so b/Gem/gem_filmAVF.so
index 50ab5e1..1570039 100755
--- a/Gem/gem_filmAVF.so
+++ b/Gem/gem_filmAVF.so
Binary files differ
diff --git a/Gem/gem_imageIO.so b/Gem/gem_imageIO.so
index 8f1d198..01cce2b 100755
--- a/Gem/gem_imageIO.so
+++ b/Gem/gem_imageIO.so
Binary files differ
diff --git a/Gem/gem_imageJPEG.so b/Gem/gem_imageJPEG.so
index 473949a..c18d764 100755
--- a/Gem/gem_imageJPEG.so
+++ b/Gem/gem_imageJPEG.so
Binary files differ
diff --git a/Gem/gem_imageMAGICK.so b/Gem/gem_imageMAGICK.so
index 11faf64..9c67b53 100755
--- a/Gem/gem_imageMAGICK.so
+++ b/Gem/gem_imageMAGICK.so
Binary files differ
diff --git a/Gem/gem_imageSGI.so b/Gem/gem_imageSGI.so
index 61bc36b..79abe2f 100755
--- a/Gem/gem_imageSGI.so
+++ b/Gem/gem_imageSGI.so
Binary files differ
diff --git a/Gem/gem_imageTIFF.so b/Gem/gem_imageTIFF.so
index b0faf0a..9e7cc5c 100755
--- a/Gem/gem_imageTIFF.so
+++ b/Gem/gem_imageTIFF.so
Binary files differ
diff --git a/Gem/gem_modelOBJ.so b/Gem/gem_modelOBJ.so
index a093316..040643f 100755
--- a/Gem/gem_modelOBJ.so
+++ b/Gem/gem_modelOBJ.so
Binary files differ
diff --git a/Gem/gem_videoAVF.so b/Gem/gem_videoAVF.so
index 3fe67cd..3080ed1 100755
--- a/Gem/gem_videoAVF.so
+++ b/Gem/gem_videoAVF.so
Binary files differ
diff --git a/Gem/gemcocoawindow.pd_darwin b/Gem/gemcocoawindow.pd_darwin
index 72f3955..0de24a9 100755
--- a/Gem/gemcocoawindow.pd_darwin
+++ b/Gem/gemcocoawindow.pd_darwin
Binary files differ
diff --git a/Gem/gemglutwindow.pd_darwin b/Gem/gemglutwindow.pd_darwin
index 9bebee7..2602dec 100755
--- a/Gem/gemglutwindow.pd_darwin
+++ b/Gem/gemglutwindow.pd_darwin
Binary files differ
diff --git a/Gem/gemmacoswindow.pd_darwin b/Gem/gemmacoswindow.pd_darwin
index f6a8a87..96f75fe 100755
--- a/Gem/gemmacoswindow.pd_darwin
+++ b/Gem/gemmacoswindow.pd_darwin
Binary files differ
diff --git a/Gem/pix_drum.pd_darwin b/Gem/pix_drum.pd_darwin
index d7dcb5a..9d1df55 100755
--- a/Gem/pix_drum.pd_darwin
+++ b/Gem/pix_drum.pd_darwin
Binary files differ
diff --git a/Gem/pix_fiducialtrack.pd_darwin b/Gem/pix_fiducialtrack.pd_darwin
index 076077e..d4ee7f2 100755
--- a/Gem/pix_fiducialtrack.pd_darwin
+++ b/Gem/pix_fiducialtrack.pd_darwin
Binary files differ
diff --git a/Gem/pix_hit.pd_darwin b/Gem/pix_hit.pd_darwin
index 0ba70b3..431b84c 100755
--- a/Gem/pix_hit.pd_darwin
+++ b/Gem/pix_hit.pd_darwin
Binary files differ
diff --git a/Gem/pix_mano.pd_darwin b/Gem/pix_mano.pd_darwin
index 7e5774d..990f818 100755
--- a/Gem/pix_mano.pd_darwin
+++ b/Gem/pix_mano.pd_darwin
Binary files differ