summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-12-18 21:05:54 +0100
committerCarl Hetherington <cth@carlh.net>2021-12-23 12:59:56 +0100
commita7a78af62afa78dabc9a92f595abc89312d2559b (patch)
tree918f012d7025a9880302649480a8429c273704cb
parent7f889df4cac6c0cf08400f0212a0e74909f6c29f (diff)
Remove unnecessary method.
-rw-r--r--src/lib/image.cc9
-rw-r--r--src/lib/image.h2
-rw-r--r--test/test.cc2
3 files changed, 3 insertions, 10 deletions
diff --git a/src/lib/image.cc b/src/lib/image.cc
index a4e04bb62..9bb503acb 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -1380,16 +1380,11 @@ 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);
+ throw EncodeError (String::compose("Error during PNG write: %1", message));
}
-void
-Image::png_error (char const * message)
-{
- throw EncodeError (String::compose ("Error during PNG write: %1", message));
-}
dcp::ArrayData
Image::as_png () const
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 ae1453a9d..fba59ffeb 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -695,7 +695,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));
}