Merge pull request #129 from rdumusc/master

Removed boost::serialization that was used exclusively by Tide

CMakeLists.txt

@@ -17,15 +17,15 @@ set(DEFLECT_LICENSE BSD)
 set(DEFLECT_DEPENDENT_LIBRARIES Boost)
 set(DEFLECT_DEB_DEPENDS freeglut3-dev libxi-dev libxmu-dev
   libjpeg-turbo8-dev libturbojpeg
-  libboost-date-time-dev libboost-program-options-dev libboost-serialization-dev
-  libboost-system-dev libboost-test-dev libboost-thread-dev
+  libboost-date-time-dev libboost-program-options-dev libboost-system-dev
+  libboost-test-dev libboost-thread-dev
   qtbase5-dev qtdeclarative5-dev)
 set(DEFLECT_PORT_DEPENDS boost freeglut qt5)
 
 include(Common)
 
-common_find_package(Boost REQUIRED COMPONENTS date_time program_options
-  serialization system thread unit_test_framework)
+common_find_package(Boost REQUIRED COMPONENTS date_time program_options system
+  thread unit_test_framework)
 common_find_package(GLUT)
 common_find_package(LibJpegTurbo REQUIRED)
 common_find_package(OpenGL)

deflect/Frame.h

@@ -1,6 +1,6 @@
 /*********************************************************************/
-/* Copyright (c) 2014, EPFL/Blue Brain Project                       */
-/*                     Raphael Dumusc <[email protected]>       */
+/* Copyright (c) 2014-2016, EPFL/Blue Brain Project                  */
+/*                          Raphael Dumusc <[email protected]>  */
 /* All rights reserved.                                              */
 /*                                                                   */
 /* Redistribution and use in source and binary forms, with or        */
@@ -44,10 +44,8 @@
 #include <deflect/types.h>
 #include <deflect/Segment.h>
 
-#include <QString>
 #include <QSize>
-#include <boost/serialization/access.hpp>
-#include <boost/serialization/vector.hpp>
+#include <QString>
 
 namespace deflect
 {
@@ -66,16 +64,6 @@ class Frame
 
     /** Get the total dimensions of this frame. */
     DEFLECT_API QSize computeDimensions() const;
-
-private:
-    friend class boost::serialization::access;
-
-    template<class Archive>
-    void serialize( Archive & ar, const unsigned int )
-    {
-        ar & segments;
-        ar & uri;
-    }
 };
 
 }

deflect/Segment.h

@@ -1,6 +1,6 @@
 /*********************************************************************/
-/* Copyright (c) 2013, EPFL/Blue Brain Project                       */
-/*                     Raphael Dumusc <[email protected]>       */
+/* Copyright (c) 2013-2016, EPFL/Blue Brain Project                  */
+/*                          Raphael Dumusc <[email protected]>  */
 /* All rights reserved.                                              */
 /*                                                                   */
 /* Redistribution and use in source and binary forms, with or        */
@@ -42,9 +42,6 @@
 
 #include <deflect/SegmentParameters.h>
 
-#include <boost/serialization/binary_object.hpp>
-#include <boost/serialization/split_member.hpp>
-
 #include <QByteArray>
 
 namespace deflect
@@ -65,36 +62,6 @@ struct Segment
 
     /** @internal raw, uncompressed source image, used for compression */
     const ImageWrapper* sourceImage;
-
-private:
-    friend class boost::serialization::access;
-
-    template<class Archive>
-    void save( Archive & ar, const unsigned int ) const
-    {
-        ar & parameters;
-
-        int size = imageData.size();
-        ar & size;
-
-        ar & boost::serialization::make_binary_object( (void*)imageData.data(),
-                                                       imageData.size( ));
-    }
-
-    template<class Archive>
-    void load( Archive & ar, const unsigned int )
-    {
-        ar & parameters;
-
-        int size = 0;
-        ar & size;
-        imageData.resize( size );
-
-        ar & boost::serialization::make_binary_object( (void*)imageData.data(),
-                                                       size );
-    }
-
-    BOOST_SERIALIZATION_SPLIT_MEMBER()
 };
 
 }

deflect/SegmentParameters.h

@@ -1,5 +1,6 @@
 /*********************************************************************/
-/* Copyright (c) 2011 - 2012, The University of Texas at Austin.     */
+/* Copyright (c) 2013-2016, EPFL/Blue Brain Project                  */
+/*                          Raphael Dumusc <[email protected]>  */
 /* All rights reserved.                                              */
 /*                                                                   */
 /* Redistribution and use in source and binary forms, with or        */
@@ -45,8 +46,6 @@
     #include <stdint.h>
 #endif
 
-#include <boost/serialization/access.hpp>
-
 namespace deflect
 {
 
@@ -77,22 +76,7 @@ struct SegmentParameters
         , width( 0 )
         , height( 0 )
         , compressed( true )
-    {
-    }
-
-private:
-    friend class boost::serialization::access;
-
-    /** Serialization method */
-    template<class Archive>
-    void serialize( Archive & ar, const unsigned int )
-    {
-        ar & x;
-        ar & y;
-        ar & width;
-        ar & height;
-        ar & compressed;
-    }
+    {}
 };
 
 }

doc/Changelog.md

@@ -5,6 +5,8 @@ Changelog {#Changelog}
 
 ### 0.12.0 (git master)
 
+* [129](https://github.com/BlueBrain/Deflect/pull/129)
+  Cleared Deflect from boost::serialization that was used exclusively by Tide.
 * [128](https://github.com/BlueBrain/Deflect/pull/128)
   New events for transmitting all touch points in addition to existing gestures:
   - Gives the ability to handle more than one touch point in applications (e.g.