From 817eb50efc55f2c5e8240d723e75191acd3667a0 Mon Sep 17 00:00:00 2001 From: Danny Robson Date: Fri, 19 Feb 2016 13:55:59 +1100 Subject: [PATCH] image: move buffer into image directory --- Makefile.am | 6 +++--- image.cpp => image/buffer.cpp | 4 ++-- image.hpp => image/buffer.hpp | 10 +++++----- image.ipp => image/buffer.ipp | 4 ++-- netpbm.hpp | 2 +- noise.hpp | 2 +- noise/midpoint.hpp | 2 +- test/image.cpp | 2 +- tools/noise.cpp | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) rename image.cpp => image/buffer.cpp (99%) rename image.hpp => image/buffer.hpp (95%) rename image.ipp => image/buffer.ipp (96%) diff --git a/Makefile.am b/Makefile.am index a2d9b994..b91577fb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -147,9 +147,9 @@ UTIL_FILES = \ hash/sha2.hpp \ hash/wang.hpp \ hash/wang.ipp \ - image.cpp \ - image.hpp \ - image.ipp \ + image/buffer.cpp \ + image/buffer.hpp \ + image/buffer.ipp \ introspection.cpp \ introspection.hpp \ io.cpp \ diff --git a/image.cpp b/image/buffer.cpp similarity index 99% rename from image.cpp rename to image/buffer.cpp index 4232e1f2..d7799bc1 100644 --- a/image.cpp +++ b/image/buffer.cpp @@ -14,9 +14,9 @@ * Copyright 2011-2015 Danny Robson */ -#include "image.hpp" +#include "./buffer.hpp" -#include "debug.hpp" +#include "../debug.hpp" using util::image::buffer; diff --git a/image.hpp b/image/buffer.hpp similarity index 95% rename from image.hpp rename to image/buffer.hpp index d9338780..06de18fc 100644 --- a/image.hpp +++ b/image/buffer.hpp @@ -14,11 +14,11 @@ * Copyright 2011-2015 Danny Robson */ -#ifndef __UTIL_IMAGE_HPP -#define __UTIL_IMAGE_HPP +#ifndef __UTIL_IMAGE_BUFFER_HPP +#define __UTIL_IMAGE_BUFFER_HPP -#include "extent.hpp" -#include "point.hpp" +#include "../extent.hpp" +#include "../point.hpp" #include #include @@ -82,6 +82,6 @@ namespace util { namespace image { }; } } -#include "image.ipp" +#include "./buffer.ipp" #endif diff --git a/image.ipp b/image/buffer.ipp similarity index 96% rename from image.ipp rename to image/buffer.ipp index a2faafec..b30b6912 100644 --- a/image.ipp +++ b/image/buffer.ipp @@ -14,10 +14,10 @@ * Copyright 2011-2015 Danny Robson */ -#ifdef __UTIL_IMAGE_IPP +#ifdef __UTIL_IMAGE_BUFFER_IPP #error #endif -#define __UTIL_IMAGE_IPP +#define __UTIL_IMAGE_BUFFER_IPP namespace util { namespace image { //------------------------------------------------------------------------- diff --git a/netpbm.hpp b/netpbm.hpp index 21df7806..36c38b9c 100644 --- a/netpbm.hpp +++ b/netpbm.hpp @@ -17,7 +17,7 @@ #ifndef __UTIL_NETPBM_HPP #define __UTIL_NETPBM_HPP -#include "image.hpp" +#include "./image/buffer.hpp" #include #include diff --git a/noise.hpp b/noise.hpp index efd22cee..b7791df6 100644 --- a/noise.hpp +++ b/noise.hpp @@ -20,7 +20,7 @@ #include #include -#include "image.hpp" +#include "image/buffer.hpp" namespace util { namespace noise { template diff --git a/noise/midpoint.hpp b/noise/midpoint.hpp index afbad858..36977c72 100644 --- a/noise/midpoint.hpp +++ b/noise/midpoint.hpp @@ -17,7 +17,7 @@ #ifndef __UTIL_NOISE_MIDPOINT_HPP #define __UTIL_NOISE_MIDPOINT_HPP -#include "image.hpp" +#include "../image/buffer.hpp" namespace util { namespace noise { template diff --git a/test/image.cpp b/test/image.cpp index e64d039e..3259d6b6 100644 --- a/test/image.cpp +++ b/test/image.cpp @@ -1,4 +1,4 @@ -#include "image.hpp" +#include "image/buffer.hpp" #include "tap.hpp" #include diff --git a/tools/noise.cpp b/tools/noise.cpp index b8ba9f29..47ba8da5 100644 --- a/tools/noise.cpp +++ b/tools/noise.cpp @@ -1,4 +1,4 @@ -#include "image.hpp" +#include "image/buffer.hpp" #include "noise.hpp" #include "noise/fractal/fbm.hpp"