From f4c70a86065374eddc4455725c0013f22de4e70a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Tue, 22 Feb 2022 19:18:55 +0100 Subject: [PATCH] Add support for to IO (#636) If neither nor is detected, then require . If user defines BOOST_GIL_IO_USE_BOOST_FILESYSTEM macro, then is pre-selected and required, and search for any of the C++ standard implementation is skipped. Remove end-user macro BOOST_GIL_IO_ADD_FS_PATH_SUPPORT Require tests to always build with support of either detected C++ filesystem or pre-selected Boost.Filesystem. Closes ##222 --- doc/io.rst | 15 +++-- include/boost/gil/io/detail/filesystem.hpp | 65 +++++++++++++++++++ include/boost/gil/io/make_backend.hpp | 4 +- .../gil/io/make_dynamic_image_reader.hpp | 8 +-- .../gil/io/make_dynamic_image_writer.hpp | 4 +- include/boost/gil/io/make_reader.hpp | 8 +-- include/boost/gil/io/make_scanline_reader.hpp | 4 +- include/boost/gil/io/make_writer.hpp | 8 +-- include/boost/gil/io/path_spec.hpp | 49 ++------------ test/extension/io/bmp/bmp_make.cpp | 4 +- test/extension/io/bmp/bmp_test.cpp | 4 +- test/extension/io/jpeg/jpeg_test.cpp | 4 +- test/extension/io/paths.hpp | 24 +------ .../extension/io/png/png_file_format_test.cpp | 4 +- test/extension/io/png/png_read_test.cpp | 4 +- test/extension/io/png/png_write_test.cpp | 2 - test/extension/io/raw/raw_test.cpp | 4 +- test/extension/io/simple_all_formats.cpp | 2 +- test/extension/io/targa/targa_test.cpp | 3 +- test/extension/io/tiff/tiff_test.cpp | 4 +- 20 files changed, 100 insertions(+), 124 deletions(-) create mode 100644 include/boost/gil/io/detail/filesystem.hpp diff --git a/doc/io.rst b/doc/io.rst index 29736e9ef1..01462dbc97 100644 --- a/doc/io.rst +++ b/doc/io.rst @@ -205,9 +205,10 @@ If that's the case the user has to use the xxx_and_convert_xxx variants. All functions take the filename or a device as the first parameter. The filename can be anything from a C-string, ``std::string``, -``std::wstring`` and ``boost::filesystem`` path. When using the path -object the user needs to define the ADD_FS_PATH_SUPPORT compiler symbol to -include the boost::filesystem dependency. +``std::wstring`` to ``std::filesystem`` and ``boost::filesystem`` path. +The availability of the ``std::filesystem`` is detected automatically, +unless ``BOOST_GIL_IO_USE_BOOST_FILESYSTEM`` macro is defined that forces +preference of the Boost.Filesystem. Devices could be a ``FILE*``, ``std::ifstream``, and ``TIFF*`` for TIFF images. The second parameter is either an image or view type depending on the @@ -303,9 +304,10 @@ Write Interface There is only one function for writing out images, write_view. Similar to reading the first parameter is either a filename or a device. The filename can be anything from a C-string, ``std::string``, -``std::wstring``, and ``boost::filesystem`` path. When using the path object -the user needs to define the ``ADD_FS_PATH_SUPPORT`` compiler symbol to -include the ``boost::filesystem`` dependency. +``std::wstring`` to ``std::filesystem`` and ``boost::filesystem`` path. +The availability of the ``std::filesystem`` is detected automatically, +unless ``BOOST_GIL_IO_USE_BOOST_FILESYSTEM`` macro is defined that forces +preference of the Boost.Filesystem. Devices could be ``FILE*``, ``std::ifstream``, and ``TIFF*`` for TIFF images. The second parameter is an view object to image being written. @@ -342,7 +344,6 @@ that can be set by the user: Symbol Description ======================================================== ======================================================== BOOST_GIL_IO_ENABLE_GRAY_ALPHA Enable the color space "gray_alpha". -BOOST_GIL_IO_ADD_FS_PATH_SUPPORT Enable boost::filesystem 3.0 library. BOOST_GIL_IO_PNG_FLOATING_POINT_SUPPORTED Use libpng in floating point mode. This symbol is incompatible with BOOST_GIL_IO_PNG_FIXED_POINT_SUPPORTED. BOOST_GIL_IO_PNG_FIXED_POINT_SUPPORTED Use libpng in integer mode. This symbol is incompatible with BOOST_GIL_IO_PNG_FLOATING_POINT_SUPPORTED. BOOST_GIL_IO_PNG_DITHERING_SUPPORTED Look up "dithering" in libpng manual for explanation. diff --git a/include/boost/gil/io/detail/filesystem.hpp b/include/boost/gil/io/detail/filesystem.hpp new file mode 100644 index 0000000000..2e4c702a75 --- /dev/null +++ b/include/boost/gil/io/detail/filesystem.hpp @@ -0,0 +1,65 @@ +// +// Copyright 2022 Mateusz Loskot +// +// Distributed under the Boost Software License, Version 1.0 +// See accompanying file LICENSE_1_0.txt or copy at +// http://www.boost.org/LICENSE_1_0.txt +// +#ifndef BOOST_GIL_IO_DETAIL_FILESYSTEM_HPP +#define BOOST_GIL_IO_DETAIL_FILESYSTEM_HPP + +#include + +#if !defined(BOOST_GIL_IO_USE_BOOST_FILESYSTEM) +#if !defined(BOOST_NO_CXX17_HDR_FILESYSTEM) || defined(__cpp_lib_filesystem) +#include +#define BOOST_GIL_IO_USE_STD_FILESYSTEM +#elif defined(__cpp_lib_experimental_filesystem) +#include +#define BOOST_GIL_IO_USE_STD_FILESYSTEM +#define BOOST_GIL_IO_USE_STD_EXPERIMENTAL_FILESYSTEM +#endif +#endif // !BOOST_GIL_IO_USE_BOOST_FILESYSTEM + +#if !defined(BOOST_GIL_IO_USE_STD_FILESYSTEM) +// Disable warning: conversion to 'std::atomic::__integral_type {aka int}' from 'long int' may alter its value +#if defined(BOOST_CLANG) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wshorten-64-to-32" +#endif + +#if defined(BOOST_GCC) && (BOOST_GCC >= 40900) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wconversion" +#endif + +#define BOOST_FILESYSTEM_VERSION 3 +#include +#define BOOST_GIL_IO_USE_BOOST_FILESYSTEM + +#if defined(BOOST_CLANG) +#pragma clang diagnostic pop +#endif + +#if defined(BOOST_GCC) && (BOOST_GCC >= 40900) +#pragma GCC diagnostic pop +#endif + +#endif + +namespace boost { namespace gil { namespace detail { + +#if defined(BOOST_GIL_IO_USE_STD_EXPERIMENTAL_FILESYSTEM) +namespace filesystem = std::experimental::filesystem; +#elif defined(BOOST_GIL_IO_USE_STD_FILESYSTEM) +namespace filesystem = std::filesystem; +#else +#if !defined(BOOST_GIL_IO_USE_BOOST_FILESYSTEM) +#error "Boost.Filesystem is required if C++17 is not available" +#endif +namespace filesystem = boost::filesystem; +#endif + +}}} // namespace boost::gil::detail + +#endif \ No newline at end of file diff --git a/include/boost/gil/io/make_backend.hpp b/include/boost/gil/io/make_backend.hpp index 54a518e6ca..b3fe40d6be 100644 --- a/include/boost/gil/io/make_backend.hpp +++ b/include/boost/gil/io/make_backend.hpp @@ -55,17 +55,15 @@ auto make_reader_backend( return reader_backend(device, settings); } -#ifdef BOOST_GIL_IO_ADD_FS_PATH_SUPPORT template inline auto make_reader_backend( - filesystem::path const& path, + detail::filesystem::path const& path, image_read_settings const& settings) -> typename get_reader_backend::type { return make_reader_backend(path.wstring(), settings); } -#endif // BOOST_GIL_IO_ADD_FS_PATH_SUPPORT template inline diff --git a/include/boost/gil/io/make_dynamic_image_reader.hpp b/include/boost/gil/io/make_dynamic_image_reader.hpp index 88006983bf..e93ea1927e 100644 --- a/include/boost/gil/io/make_dynamic_image_reader.hpp +++ b/include/boost/gil/io/make_dynamic_image_reader.hpp @@ -54,16 +54,14 @@ auto make_dynamic_image_reader( typename get_dynamic_image_reader::type(device, settings); } -#ifdef BOOST_GIL_IO_ADD_FS_PATH_SUPPORT template inline auto make_dynamic_image_reader( - filesystem::path const& path, image_read_settings const& settings) + detail::filesystem::path const& path, image_read_settings const& settings) -> typename get_dynamic_image_reader::type { return make_dynamic_image_reader(path.wstring(), settings); } -#endif // BOOST_GIL_IO_ADD_FS_PATH_SUPPORT template inline @@ -109,15 +107,13 @@ auto make_dynamic_image_reader(std::wstring const& file_name, FormatTag const&) return make_dynamic_image_reader(file_name, image_read_settings()); } -#ifdef BOOST_GIL_IO_ADD_FS_PATH_SUPPORT template inline -auto make_dynamic_image_reader(filesystem::path const& path, FormatTag const&) +auto make_dynamic_image_reader(detail::filesystem::path const& path, FormatTag const&) -> typename get_dynamic_image_reader::type { return make_dynamic_image_reader(path.wstring(), image_read_settings()); } -#endif // BOOST_GIL_IO_ADD_FS_PATH_SUPPORT template inline diff --git a/include/boost/gil/io/make_dynamic_image_writer.hpp b/include/boost/gil/io/make_dynamic_image_writer.hpp index 978c7165eb..2ef5f3e95d 100644 --- a/include/boost/gil/io/make_dynamic_image_writer.hpp +++ b/include/boost/gil/io/make_dynamic_image_writer.hpp @@ -69,8 +69,8 @@ inline typename get_dynamic_image_writer< std::wstring , FormatTag >::type -make_dynamic_image_writer( const filesystem::path& path - , const image_write_info< FormatTag >& info +make_dynamic_image_writer( detail::filesystem::path const& path + , image_write_info const& info ) { return make_dynamic_image_writer( path.wstring() diff --git a/include/boost/gil/io/make_reader.hpp b/include/boost/gil/io/make_reader.hpp index 25b3d6707c..6a0ca9479b 100644 --- a/include/boost/gil/io/make_reader.hpp +++ b/include/boost/gil/io/make_reader.hpp @@ -70,7 +70,6 @@ make_reader( const std::wstring& file_name ); } -#ifdef BOOST_GIL_IO_ADD_FS_PATH_SUPPORT template< typename FormatTag , typename ConversionPolicy > @@ -79,7 +78,7 @@ typename get_reader< std::wstring , FormatTag , ConversionPolicy >::type -make_reader( const filesystem::path& path +make_reader( detail::filesystem::path const& path , const image_read_settings< FormatTag >& settings , const ConversionPolicy& cc ) @@ -89,7 +88,6 @@ make_reader( const filesystem::path& path , cc ); } -#endif // BOOST_GIL_IO_ADD_FS_PATH_SUPPORT template inline @@ -153,7 +151,6 @@ make_reader( const std::wstring& file_name ); } -#ifdef BOOST_GIL_IO_ADD_FS_PATH_SUPPORT template< typename FormatTag , typename ConversionPolicy > @@ -162,7 +159,7 @@ typename get_reader< std::wstring , FormatTag , ConversionPolicy >::type -make_reader( const filesystem::path& path +make_reader( detail::filesystem::path const& path , const FormatTag& , const ConversionPolicy& cc ) @@ -172,7 +169,6 @@ make_reader( const filesystem::path& path , cc ); } -#endif // BOOST_GIL_IO_ADD_FS_PATH_SUPPORT template inline diff --git a/include/boost/gil/io/make_scanline_reader.hpp b/include/boost/gil/io/make_scanline_reader.hpp index 4ca01a72b0..73e45a54c6 100644 --- a/include/boost/gil/io/make_scanline_reader.hpp +++ b/include/boost/gil/io/make_scanline_reader.hpp @@ -63,13 +63,12 @@ make_scanline_reader( const std::wstring& file_name ); } -#ifdef BOOST_GIL_IO_ADD_FS_PATH_SUPPORT template< typename FormatTag > inline typename get_scanline_reader< std::wstring , FormatTag >::type -make_scanline_reader( const filesystem::path& path +make_scanline_reader( detail::filesystem::path const& path , FormatTag const& ) { @@ -77,7 +76,6 @@ make_scanline_reader( const filesystem::path& path , image_read_settings< FormatTag >() ); } -#endif // BOOST_GIL_IO_ADD_FS_PATH_SUPPORT template inline diff --git a/include/boost/gil/io/make_writer.hpp b/include/boost/gil/io/make_writer.hpp index 8bad4b7164..69025d8778 100644 --- a/include/boost/gil/io/make_writer.hpp +++ b/include/boost/gil/io/make_writer.hpp @@ -60,13 +60,12 @@ make_writer( const std::wstring& file_name ); } -#ifdef BOOST_GIL_IO_ADD_FS_PATH_SUPPORT template< typename FormatTag > inline typename get_writer< std::wstring , FormatTag >::type -make_writer( const filesystem::path& path +make_writer( detail::filesystem::path const& path , const image_write_info< FormatTag >& info ) { @@ -74,7 +73,6 @@ make_writer( const filesystem::path& path , info ); } -#endif // BOOST_GIL_IO_ADD_FS_PATH_SUPPORT template inline @@ -125,13 +123,12 @@ make_writer( const std::wstring& file_name ); } -#ifdef BOOST_GIL_IO_ADD_FS_PATH_SUPPORT template< typename FormatTag > inline typename get_writer< std::wstring , FormatTag >::type -make_writer( const filesystem::path& path +make_writer( detail::filesystem::path const& path , const FormatTag& tag ) { @@ -139,7 +136,6 @@ make_writer( const filesystem::path& path , tag ); } -#endif // BOOST_GIL_IO_ADD_FS_PATH_SUPPORT template inline diff --git a/include/boost/gil/io/path_spec.hpp b/include/boost/gil/io/path_spec.hpp index dcb2a85230..8ffbc2129a 100644 --- a/include/boost/gil/io/path_spec.hpp +++ b/include/boost/gil/io/path_spec.hpp @@ -8,29 +8,7 @@ #ifndef BOOST_GIL_IO_PATH_SPEC_HPP #define BOOST_GIL_IO_PATH_SPEC_HPP -#ifdef BOOST_GIL_IO_ADD_FS_PATH_SUPPORT -// Disable warning: conversion to 'std::atomic::__integral_type {aka int}' from 'long int' may alter its value -#if defined(BOOST_CLANG) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wshorten-64-to-32" -#endif - -#if defined(BOOST_GCC) && (BOOST_GCC >= 40900) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#endif - -#define BOOST_FILESYSTEM_VERSION 3 -#include - -#if defined(BOOST_CLANG) -#pragma clang diagnostic pop -#endif - -#if defined(BOOST_GCC) && (BOOST_GCC >= 40900) -#pragma GCC diagnostic pop -#endif -#endif // BOOST_GIL_IO_ADD_FS_PATH_SUPPORT +#include #include #include @@ -53,15 +31,8 @@ template struct is_supported_path_spec : std::true_ template struct is_supported_path_spec : std::true_type {}; template struct is_supported_path_spec : std::true_type {}; -#ifdef BOOST_GIL_IO_ADD_FS_PATH_SUPPORT -template<> struct is_supported_path_spec< filesystem::path > : std::true_type {}; -template<> struct is_supported_path_spec< const filesystem::path > : std::true_type {}; -#endif // BOOST_GIL_IO_ADD_FS_PATH_SUPPORT - - -/// -/// convert_to_string -/// +template<> struct is_supported_path_spec : std::true_type {}; +template<> struct is_supported_path_spec : std::true_type {}; inline std::string convert_to_string( std::string const& obj) { @@ -87,16 +58,10 @@ inline std::string convert_to_string( char* str ) return std::string( str ); } -#ifdef BOOST_GIL_IO_ADD_FS_PATH_SUPPORT -inline std::string convert_to_string( const filesystem::path& path ) +inline std::string convert_to_string(filesystem::path const& path) { - return convert_to_string( path.string() ); + return convert_to_string(path.string()); } -#endif // BOOST_GIL_IO_ADD_FS_PATH_SUPPORT - -/// -/// convert_to_native_string -/// inline const char* convert_to_native_string( char* str ) { @@ -131,8 +96,6 @@ inline const char* convert_to_native_string( const std::wstring& str ) return c; } -} // namespace detail -} // namespace gil -} // namespace boost +}}} // namespace boost::gil::detail #endif diff --git a/test/extension/io/bmp/bmp_make.cpp b/test/extension/io/bmp/bmp_make.cpp index 26be077261..1746264398 100644 --- a/test/extension/io/bmp/bmp_make.cpp +++ b/test/extension/io/bmp/bmp_make.cpp @@ -5,8 +5,6 @@ // See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt // -#define BOOST_GIL_IO_ADD_FS_PATH_SUPPORT -#define BOOST_FILESYSTEM_VERSION 3 #include #include @@ -22,7 +20,7 @@ #include "paths.hpp" -namespace fs = boost::filesystem; +namespace fs = boost::gil::detail::filesystem; namespace gil = boost::gil; void test_make_reader_backend() diff --git a/test/extension/io/bmp/bmp_test.cpp b/test/extension/io/bmp/bmp_test.cpp index 811a7491bc..8f18f3e66a 100644 --- a/test/extension/io/bmp/bmp_test.cpp +++ b/test/extension/io/bmp/bmp_test.cpp @@ -5,8 +5,6 @@ // See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt // -#define BOOST_GIL_IO_ADD_FS_PATH_SUPPORT -#define BOOST_FILESYSTEM_VERSION 3 #include #include @@ -21,7 +19,7 @@ #include "paths.hpp" #include "subimage_test.hpp" -namespace fs = boost::filesystem; +namespace fs = boost::gil::detail::filesystem; namespace gil = boost::gil; namespace mp11 = boost::mp11; diff --git a/test/extension/io/jpeg/jpeg_test.cpp b/test/extension/io/jpeg/jpeg_test.cpp index 42bb6a3fd9..b961bd19a9 100644 --- a/test/extension/io/jpeg/jpeg_test.cpp +++ b/test/extension/io/jpeg/jpeg_test.cpp @@ -5,8 +5,6 @@ // See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt // -#define BOOST_FILESYSTEM_VERSION 3 -#define BOOST_GIL_IO_ADD_FS_PATH_SUPPORT #include #include @@ -21,7 +19,7 @@ #include "paths.hpp" #include "subimage_test.hpp" -namespace fs = boost::filesystem; +namespace fs = boost::gil::detail::filesystem; namespace gil = boost::gil; namespace mp11 = boost::mp11; diff --git a/test/extension/io/paths.hpp b/test/extension/io/paths.hpp index 9726afcccf..cf983240d4 100644 --- a/test/extension/io/paths.hpp +++ b/test/extension/io/paths.hpp @@ -8,33 +8,13 @@ #ifndef BOOST_GIL_TEST_EXTENSION_IO_PATHS_HPP #define BOOST_GIL_TEST_EXTENSION_IO_PATHS_HPP -// Disable warning: conversion to 'std::atomic::__integral_type {aka int}' from 'long int' may alter its value -#if defined(BOOST_CLANG) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wshorten-64-to-32" -#endif - -#if defined(BOOST_GCC) && (BOOST_GCC >= 40900) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#endif - -#define BOOST_FILESYSTEM_VERSION 3 -#include - -#if defined(BOOST_CLANG) -#pragma clang diagnostic pop -#endif - -#if defined(BOOST_GCC) && (BOOST_GCC >= 40900) -#pragma GCC diagnostic pop -#endif +#include #include // `base` holds the path to ../.., i.e. the directory containing `images` static const std::string base = - (boost::filesystem::absolute(boost::filesystem::path(__FILE__)).parent_path().string()) + "/"; + (boost::gil::detail::filesystem::absolute(boost::gil::detail::filesystem::path(__FILE__)).parent_path().string()) + "/"; static const std::string bmp_in = base + "images/bmp/"; static const std::string bmp_out = base + "output/"; diff --git a/test/extension/io/png/png_file_format_test.cpp b/test/extension/io/png/png_file_format_test.cpp index cda7fffdeb..f5713ca094 100644 --- a/test/extension/io/png/png_file_format_test.cpp +++ b/test/extension/io/png/png_file_format_test.cpp @@ -5,9 +5,7 @@ // See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt // -#define BOOST_GIL_IO_ADD_FS_PATH_SUPPORT #define BOOST_GIL_IO_ENABLE_GRAY_ALPHA -#define BOOST_FILESYSTEM_VERSION 3 #include #include @@ -15,8 +13,8 @@ #include "paths.hpp" +namespace fs = boost::gil::detail::filesystem; namespace gil = boost::gil; -namespace fs = boost::filesystem; #ifdef BOOST_GIL_IO_USE_PNG_TEST_SUITE_IMAGES diff --git a/test/extension/io/png/png_read_test.cpp b/test/extension/io/png/png_read_test.cpp index 5b51cf5480..0217aa9d67 100644 --- a/test/extension/io/png/png_read_test.cpp +++ b/test/extension/io/png/png_read_test.cpp @@ -5,9 +5,7 @@ // See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt // -#define BOOST_GIL_IO_ADD_FS_PATH_SUPPORT #define BOOST_GIL_IO_ENABLE_GRAY_ALPHA -#define BOOST_FILESYSTEM_VERSION 3 #include #include @@ -22,8 +20,8 @@ #include "scanline_read_test.hpp" #include "test_utility_output_stream.hpp" +namespace fs = boost::gil::detail::filesystem; namespace gil = boost::gil; -namespace fs = boost::filesystem; using gray_alpha8_pixel_t = gil::pixel; using gray_alpha8c_pixel_t = gil::pixel const; diff --git a/test/extension/io/png/png_write_test.cpp b/test/extension/io/png/png_write_test.cpp index 85f1541afa..da4e5d66e8 100644 --- a/test/extension/io/png/png_write_test.cpp +++ b/test/extension/io/png/png_write_test.cpp @@ -5,9 +5,7 @@ // See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt // -#define BOOST_GIL_IO_ADD_FS_PATH_SUPPORT #define BOOST_GIL_IO_ENABLE_GRAY_ALPHA -#define BOOST_FILESYSTEM_VERSION 3 #include #include diff --git a/test/extension/io/raw/raw_test.cpp b/test/extension/io/raw/raw_test.cpp index 810ebf0b91..71ce6037d4 100644 --- a/test/extension/io/raw/raw_test.cpp +++ b/test/extension/io/raw/raw_test.cpp @@ -5,8 +5,6 @@ // See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt // -#define BOOST_FILESYSTEM_VERSION 3 -#define BOOST_GIL_IO_ADD_FS_PATH_SUPPORT #include #include @@ -19,7 +17,7 @@ #include "paths.hpp" #include "subimage_test.hpp" -namespace fs = boost::filesystem; +namespace fs = boost::gil::detail::filesystem; namespace gil = boost::gil; namespace mp11 = boost::mp11; diff --git a/test/extension/io/simple_all_formats.cpp b/test/extension/io/simple_all_formats.cpp index 2acdb39fe4..b4bc87adca 100644 --- a/test/extension/io/simple_all_formats.cpp +++ b/test/extension/io/simple_all_formats.cpp @@ -16,8 +16,8 @@ #include "paths.hpp" +namespace fs = boost::gil::detail::filesystem; namespace gil = boost::gil; -namespace fs = boost::filesystem; // Test will include all format's headers and load and write some images. // This test is more of a compilation test. diff --git a/test/extension/io/targa/targa_test.cpp b/test/extension/io/targa/targa_test.cpp index c94e102244..accc1f7c6a 100644 --- a/test/extension/io/targa/targa_test.cpp +++ b/test/extension/io/targa/targa_test.cpp @@ -5,7 +5,6 @@ // See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt // -#define BOOST_GIL_IO_ADD_FS_PATH_SUPPORT #include #include @@ -21,7 +20,7 @@ #include "subimage_test.hpp" #include "test_utility_output_stream.hpp" -namespace fs = boost::filesystem; +namespace fs = boost::gil::detail::filesystem; namespace gil = boost::gil; namespace mp11 = boost::mp11; diff --git a/test/extension/io/tiff/tiff_test.cpp b/test/extension/io/tiff/tiff_test.cpp index f8ee2f0b09..f62492d1ad 100644 --- a/test/extension/io/tiff/tiff_test.cpp +++ b/test/extension/io/tiff/tiff_test.cpp @@ -5,8 +5,6 @@ // See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt // -#define BOOST_FILESYSTEM_VERSION 3 -#define BOOST_GIL_IO_ADD_FS_PATH_SUPPORT #include #include @@ -21,7 +19,7 @@ #include "paths.hpp" #include "subimage_test.hpp" -namespace fs = boost::filesystem; +namespace fs = boost::gil::detail::filesystem; namespace gil = boost::gil; namespace mp11 = boost::mp11;