Remove unnecessary method.

diff --git a/src/lib/image.cc b/src/lib/image.cc
index 4f5b11c90ba63c93dd7e8f842a6c1992f41a000b..861367637f218295883c6a4552a242198ce54c5e 100644 (file)
--- 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 128b546b5cc7ac2a511e592fe98ae388d36556dd..328252e684c79ba609741ad0bb8d13691203b775 100644 (file)
--- 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 7497a0ea12f47727838d2ef895da42301c1eec53..a12d79916463f7eb23589ef2e76b472d2e4a537f 100644 (file)
--- 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));
 }