From c61e85b875dfd329ab3160d024391de52641d0b4 Mon Sep 17 00:00:00 2001 From: artemp Date: Tue, 23 May 2017 15:47:54 +0200 Subject: [PATCH] unify namespace names --- src/tiff_reader.cpp | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/tiff_reader.cpp b/src/tiff_reader.cpp index e34c536e9..c3f398f43 100644 --- a/src/tiff_reader.cpp +++ b/src/tiff_reader.cpp @@ -42,7 +42,7 @@ extern "C" #include #include -namespace mapnik { namespace impl { +namespace mapnik { namespace detail { static toff_t tiff_seek_proc(thandle_t handle, toff_t off, int whence) { @@ -102,11 +102,6 @@ static int tiff_map_proc(thandle_t, tdata_t* , toff_t*) return 0; } -} - -namespace detail { - - template struct tiff_io_traits { @@ -836,13 +831,13 @@ TIFF* tiff_reader::open(std::istream & input) { tif_ = tiff_ptr(TIFFClientOpen("tiff_input_stream", "rcm", reinterpret_cast(&input), - impl::tiff_read_proc, - impl::tiff_write_proc, - impl::tiff_seek_proc, - impl::tiff_close_proc, - impl::tiff_size_proc, - impl::tiff_map_proc, - impl::tiff_unmap_proc), tiff_closer()); + detail::tiff_read_proc, + detail::tiff_write_proc, + detail::tiff_seek_proc, + detail::tiff_close_proc, + detail::tiff_size_proc, + detail::tiff_map_proc, + detail::tiff_unmap_proc), tiff_closer()); } return tif_.get(); }