3 files changed, 3 insertions, 12 deletions
diff --git a/src/lib/image.cc b/src/lib/image.cc
index 4f5b11c90..861367637 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -1418,16 +1418,9 @@ png_flush (png_structp)
 
 
 static void
-png_error_fn (png_structp png_ptr, char const * message)
+png_error_fn (png_structp, char const * message)
 {
-	reinterpret_cast<Image*>(png_get_error_ptr(png_ptr))->png_error (message);
-}
-
-
-void
-Image::png_error (char const * message)
-{
-	throw EncodeError (String::compose ("Error during PNG write: %1", message));
+	throw EncodeError (String::compose("Error during PNG write: %1", message));
 }
 
 
diff --git a/src/lib/image.h b/src/lib/image.h
index 128b546b5..328252e68 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -97,8 +97,6 @@ public:
 
 	dcp::ArrayData as_png () const;
 
-	void png_error (char const * message);
-
 	static std::shared_ptr<const Image> ensure_alignment (std::shared_ptr<const Image> image, Alignment alignment);
 
 private:
diff --git a/test/test.cc b/test/test.cc
index 7497a0ea1..a12d79916 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -701,7 +701,7 @@ png_flush (png_structp)
 static void
 png_error_fn (png_structp png_ptr, char const * message)
 {
-	reinterpret_cast<Image*>(png_get_error_ptr(png_ptr))->png_error (message);
+	throw EncodeError (String::compose("Error during PNG write: %1", message));
 }