From 802428712e77449f32eb18f1244b8dabfcb54798 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 3 Dec 2014 10:56:19 +0100
Subject: [PATCH] initial image_data_any read(...) implementation - always read
 into image_data_32

---
 src/jpeg_reader.cpp | 4 +++-
 src/png_reader.cpp  | 4 +++-
 src/tiff_reader.cpp | 4 +++-
 src/webp_reader.cpp | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/jpeg_reader.cpp b/src/jpeg_reader.cpp
index 0bbcd2b00..97aff46b8 100644
--- a/src/jpeg_reader.cpp
+++ b/src/jpeg_reader.cpp
@@ -316,7 +316,9 @@ void jpeg_reader<T>::read(unsigned x0, unsigned y0, image_data_32& image)
 template <typename T>
 image_data_any jpeg_reader<T>::read(unsigned x, unsigned y, unsigned width, unsigned height)
 {
-    return image_data_any();
+    image_data_32 data(width,height);
+    read(x, y, data);
+    return image_data_any(std::move(data));
 }
 
 }
diff --git a/src/png_reader.cpp b/src/png_reader.cpp
index a79c406d6..e1492ea2c 100644
--- a/src/png_reader.cpp
+++ b/src/png_reader.cpp
@@ -306,7 +306,9 @@ void png_reader<T>::read(unsigned x0, unsigned y0,image_data_32& image)
 template <typename T>
 image_data_any png_reader<T>::read(unsigned x, unsigned y, unsigned width, unsigned height)
 {
-    return image_data_any();
+    image_data_32 data(width,height);
+    read(x, y, data);
+    return image_data_any(std::move(data));
 }
 
 }
diff --git a/src/tiff_reader.cpp b/src/tiff_reader.cpp
index b0faa3f2d..ed159e70d 100644
--- a/src/tiff_reader.cpp
+++ b/src/tiff_reader.cpp
@@ -300,7 +300,9 @@ void tiff_reader<T>::read(unsigned x,unsigned y,image_data_32& image)
 template <typename T>
 image_data_any tiff_reader<T>::read(unsigned x, unsigned y, unsigned width, unsigned height)
 {
-    return image_data_any();
+    image_data_32 data(width,height);
+    read(x, y, data);
+    return image_data_any(std::move(data));
 }
 
 template <typename T>
diff --git a/src/webp_reader.cpp b/src/webp_reader.cpp
index 30aff3bec..3652170ea 100644
--- a/src/webp_reader.cpp
+++ b/src/webp_reader.cpp
@@ -264,7 +264,9 @@ void webp_reader<T>::read(unsigned x0, unsigned y0,image_data_32& image)
 template <typename T>
 image_data_any webp_reader<T>::read(unsigned x, unsigned y, unsigned width, unsigned height)
 {
-    return image_data_any();
+    image_data_32 data(width,height);
+    read(x, y, data);
+    return image_data_any(std::move(data));
 }
 
 }