image: move buffer into image directory

This commit is contained in:
Danny Robson 2016-02-19 13:55:59 +11:00
parent df05596524
commit 817eb50efc
9 changed files with 17 additions and 17 deletions

View File

@ -147,9 +147,9 @@ UTIL_FILES = \
hash/sha2.hpp \ hash/sha2.hpp \
hash/wang.hpp \ hash/wang.hpp \
hash/wang.ipp \ hash/wang.ipp \
image.cpp \ image/buffer.cpp \
image.hpp \ image/buffer.hpp \
image.ipp \ image/buffer.ipp \
introspection.cpp \ introspection.cpp \
introspection.hpp \ introspection.hpp \
io.cpp \ io.cpp \

View File

@ -14,9 +14,9 @@
* Copyright 2011-2015 Danny Robson <danny@nerdcruft.net> * Copyright 2011-2015 Danny Robson <danny@nerdcruft.net>
*/ */
#include "image.hpp" #include "./buffer.hpp"
#include "debug.hpp" #include "../debug.hpp"
using util::image::buffer; using util::image::buffer;

View File

@ -14,11 +14,11 @@
* Copyright 2011-2015 Danny Robson <danny@nerdcruft.net> * Copyright 2011-2015 Danny Robson <danny@nerdcruft.net>
*/ */
#ifndef __UTIL_IMAGE_HPP #ifndef __UTIL_IMAGE_BUFFER_HPP
#define __UTIL_IMAGE_HPP #define __UTIL_IMAGE_BUFFER_HPP
#include "extent.hpp" #include "../extent.hpp"
#include "point.hpp" #include "../point.hpp"
#include <cstdint> #include <cstdint>
#include <cstdlib> #include <cstdlib>
@ -82,6 +82,6 @@ namespace util { namespace image {
}; };
} } } }
#include "image.ipp" #include "./buffer.ipp"
#endif #endif

View File

@ -14,10 +14,10 @@
* Copyright 2011-2015 Danny Robson <danny@nerdcruft.net> * Copyright 2011-2015 Danny Robson <danny@nerdcruft.net>
*/ */
#ifdef __UTIL_IMAGE_IPP #ifdef __UTIL_IMAGE_BUFFER_IPP
#error #error
#endif #endif
#define __UTIL_IMAGE_IPP #define __UTIL_IMAGE_BUFFER_IPP
namespace util { namespace image { namespace util { namespace image {
//------------------------------------------------------------------------- //-------------------------------------------------------------------------

View File

@ -17,7 +17,7 @@
#ifndef __UTIL_NETPBM_HPP #ifndef __UTIL_NETPBM_HPP
#define __UTIL_NETPBM_HPP #define __UTIL_NETPBM_HPP
#include "image.hpp" #include "./image/buffer.hpp"
#include <cstdint> #include <cstdint>
#include <cstddef> #include <cstddef>

View File

@ -20,7 +20,7 @@
#include <cstdint> #include <cstdint>
#include <cstdlib> #include <cstdlib>
#include "image.hpp" #include "image/buffer.hpp"
namespace util { namespace noise { namespace util { namespace noise {
template <typename T, typename G> template <typename T, typename G>

View File

@ -17,7 +17,7 @@
#ifndef __UTIL_NOISE_MIDPOINT_HPP #ifndef __UTIL_NOISE_MIDPOINT_HPP
#define __UTIL_NOISE_MIDPOINT_HPP #define __UTIL_NOISE_MIDPOINT_HPP
#include "image.hpp" #include "../image/buffer.hpp"
namespace util { namespace noise { namespace util { namespace noise {
template <typename T> template <typename T>

View File

@ -1,4 +1,4 @@
#include "image.hpp" #include "image/buffer.hpp"
#include "tap.hpp" #include "tap.hpp"
#include <cstdint> #include <cstdint>

View File

@ -1,4 +1,4 @@
#include "image.hpp" #include "image/buffer.hpp"
#include "noise.hpp" #include "noise.hpp"
#include "noise/fractal/fbm.hpp" #include "noise/fractal/fbm.hpp"