Merge branch 'master' into 0.9.2

Author: robotconscience

example_server_binary/bin/readMe.txt

@@ -55,7 +55,12 @@ namespace ofxLibwebsockets {
 
         // send anything that has pixels
         template <class T>
-        void sendBinary( T& image );
+        void sendBinary( T& image ){
+            if ( connection != NULL ){
+                int size = image.getWidth() * image.getHeight() * image.getPixels().getNumChannels();
+                connection->sendBinary( (char *) image.getPixels().getData(), size );
+            }
+        }
 
         // send any binary data
         void sendBinary( ofBuffer buffer );

libs/ofxLibwebsockets/include/ofxLibwebsockets/Client.h

@@ -69,10 +69,12 @@ namespace ofxLibwebsockets {
         // send anything that has pixels to all connections
         template <class T> 
         void sendBinary( T& image ){
+            int size = image.getWidth() * image.getHeight() * image.getPixels().getNumChannels();
+            
             lock();
             for (int i=0; i<connections.size(); i++){
                 if ( connections[i] != NULL ){
-                    connections[i]->sendBinary( image );
+                    connections[i]->sendBinary( (char *) image.getPixels().getData(), size );
                 }
             }
             unlock();

libs/ofxLibwebsockets/include/ofxLibwebsockets/Server.h

@@ -209,14 +209,6 @@ namespace ofxLibwebsockets {
             connection->send( message );
         }
     }
-
-    //--------------------------------------------------------------
-    template <class T>
-    void Client::sendBinary( T& image ){
-        if ( connection != NULL ){
-            connection->sendBinary(image);
-        }
-    }
 
     //--------------------------------------------------------------
     void Client::sendBinary( ofBuffer buffer ){