diff options
28 files changed, 29 insertions, 26 deletions
@@ -17,7 +17,7 @@ old_library='' inherited_linker_flags=' -pthread' # Libraries that this one depends upon. -dependency_libs=' -lGL -lGL -lSM -lICE -lftgl -lGL -lGLU -lGL -lXxf86vm -ldl -lz' +dependency_libs=' -lGL -lGL -L/usr/include/pd -lSM -lICE -lGL -lGLU -lGL -lXxf86vm -ldl -lz' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/Gem.pd_linux b/Gem/Gem.pd_linux Binary files differindex c801fa4..cc727c9 100755 --- a/Gem/Gem.pd_linux +++ b/Gem/Gem.pd_linux diff --git a/Gem/develop/include/Gem/Gem/ContextData.h b/Gem/develop/include/Gem/Gem/ContextData.h index 74804da..94f51b3 100644 --- a/Gem/develop/include/Gem/Gem/ContextData.h +++ b/Gem/develop/include/Gem/Gem/ContextData.h @@ -53,6 +53,7 @@ template<class ContextDataType = int> ////////// // Constructor + /* coverity[uninit_member] we track the un-initialization ourselves */ ContextData(void) : m_haveDefaultValue(false) {;} ContextData(ContextDataType v) : m_haveDefaultValue(true), m_defaultValue(v) {;} @@ -66,9 +67,9 @@ template<class ContextDataType = int> * * @usage ContextData<GLenum>m_fun; m_fun=GL_FUNC_ADD; * - * @pre We are in a draw process. + * @pre We have a valid context. * @note Should only be called from the draw function. - * Results are un-defined for other functions. + * Results are un-defined if there is no valid context */ virtual operator ContextDataType() { @@ -78,17 +79,19 @@ template<class ContextDataType = int> /** * assigns a value to the correct context * - * @pre We are in a draw process. + * @pre We have a valid context. * @note Should only be called from the draw function. - * Results are un-defined for other functions. + * Results are un-defined if there is no valid context */ virtual ContextDataType&operator = (ContextDataType value) { /* simplistic approach to handle out-of-context assignments: * assign the value to all context instances + * and use it as default value for future contexts */ if(INVALID_CONTEXT==getCurContext()) { doSetAll(value); + m_defaultValue=value; m_haveDefaultValue=true; } return (*getPtrToCur()=value); @@ -120,7 +123,7 @@ template<class ContextDataType = int> /** * Returns a pointer to the correct data element in the current context. * - * @pre We are in the draw function. + * @pre We have a valid context. * @post Synchronized. * @note ASSERT: Same context is rendered by same thread each time. */ diff --git a/Gem/gem_filmAVIPLAY.la b/Gem/gem_filmAVIPLAY.la index 8616af5..16e95c8 100755 --- a/Gem/gem_filmAVIPLAY.la +++ b/Gem/gem_filmAVIPLAY.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags='' # Libraries that this one depends upon. -dependency_libs=' -L../.. -laviplay -lXxf86vm -ldl -lz' +dependency_libs=' -L/usr/include/pd -L../.. -laviplay -lXxf86vm -ldl -lz' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gem_filmGMERLIN.la b/Gem/gem_filmGMERLIN.la index b021af4..8444628 100755 --- a/Gem/gem_filmGMERLIN.la +++ b/Gem/gem_filmGMERLIN.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags='' # Libraries that this one depends upon. -dependency_libs=' -L../.. -lgmerlin_avdec -lgavl -lXxf86vm -ldl -lz' +dependency_libs=' -L/usr/include/pd -L../.. -lgmerlin_avdec -lgavl -lXxf86vm -ldl -lz' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gem_filmMPEG3.la b/Gem/gem_filmMPEG3.la index c985b15..d60dfee 100755 --- a/Gem/gem_filmMPEG3.la +++ b/Gem/gem_filmMPEG3.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags='' # Libraries that this one depends upon. -dependency_libs=' -L../.. -lmpeg3 -lXxf86vm -ldl -lz' +dependency_libs=' -L/usr/include/pd -L../.. -lmpeg3 -lXxf86vm -ldl -lz' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gem_filmQT4L.la b/Gem/gem_filmQT4L.la index 31ba955..8609662 100755 --- a/Gem/gem_filmQT4L.la +++ b/Gem/gem_filmQT4L.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags='' # Libraries that this one depends upon. -dependency_libs=' -L../.. -lpthread -lquicktime -lXxf86vm -ldl -lz' +dependency_libs=' -L/usr/include/pd -L../.. -lpthread -lquicktime -lXxf86vm -ldl -lz' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gem_imageJPEG.la b/Gem/gem_imageJPEG.la index a1b1896..16a3d51 100755 --- a/Gem/gem_imageJPEG.la +++ b/Gem/gem_imageJPEG.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags='' # Libraries that this one depends upon. -dependency_libs=' -L../.. -ljpeg -lXxf86vm -ldl -lz' +dependency_libs=' -L/usr/include/pd -L../.. -ljpeg -lXxf86vm -ldl -lz' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gem_imageMAGICK.la b/Gem/gem_imageMAGICK.la index 423c03f..047596d 100755 --- a/Gem/gem_imageMAGICK.la +++ b/Gem/gem_imageMAGICK.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags=' -fopenmp -pthread' # Libraries that this one depends upon. -dependency_libs=' -L../.. /usr/lib/libMagick++.la /usr/lib/libMagickCore.la -lXxf86vm -ldl -lz' +dependency_libs=' -L/usr/include/pd -L../.. /usr/lib/libMagick++.la /usr/lib/libMagickCore.la -lXxf86vm -ldl -lz' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gem_imageSGI.la b/Gem/gem_imageSGI.la index de36158..af78165 100755 --- a/Gem/gem_imageSGI.la +++ b/Gem/gem_imageSGI.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags='' # Libraries that this one depends upon. -dependency_libs=' -L../.. -lXxf86vm -ldl -lz' +dependency_libs=' -L/usr/include/pd -L../.. -lXxf86vm -ldl -lz' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gem_imageTIFF.la b/Gem/gem_imageTIFF.la index cf2b2f3..e07d9a0 100755 --- a/Gem/gem_imageTIFF.la +++ b/Gem/gem_imageTIFF.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags='' # Libraries that this one depends upon. -dependency_libs=' -L../.. /usr/lib/x86_64-linux-gnu/libtiff.la -lXxf86vm -ldl -lz' +dependency_libs=' -L/usr/include/pd -L../.. /usr/lib/x86_64-linux-gnu/libtiff.la -lXxf86vm -ldl -lz' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gem_modelOBJ.la b/Gem/gem_modelOBJ.la index 9aaa89f..7eae709 100755 --- a/Gem/gem_modelOBJ.la +++ b/Gem/gem_modelOBJ.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags='' # Libraries that this one depends upon. -dependency_libs=' -L../.. -lGL -lXxf86vm -ldl -lz' +dependency_libs=' -L/usr/include/pd -L../.. -lGL -lXxf86vm -ldl -lz' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gem_recordQT4L.la b/Gem/gem_recordQT4L.la index c9f8121..c675739 100755 --- a/Gem/gem_recordQT4L.la +++ b/Gem/gem_recordQT4L.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags='' # Libraries that this one depends upon. -dependency_libs=' -L../.. -lpthread -lquicktime -lXxf86vm -ldl -lz' +dependency_libs=' -L/usr/include/pd -L../.. -lpthread -lquicktime -lXxf86vm -ldl -lz' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gem_recordV4L.la b/Gem/gem_recordV4L.la index 96ab5cd..8a42a9c 100755 --- a/Gem/gem_recordV4L.la +++ b/Gem/gem_recordV4L.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags='' # Libraries that this one depends upon. -dependency_libs=' -L../.. -lv4l1 -lXxf86vm -ldl -lz' +dependency_libs=' -L/usr/include/pd -L../.. -lv4l1 -lXxf86vm -ldl -lz' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gem_recordV4L2.la b/Gem/gem_recordV4L2.la index d1142a1..b931039 100755 --- a/Gem/gem_recordV4L2.la +++ b/Gem/gem_recordV4L2.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags='' # Libraries that this one depends upon. -dependency_libs=' -L../.. -lv4l2 -lXxf86vm -ldl -lz' +dependency_libs=' -L/usr/include/pd -L../.. -lv4l2 -lXxf86vm -ldl -lz' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gem_videoV4L.la b/Gem/gem_videoV4L.la index ad374bd..2ac0fb1 100755 --- a/Gem/gem_videoV4L.la +++ b/Gem/gem_videoV4L.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags=' -pthread' # Libraries that this one depends upon. -dependency_libs=' -L../.. -lv4l1 -lXxf86vm -ldl -lz' +dependency_libs=' -L/usr/include/pd -L../.. -lv4l1 -lXxf86vm -ldl -lz' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gem_videoV4L2.la b/Gem/gem_videoV4L2.la index fd3b517..1a59b1b 100755 --- a/Gem/gem_videoV4L2.la +++ b/Gem/gem_videoV4L2.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags=' -pthread' # Libraries that this one depends upon. -dependency_libs=' -L../.. -lv4l2 -lXxf86vm -ldl -lz' +dependency_libs=' -L/usr/include/pd -L../.. -lv4l2 -lXxf86vm -ldl -lz' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gem_videoVNC.la b/Gem/gem_videoVNC.la index 82d5c19..f854ed7 100755 --- a/Gem/gem_videoVNC.la +++ b/Gem/gem_videoVNC.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags='' # Libraries that this one depends upon. -dependency_libs=' -L../.. -lvncclient -lnsl -lpthread -ljpeg -lgcrypt -lgnutls -lXxf86vm -ldl -lz' +dependency_libs=' -L/usr/include/pd -L../.. -lvncclient -lnsl -lpthread -ljpeg -lgcrypt -lgnutls -lXxf86vm -ldl -lz' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gemglxwindow.la b/Gem/gemglxwindow.la index a81261e..d91b83c 100755 --- a/Gem/gemglxwindow.la +++ b/Gem/gemglxwindow.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags='' # Libraries that this one depends upon. -dependency_libs=' -L../.. -lSM -lICE -lXxf86vm -ldl -lz' +dependency_libs=' -L/usr/include/pd -L../.. -lSM -lICE -lXxf86vm -ldl -lz' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/gemglxwindow.pd_linux b/Gem/gemglxwindow.pd_linux Binary files differindex 26c1edf..e346591 100755 --- a/Gem/gemglxwindow.pd_linux +++ b/Gem/gemglxwindow.pd_linux diff --git a/Gem/pix_drum.la b/Gem/pix_drum.la index 9c58ff5..1ea7f5a 100755 --- a/Gem/pix_drum.la +++ b/Gem/pix_drum.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags='' # Libraries that this one depends upon. -dependency_libs=' -L../.. -lXxf86vm -ldl -lz' +dependency_libs=' -L/usr/include/pd -L../.. -lXxf86vm -ldl -lz' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/pix_drum.pd_linux b/Gem/pix_drum.pd_linux Binary files differindex b59b655..46ee9f7 100755 --- a/Gem/pix_drum.pd_linux +++ b/Gem/pix_drum.pd_linux diff --git a/Gem/pix_fiducialtrack.la b/Gem/pix_fiducialtrack.la index 7145220..0d4c8dd 100755 --- a/Gem/pix_fiducialtrack.la +++ b/Gem/pix_fiducialtrack.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags='' # Libraries that this one depends upon. -dependency_libs=' -L../.. -lXxf86vm -ldl -lz' +dependency_libs=' -L/usr/include/pd -L../.. -lXxf86vm -ldl -lz' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/pix_fiducialtrack.pd_linux b/Gem/pix_fiducialtrack.pd_linux Binary files differindex b452cce..4f2e989 100755 --- a/Gem/pix_fiducialtrack.pd_linux +++ b/Gem/pix_fiducialtrack.pd_linux diff --git a/Gem/pix_hit.la b/Gem/pix_hit.la index c4d32db..3ca5e2a 100755 --- a/Gem/pix_hit.la +++ b/Gem/pix_hit.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags='' # Libraries that this one depends upon. -dependency_libs=' -L../.. -lXxf86vm -ldl -lz' +dependency_libs=' -L/usr/include/pd -L../.. -lXxf86vm -ldl -lz' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/pix_hit.pd_linux b/Gem/pix_hit.pd_linux Binary files differindex 5f639b1..bdde5b7 100755 --- a/Gem/pix_hit.pd_linux +++ b/Gem/pix_hit.pd_linux diff --git a/Gem/pix_mano.la b/Gem/pix_mano.la index 8ac7e41..008b5f9 100755 --- a/Gem/pix_mano.la +++ b/Gem/pix_mano.la @@ -17,7 +17,7 @@ old_library='' inherited_linker_flags='' # Libraries that this one depends upon. -dependency_libs=' -L../.. -lXxf86vm -ldl -lz' +dependency_libs=' -L/usr/include/pd -L../.. -lXxf86vm -ldl -lz' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/pix_mano.pd_linux b/Gem/pix_mano.pd_linux Binary files differindex 7d95b46..3aa6345 100755 --- a/Gem/pix_mano.pd_linux +++ b/Gem/pix_mano.pd_linux |