From 0dad53f6bbcab0ab55f963b0696ffe434b098e78 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 9 Sep 2018 20:00:21 +0000 Subject: Gem 504da729f28c5fe72528b5455e410a77245a37d4 osx/i386 built 'master:504da729f28c5fe72528b5455e410a77245a37d4' for osx/i386 --- Gem/Gem.pd_darwin | Bin 4873556 -> 4873628 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 57072 -> 57072 bytes Gem/gem_imageJPEG.so | Bin 50680 -> 50680 bytes Gem/gem_imageMAGICK.la | 2 +- Gem/gem_imageMAGICK.so | Bin 52544 -> 52544 bytes Gem/gem_imageSGI.so | Bin 57332 -> 57332 bytes Gem/gem_imageTIFF.so | Bin 65708 -> 65708 bytes Gem/gem_modelOBJ.so | Bin 86424 -> 86424 bytes Gem/gemcocoawindow.pd_darwin | Bin 39108 -> 39108 bytes Gem/gemglutwindow.pd_darwin | Bin 41844 -> 41844 bytes Gem/gemmacoswindow.pd_darwin | Bin 38964 -> 38964 bytes Gem/pix_drum.pd_darwin | Bin 25336 -> 25336 bytes Gem/pix_fiducialtrack.pd_darwin | Bin 69040 -> 69040 bytes Gem/pix_hit.pd_darwin | Bin 23356 -> 23356 bytes Gem/pix_mano.pd_darwin | Bin 39584 -> 39584 bytes 18 files changed, 7 insertions(+), 7 deletions(-) (limited to 'Gem') diff --git a/Gem/Gem.pd_darwin b/Gem/Gem.pd_darwin index abfc440..7ff27b6 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 9160124..8a8fa8a 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 2a14cc3..faefc6b 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 d899df4..adb1c8d 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-i386.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-i386.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 b03d0e1..7de77dd 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 f822bb1..879dcf6 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 04a3820..508ae5b 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 53dd679..7c324cd 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 c3ca28b..53e4749 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 f958f48..60768b4 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 0823989..6d7126c 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 4f6c456..5bfa6cd 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 d6a15c7..5d644e6 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 5097161..5f41c3a 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 833d0a6..6043784 100755 Binary files a/Gem/pix_mano.pd_darwin and b/Gem/pix_mano.pd_darwin differ -- cgit v1.2.1