Permalink
Browse files

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.
  • Loading branch information...
Timothy M. Shead
Timothy M. Shead committed May 27, 2010
1 parent c9eceee commit ce0064ec618678859e69e3063c9eeb6f7fb5bb93
Showing with 34 additions and 13,269 deletions.
  1. +9 −7 k3dsdk/CMakeLists.txt
  2. +4 −23 k3dsdk/bitmap.h
  3. +0 −813 k3dsdk/gil/boost/gil/algorithm.hpp
  4. +0 −498 k3dsdk/gil/boost/gil/channel.hpp
  5. +0 −295 k3dsdk/gil/boost/gil/channel_algorithm.hpp
  6. +0 −60 k3dsdk/gil/boost/gil/cmyk.hpp
  7. +0 −393 k3dsdk/gil/boost/gil/color_base.hpp
  8. +0 −535 k3dsdk/gil/boost/gil/color_base_algorithm.hpp
  9. +0 −312 k3dsdk/gil/boost/gil/color_convert.hpp
  10. +0 −61 k3dsdk/gil/boost/gil/deprecated.hpp
  11. +0 −84 k3dsdk/gil/boost/gil/device_n.hpp
  12. +0 −170 k3dsdk/gil/boost/gil/extension/dynamic_image/algorithm.hpp
  13. +0 −122 k3dsdk/gil/boost/gil/extension/dynamic_image/any_image.hpp
  14. +0 −111 k3dsdk/gil/boost/gil/extension/dynamic_image/any_image_view.hpp
  15. +0 −57 k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation.hpp
  16. +0 −158 k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp
  17. +0 −126 k3dsdk/gil/boost/gil/extension/dynamic_image/dynamic_at_c.hpp
  18. +0 −28 k3dsdk/gil/boost/gil/extension/dynamic_image/dynamic_image_all.hpp
  19. +0 −208 k3dsdk/gil/boost/gil/extension/dynamic_image/image_view_factory.hpp
  20. +0 −786 k3dsdk/gil/boost/gil/extension/dynamic_image/reduce.hpp
  21. +0 −189 k3dsdk/gil/boost/gil/extension/dynamic_image/variant.hpp
  22. +0 −76 k3dsdk/gil/boost/gil/extension/io/dynamic_io.hpp
  23. +0 −48 k3dsdk/gil/boost/gil/extension/io/io_error.hpp
  24. +0 −126 k3dsdk/gil/boost/gil/extension/io/jpeg_dynamic_io.hpp
  25. +0 −198 k3dsdk/gil/boost/gil/extension/io/jpeg_io.hpp
  26. +0 −221 k3dsdk/gil/boost/gil/extension/io/jpeg_io_private.hpp
  27. +0 −137 k3dsdk/gil/boost/gil/extension/io/png_dynamic_io.hpp
  28. +0 −210 k3dsdk/gil/boost/gil/extension/io/png_io.hpp
  29. +0 −350 k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp
  30. +0 −131 k3dsdk/gil/boost/gil/extension/io/tiff_dynamic_io.hpp
  31. +0 −489 k3dsdk/gil/boost/gil/extension/io/tiff_io.hpp
  32. +1 −1 k3dsdk/gil/boost/gil/extension/numeric/affine.hpp
  33. +3 −3 k3dsdk/gil/boost/gil/extension/numeric/algorithm.hpp
  34. +2 −2 k3dsdk/gil/boost/gil/extension/numeric/channel_numeric_operations.hpp
  35. +4 −4 k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp
  36. +2 −2 k3dsdk/gil/boost/gil/extension/numeric/kernel.hpp
  37. +3 −3 k3dsdk/gil/boost/gil/extension/numeric/pixel_numeric_operations.hpp
  38. +1 −1 k3dsdk/gil/boost/gil/extension/numeric/resample.hpp
  39. +1 −1 k3dsdk/gil/boost/gil/extension/numeric/sampler.hpp
  40. +0 −41 k3dsdk/gil/boost/gil/gil_all.hpp
  41. +0 −2,163 k3dsdk/gil/boost/gil/gil_concept.hpp
  42. +0 −39 k3dsdk/gil/boost/gil/gil_config.hpp
  43. +0 −41 k3dsdk/gil/boost/gil/gray.hpp
  44. +0 −268 k3dsdk/gil/boost/gil/image.hpp
  45. +0 −220 k3dsdk/gil/boost/gil/image_view.hpp
  46. +0 −376 k3dsdk/gil/boost/gil/image_view_factory.hpp
  47. +0 −168 k3dsdk/gil/boost/gil/iterator_from_2d.hpp
  48. +0 −357 k3dsdk/gil/boost/gil/locator.hpp
  49. +0 −330 k3dsdk/gil/boost/gil/metafunctions.hpp
  50. +0 −175 k3dsdk/gil/boost/gil/packed_pixel.hpp
  51. +0 −166 k3dsdk/gil/boost/gil/pixel.hpp
  52. +0 −162 k3dsdk/gil/boost/gil/pixel_iterator.hpp
  53. +0 −201 k3dsdk/gil/boost/gil/pixel_iterator_adaptor.hpp
  54. +0 −209 k3dsdk/gil/boost/gil/planar_pixel_iterator.hpp
  55. +0 −153 k3dsdk/gil/boost/gil/planar_pixel_reference.hpp
  56. +0 −117 k3dsdk/gil/boost/gil/position_iterator.hpp
  57. +0 −65 k3dsdk/gil/boost/gil/rgb.hpp
  58. +0 −59 k3dsdk/gil/boost/gil/rgba.hpp
  59. +0 −309 k3dsdk/gil/boost/gil/step_iterator.hpp
  60. +0 −192 k3dsdk/gil/boost/gil/typedefs.hpp
  61. +0 −278 k3dsdk/gil/boost/gil/utilities.hpp
  62. +0 −132 k3dsdk/gil/boost/gil/virtual_locator.hpp
  63. +0 −1 k3dsdk/ngui/CMakeLists.txt
  64. +0 −1 k3dsdk/python/CMakeLists.txt
  65. +0 −1 modules/CMakeLists.txt
  66. +0 −1 modules/ngui/CMakeLists.txt
  67. +4 −4 modules/pdiff/perceptual_difference.cpp
  68. +0 −1 tests/sdk/CMakeLists.txt
View
@@ -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})
View
@@ -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
Oops, something went wrong.

1 comment on commit ce0064e

@AzP

This comment has been minimized.

Show comment
Hide comment
@AzP

AzP Jun 17, 2013

Perhaps time for a new official release so this change (which is 3 years old) makes it into distributions which are source based? Gentoo is one of the distributions which have to patch this by hand nowdays, to make it build with GCC-4.7.

AzP commented on ce0064e Jun 17, 2013

Perhaps time for a new official release so this change (which is 3 years old) makes it into distributions which are source based? Gentoo is one of the distributions which have to patch this by hand nowdays, to make it build with GCC-4.7.

Please sign in to comment.