include/rays/image.h in rays-0.1.6 vs include/rays/image.h in rays-0.1.7

@@ -3,11 +3,12 @@
 #ifndef __RAYS_IMAGE_H__
 #define __RAYS_IMAGE_H__
 
 
 #include <xot/pimpl.h>
-#include <rays/colorspace.h>
+#include <rays/color_space.h>
+#include <rays/painter.h>
 
 
 namespace Rays
 {
 
@@ -26,23 +27,27 @@
 
 			Image ();
 
 			Image (
 				int width, int height, const ColorSpace& cs = RGBA,
-				bool alphatexture = false);
+				bool alpha_only = false);
 
-			Image (const Bitmap& bitmap, bool alphatexture = false);
+			Image (const Bitmap& bitmap, bool alpha_only = false);
 
 			~Image ();
 
+			Image copy () const;
+
+			Painter painter ();
+
 			int width () const;
 
 			int height () const;
 
 			const ColorSpace& color_space () const;
 
-			bool alpha_texture () const;
+			bool alpha_only () const;
 
 			      Bitmap& bitmap ();
 
 			const Bitmap& bitmap () const;
 
@@ -59,12 +64,12 @@
 			Xot::PImpl<Data, true> self;
 
 	};// Image
 
 
-	bool load_image (Image* image, const char* path, bool alphatexture = false);
+	Image load_image (const char* path, bool alphatexture = false);
 
-	bool save_image (const Image& image, const char* path);
+	void save_image (const Image& image, const char* path);
 
 
 }// Rays