From 82cc50638f21ca0f38100b682c0a08f560069c55 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 9 Sep 2018 20:00:09 +0000 Subject: Gem 504da729f28c5fe72528b5455e410a77245a37d4 osx/x86_64 built 'master:504da729f28c5fe72528b5455e410a77245a37d4' for osx/x86_64 --- Gem/Gem.pd_darwin | Bin 5144676 -> 5144748 bytes Gem/develop/include/Gem/Base/CPPExtern.h | 2 +- Gem/develop/include/Gem/Gem/Event.h | 4 ++-- Gem/develop/include/Gem/Gem/Image.h | 6 +++--- Gem/gem_filmAVF.so | Bin 57272 -> 57272 bytes Gem/gem_imageJPEG.so | Bin 52440 -> 52440 bytes Gem/gem_imageMAGICK.la | 2 +- Gem/gem_imageMAGICK.so | Bin 54424 -> 54424 bytes Gem/gem_imageSGI.so | Bin 59304 -> 59304 bytes Gem/gem_imageTIFF.so | Bin 68500 -> 68500 bytes Gem/gem_modelOBJ.so | Bin 90232 -> 90232 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, 7 insertions(+), 7 deletions(-) (limited to 'Gem') diff --git a/Gem/Gem.pd_darwin b/Gem/Gem.pd_darwin index 89d1415..6ab051a 100755 Binary files a/Gem/Gem.pd_darwin and b/Gem/Gem.pd_darwin differ diff --git a/Gem/develop/include/Gem/Base/CPPExtern.h b/Gem/develop/include/Gem/Base/CPPExtern.h index 4523eef..de320f9 100644 --- a/Gem/develop/include/Gem/Base/CPPExtern.h +++ b/Gem/develop/include/Gem/Base/CPPExtern.h @@ -116,7 +116,7 @@ public: ////////// // my name - static char *m_holdname; + static const char *m_holdname; t_symbol *m_objectname; protected: diff --git a/Gem/develop/include/Gem/Gem/Event.h b/Gem/develop/include/Gem/Gem/Event.h index 6024ec8..1200296 100644 --- a/Gem/develop/include/Gem/Gem/Event.h +++ b/Gem/develop/include/Gem/Gem/Event.h @@ -71,7 +71,7 @@ GEM_EXTERN extern void removeWheelCallback(WHEEL_CB callback, void *data); // Keyboard callback // ////////////////////////////////////////////////////////////////// -typedef void (*KEYBOARD_CB)(char *,int, int, void *); +typedef void (*KEYBOARD_CB)(const char *,int, int, void *); ////////// // Set a keyboard callback GEM_EXTERN extern void setKeyboardCallback(KEYBOARD_CB callback, @@ -103,7 +103,7 @@ GEM_EXTERN extern void triggerMotionEvent(int x, int y); GEM_EXTERN extern void triggerButtonEvent(int which, int state, int x, int y); GEM_EXTERN extern void triggerWheelEvent(int axis, int value); -GEM_EXTERN extern void triggerKeyboardEvent(char *string, int value, +GEM_EXTERN extern void triggerKeyboardEvent(const char *string, int value, int state); GEM_EXTERN extern void triggerResizeEvent(int xSize, int ySize); diff --git a/Gem/develop/include/Gem/Gem/Image.h b/Gem/develop/include/Gem/Gem/Image.h index 6bad705..bf61aef 100644 --- a/Gem/develop/include/Gem/Gem/Image.h +++ b/Gem/develop/include/Gem/Gem/Image.h @@ -289,11 +289,11 @@ struct GEM_EXTERN pixBlock { /////////////////////////////////////////////////////////////////////////////// ////////// // copies all of the data over and mallocs memory -GEM_EXTERN extern void copy2Image(imageStruct *to, imageStruct *from); +GEM_EXTERN extern void copy2Image(imageStruct *to, const imageStruct *from); ////////// // assumes that it only has to refresh the data -GEM_EXTERN extern void refreshImage(imageStruct *to, imageStruct *from); +GEM_EXTERN extern void refreshImage(imageStruct *to, const imageStruct *from); -GEM_EXTERN extern int getPixFormat(char*); +GEM_EXTERN extern int getPixFormat(const char*); #endif // GEMPIXUTIL_H_ diff --git a/Gem/gem_filmAVF.so b/Gem/gem_filmAVF.so index da2bca8..3409880 100755 Binary files a/Gem/gem_filmAVF.so and b/Gem/gem_filmAVF.so differ diff --git a/Gem/gem_imageJPEG.so b/Gem/gem_imageJPEG.so index 74630ea..87f297f 100755 Binary files a/Gem/gem_imageJPEG.so and b/Gem/gem_imageJPEG.so differ diff --git a/Gem/gem_imageMAGICK.la b/Gem/gem_imageMAGICK.la index 356b3d5..f60f09a 100755 --- a/Gem/gem_imageMAGICK.la +++ b/Gem/gem_imageMAGICK.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags=' -pthread' # Libraries that this one depends upon. -dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.48-0.app/Contents/Resources//bin -L../.. -L/usr/local/Cellar/imagemagick/7.0.8-10/lib /usr/local/Cellar/imagemagick/7.0.8-10/lib/libMagickCore-7.Q16HDRI.la -L/usr/local/opt/freetype/lib -L/usr/local/Cellar/xz/5.2.4/lib -lfreetype -lxml2 -llzma -lbz2 -lltdl -ldl -lz -lm' +dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.48-0.app/Contents/Resources//bin -L../.. -L/usr/local/Cellar/imagemagick/7.0.8-11_1/lib /usr/local/Cellar/imagemagick/7.0.8-11_1/lib/libMagickCore-7.Q16HDRI.la -L/usr/local/opt/freetype/lib -L/usr/local/Cellar/xz/5.2.4/lib -lfreetype -lxml2 -llzma -lbz2 -lltdl -ldl -lz -lm' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gem_imageMAGICK.so b/Gem/gem_imageMAGICK.so index ba162c2..26051a2 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 4803974..4e4b304 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 899dda4..ca71629 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 97ddb61..7636d2f 100755 Binary files a/Gem/gem_modelOBJ.so and b/Gem/gem_modelOBJ.so differ diff --git a/Gem/gemcocoawindow.pd_darwin b/Gem/gemcocoawindow.pd_darwin index 84f631d..d9fe6a6 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 3c28ada..1eb8312 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 0cae2a1..5e0fc53 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 61b16da..68486b0 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 7094230..e4a9c29 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 e8c21e8..f70a67c 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 bdcaaf9..5905469 100755 Binary files a/Gem/pix_mano.pd_darwin and b/Gem/pix_mano.pd_darwin differ -- cgit v1.2.1