Remove obsolete Boost.Gil code.

There's no longer any reason to carry around the Boost.Gil code (it's
been in mainline Boost for years), except for the numeric extension,
which we still provide.  However, this change organizes the #include
directories so that a system-provided numeric extension should be
automatically used if available.

k3dsdk/CMakeLists.txt

@@ -18,13 +18,15 @@ CONFIGURE_FILE(${k3dsdk_SOURCE_DIR}/k3d-path-config.h.in ${k3dsdk_BINARY_DIR}/k3
 CONFIGURE_FILE(${k3dsdk_SOURCE_DIR}/k3d-platform-config.h.in ${k3dsdk_BINARY_DIR}/k3d-platform-config.h)
 CONFIGURE_FILE(${k3dsdk_SOURCE_DIR}/k3d-version-config.h.in ${k3dsdk_BINARY_DIR}/k3d-version-config.h)
 
-INCLUDE_DIRECTORIES(${k3d_SOURCE_DIR})
-INCLUDE_DIRECTORIES(${k3dsdk_SOURCE_DIR}/gil)
-INCLUDE_DIRECTORIES(${k3dsdk_BINARY_DIR})
-INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
-INCLUDE_DIRECTORIES(${K3D_GLIBMM_INCLUDE_DIRS})
-INCLUDE_DIRECTORIES(${K3D_SIGC_INCLUDE_DIRS})
-INCLUDE_DIRECTORIES(${K3D_OPENGL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(
+	${k3d_SOURCE_DIR}
+	${k3dsdk_BINARY_DIR}
+	${Boost_INCLUDE_DIRS}
+	${k3dsdk_SOURCE_DIR}/gil
+	${K3D_GLIBMM_INCLUDE_DIRS}
+	${K3D_SIGC_INCLUDE_DIRS}
+	${K3D_OPENGL_INCLUDE_DIR}
+	)
 
 IF(K3D_ENABLE_PARALLEL)
 	INCLUDE_DIRECTORIES(${K3D_TBB_INCLUDE_DIR})

k3dsdk/bitmap.h

@@ -41,10 +41,8 @@ namespace boost
 namespace gil
 {
 
-typedef half bits16f;
-
 template<>
-struct channel_traits<bits16f>
+struct channel_traits<half>
 {
 	typedef half value_type;
 	typedef half& reference;
@@ -55,32 +53,15 @@ struct channel_traits<bits16f>
 
 	static value_type min_value()
 	{
-		return bits16f(0.0f);
+		return half(0.0f);
 	}
 
 	static value_type max_value()
 	{
-		return bits16f(1.0f);
+		return half(1.0f);
 	}
 };
 
-GIL_DEFINE_BASE_TYPEDEFS(16f,gray)
-GIL_DEFINE_BASE_TYPEDEFS(16f,bgr)
-GIL_DEFINE_BASE_TYPEDEFS(16f,argb)
-GIL_DEFINE_BASE_TYPEDEFS(16f,abgr)
-GIL_DEFINE_BASE_TYPEDEFS(16f,bgra)
-
-GIL_DEFINE_ALL_TYPEDEFS(16f,rgb)
-GIL_DEFINE_ALL_TYPEDEFS(16f,rgba)
-GIL_DEFINE_ALL_TYPEDEFS(16f,cmyk)
-
-template <int N> struct devicen_t;
-template <int N> struct devicen_layout_t;
-GIL_DEFINE_ALL_TYPEDEFS_INTERNAL(16f,dev2n, devicen_t<2>, devicen_layout_t<2>)
-GIL_DEFINE_ALL_TYPEDEFS_INTERNAL(16f,dev3n, devicen_t<3>, devicen_layout_t<3>)
-GIL_DEFINE_ALL_TYPEDEFS_INTERNAL(16f,dev4n, devicen_t<4>, devicen_layout_t<4>)
-GIL_DEFINE_ALL_TYPEDEFS_INTERNAL(16f,dev5n, devicen_t<5>, devicen_layout_t<5>)
-
 } // namespace gil
 
 } // namespace boost
@@ -89,7 +70,7 @@ namespace k3d
 {
 
 /// Defines a standard pixel as half-precision floating-point RGBA
-typedef boost::gil::pixel<boost::gil::bits16f, boost::gil::rgba_layout_t> pixel;
+typedef boost::gil::pixel<half, boost::gil::rgba_layout_t> pixel;
 /// Defines a standard bitmap as half-precision floating-point RGBA
 typedef boost::gil::image<pixel, false> bitmap;
 /// Define storage for a pixel coordinate