diff options
-rwxr-xr-x | Gem/Gem.pd_darwin | bin | 4873556 -> 4873628 bytes | |||
-rw-r--r-- | Gem/develop/include/Gem/Base/CPPExtern.h | 2 | ||||
-rw-r--r-- | Gem/develop/include/Gem/Gem/Event.h | 4 | ||||
-rw-r--r-- | Gem/develop/include/Gem/Gem/Image.h | 6 | ||||
-rwxr-xr-x | Gem/gem_filmAVF.so | bin | 57072 -> 57072 bytes | |||
-rwxr-xr-x | Gem/gem_imageJPEG.so | bin | 50680 -> 50680 bytes | |||
-rwxr-xr-x | Gem/gem_imageMAGICK.la | 2 | ||||
-rwxr-xr-x | Gem/gem_imageMAGICK.so | bin | 52544 -> 52544 bytes | |||
-rwxr-xr-x | Gem/gem_imageSGI.so | bin | 57332 -> 57332 bytes | |||
-rwxr-xr-x | Gem/gem_imageTIFF.so | bin | 65708 -> 65708 bytes | |||
-rwxr-xr-x | Gem/gem_modelOBJ.so | bin | 86424 -> 86424 bytes | |||
-rwxr-xr-x | Gem/gemcocoawindow.pd_darwin | bin | 39108 -> 39108 bytes | |||
-rwxr-xr-x | Gem/gemglutwindow.pd_darwin | bin | 41844 -> 41844 bytes | |||
-rwxr-xr-x | Gem/gemmacoswindow.pd_darwin | bin | 38964 -> 38964 bytes | |||
-rwxr-xr-x | Gem/pix_drum.pd_darwin | bin | 25336 -> 25336 bytes | |||
-rwxr-xr-x | Gem/pix_fiducialtrack.pd_darwin | bin | 69040 -> 69040 bytes | |||
-rwxr-xr-x | Gem/pix_hit.pd_darwin | bin | 23356 -> 23356 bytes | |||
-rwxr-xr-x | Gem/pix_mano.pd_darwin | bin | 39584 -> 39584 bytes |
18 files changed, 7 insertions, 7 deletions
diff --git a/Gem/Gem.pd_darwin b/Gem/Gem.pd_darwin Binary files differindex abfc440..7ff27b6 100755 --- a/Gem/Gem.pd_darwin +++ b/Gem/Gem.pd_darwin 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 Binary files differindex 9160124..8a8fa8a 100755 --- a/Gem/gem_filmAVF.so +++ b/Gem/gem_filmAVF.so diff --git a/Gem/gem_imageJPEG.so b/Gem/gem_imageJPEG.so Binary files differindex 2a14cc3..faefc6b 100755 --- a/Gem/gem_imageJPEG.so +++ b/Gem/gem_imageJPEG.so 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 Binary files differindex b03d0e1..7de77dd 100755 --- a/Gem/gem_imageMAGICK.so +++ b/Gem/gem_imageMAGICK.so diff --git a/Gem/gem_imageSGI.so b/Gem/gem_imageSGI.so Binary files differindex f822bb1..879dcf6 100755 --- a/Gem/gem_imageSGI.so +++ b/Gem/gem_imageSGI.so diff --git a/Gem/gem_imageTIFF.so b/Gem/gem_imageTIFF.so Binary files differindex 04a3820..508ae5b 100755 --- a/Gem/gem_imageTIFF.so +++ b/Gem/gem_imageTIFF.so diff --git a/Gem/gem_modelOBJ.so b/Gem/gem_modelOBJ.so Binary files differindex 53dd679..7c324cd 100755 --- a/Gem/gem_modelOBJ.so +++ b/Gem/gem_modelOBJ.so diff --git a/Gem/gemcocoawindow.pd_darwin b/Gem/gemcocoawindow.pd_darwin Binary files differindex c3ca28b..53e4749 100755 --- a/Gem/gemcocoawindow.pd_darwin +++ b/Gem/gemcocoawindow.pd_darwin diff --git a/Gem/gemglutwindow.pd_darwin b/Gem/gemglutwindow.pd_darwin Binary files differindex f958f48..60768b4 100755 --- a/Gem/gemglutwindow.pd_darwin +++ b/Gem/gemglutwindow.pd_darwin diff --git a/Gem/gemmacoswindow.pd_darwin b/Gem/gemmacoswindow.pd_darwin Binary files differindex 0823989..6d7126c 100755 --- a/Gem/gemmacoswindow.pd_darwin +++ b/Gem/gemmacoswindow.pd_darwin diff --git a/Gem/pix_drum.pd_darwin b/Gem/pix_drum.pd_darwin Binary files differindex 4f6c456..5bfa6cd 100755 --- a/Gem/pix_drum.pd_darwin +++ b/Gem/pix_drum.pd_darwin diff --git a/Gem/pix_fiducialtrack.pd_darwin b/Gem/pix_fiducialtrack.pd_darwin Binary files differindex d6a15c7..5d644e6 100755 --- a/Gem/pix_fiducialtrack.pd_darwin +++ b/Gem/pix_fiducialtrack.pd_darwin diff --git a/Gem/pix_hit.pd_darwin b/Gem/pix_hit.pd_darwin Binary files differindex 5097161..5f41c3a 100755 --- a/Gem/pix_hit.pd_darwin +++ b/Gem/pix_hit.pd_darwin diff --git a/Gem/pix_mano.pd_darwin b/Gem/pix_mano.pd_darwin Binary files differindex 833d0a6..6043784 100755 --- a/Gem/pix_mano.pd_darwin +++ b/Gem/pix_mano.pd_darwin |