Gem 03e8d06a43eebb796ac268739a9f11fde5ad1d90 osx/x86_64

built 'master:03e8d06a43eebb796ac268739a9f11fde5ad1d90' for osx/x86_64

17 files changed, 5 insertions, 6 deletions

diff --git a/Gem/Gem.la b/Gem/Gem.la
index 2d3e967..b9ca4bf 100755
--- a/Gem/Gem.la
+++ b/Gem/Gem.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/usr/local/Cellar/fribidi/1.0.1/lib -lfribidi -ldl -lz -lm'
+dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.48-0.app/Contents/Resources//bin -L/usr/local/Cellar/fribidi/1.0.2/lib -lfribidi -ldl -lz -lm'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
diff --git a/Gem/Gem.pd_darwin b/Gem/Gem.pd_darwin
index 7d4db98..4ca4c8e 100755
--- a/Gem/Gem.pd_darwin
+++ b/Gem/Gem.pd_darwin
diff --git a/Gem/develop/include/Gem/Base/TextBase.h b/Gem/develop/include/Gem/Base/TextBase.h
index 0834ef0..7c6b832 100644
--- a/Gem/develop/include/Gem/Base/TextBase.h
+++ b/Gem/develop/include/Gem/Base/TextBase.h
@@ -202,16 +202,12 @@ protected:
   static std::string DEFAULT_FONT;
 
   //////////
-  // get the bounding-box for the current text/font/...
-  void getBBox(float&x0,float&y0,float&z0, float&x1,float&y1,float&z1);
-  //////////
   // output information about the current font/text
   // including the bbox
   void fontInfo(void);
   // an outlet to send font/text/...-info back to the patch
   gem::RTE::Outlet m_infoOut;
 
-
   //////////
   // The font structure
 #ifdef FTGL
@@ -243,6 +239,9 @@ private:
   // helper to make the
   // line distance vector
   void makeLineDist();
+  //////////
+  // get the bounding-box for the current text/font/... (per line and total) and output it
+  void getBBox();
 
   //////////
   // Static member functions
diff --git a/Gem/gem_filmAVF.so b/Gem/gem_filmAVF.so
index 74421b9..ad3e134 100755
--- a/Gem/gem_filmAVF.so
+++ b/Gem/gem_filmAVF.so
diff --git a/Gem/gem_imageJPEG.so b/Gem/gem_imageJPEG.so
index 291ab30..3debf3d 100755
--- a/Gem/gem_imageJPEG.so
+++ b/Gem/gem_imageJPEG.so
diff --git a/Gem/gem_imageMAGICK.la b/Gem/gem_imageMAGICK.la
index 03c842d..d0c1d9c 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.7-22/lib /usr/local/Cellar/imagemagick/7.0.7-22/lib/libMagickCore-7.Q16HDRI.la -L/usr/local/opt/freetype/lib -L/usr/local/Cellar/xz/5.2.3/lib -lfreetype -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.7-31/lib /usr/local/Cellar/imagemagick/7.0.7-31/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 4103d34..c73db9f 100755
--- a/Gem/gem_imageMAGICK.so
+++ b/Gem/gem_imageMAGICK.so
diff --git a/Gem/gem_imageSGI.so b/Gem/gem_imageSGI.so
index fbdca6f..830bc07 100755
--- a/Gem/gem_imageSGI.so
+++ b/Gem/gem_imageSGI.so
diff --git a/Gem/gem_imageTIFF.so b/Gem/gem_imageTIFF.so
index d033dc3..a445b76 100755
--- a/Gem/gem_imageTIFF.so
+++ b/Gem/gem_imageTIFF.so
diff --git a/Gem/gem_modelOBJ.so b/Gem/gem_modelOBJ.so
index f1efae2..93bee9f 100755
--- a/Gem/gem_modelOBJ.so
+++ b/Gem/gem_modelOBJ.so
diff --git a/Gem/gemcocoawindow.pd_darwin b/Gem/gemcocoawindow.pd_darwin
index 357f43e..22329aa 100755
--- a/Gem/gemcocoawindow.pd_darwin
+++ b/Gem/gemcocoawindow.pd_darwin
diff --git a/Gem/gemglutwindow.pd_darwin b/Gem/gemglutwindow.pd_darwin
index a8bbc48..7ad8671 100755
--- a/Gem/gemglutwindow.pd_darwin
+++ b/Gem/gemglutwindow.pd_darwin
diff --git a/Gem/gemmacoswindow.pd_darwin b/Gem/gemmacoswindow.pd_darwin
index 5d3305e..ec639df 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
index 004145d..68fef15 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
index 4e626f5..3378652 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
index 42a500e..cb848a3 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
index 4ac4334..89511ae 100755
--- a/Gem/pix_mano.pd_darwin
+++ b/Gem/pix_mano.pd_darwin