image: move buffer into image directory

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			\

image/buffer.cpp

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

image/buffer.hpp

@@ -14,11 +14,11 @@
  * Copyright 2011-2015 Danny Robson <danny@nerdcruft.net>
  */
 
-#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 <cstdint>
 #include <cstdlib>
@@ -82,6 +82,6 @@ namespace util { namespace image {
     };
 } }
 
-#include "image.ipp"
+#include "./buffer.ipp"
 
 #endif

image/buffer.ipp

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

netpbm.hpp

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

noise.hpp

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

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 <typename T>

test/image.cpp

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

tools/noise.cpp

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