fixed some merge/compilation issues

include/mitsuba/core/bitmap.h

@@ -819,18 +819,6 @@ public:
 	 */
 	std::map<std::string, Bitmap *> split() const;
 
-	/**
-	 * \brief Extract several color channels of a multi-channel
-	 * bitmap and return them as a bitmap with the given pixel format
-	 */
-	ref<Bitmap> extractChannels(Bitmap::EPixelFormat fmt, const std::vector<int> &channels) const;
-
-	/**
-	 * \brief Split an multi-channel image buffer (e.g. from an OpenEXR image
-	 * with lots of AOVs) into group of RGB[A]/XYZ[A]/Luminance images
-	 */
-	std::map<std::string, Bitmap *> split() const;
-
 	/**
 	 * \brief Merges multiple bitmaps of the same type and resolution
 	 * into one with a larger number of channels

src/shapes/CMakeLists.txt

@@ -20,7 +20,7 @@ add_shape(hair       hair.h hair.cpp)
 add_shape(shapegroup shapegroup.h shapegroup.cpp)
 add_shape(instance   instance.h instance.cpp)
 add_shape(heightfield heightfield.cpp)
-add_shape(deformable deformable.cpp)
+#add_shape(deformable deformable.cpp)
 add_shape(ply ply.cpp ply/ply_parser.cpp 
   ply/byte_order.hpp ply/config.hpp ply/io_operators.hpp
   ply/ply.hpp ply/ply_parser.hpp)

src/shapes/SConscript

@@ -13,6 +13,6 @@ plugins += env.SharedLibrary('shapegroup', ['shapegroup.cpp'])
 plugins += env.SharedLibrary('instance', ['instance.cpp'])
 plugins += env.SharedLibrary('cube', ['cube.cpp'])
 plugins += env.SharedLibrary('heightfield', ['heightfield.cpp'])
-plugins += env.SharedLibrary('deformable', ['deformable.cpp'])
+#plugins += env.SharedLibrary('deformable', ['deformable.cpp'])
 
 Export('plugins')