From 3ed151bf90abe8bf2ba94307ae45e5d7cf1630aa Mon Sep 17 00:00:00 2001
From: robnee <robert.nee@gmail.com>
Date: Sat, 3 Apr 2021 15:11:10 -0400
Subject: [PATCH] Skip image rendering in CLI rather than hard abort

---
 src/render/render2d.cpp       |   4 ++--
 test/request/image/linked.png | Bin 0 -> 4309 bytes
 test/request/image/normal.png | Bin 0 -> 4292 bytes
 test/request/image/test.cpp   |   5 ++---
 4 files changed, 4 insertions(+), 5 deletions(-)
 create mode 100644 test/request/image/linked.png
 create mode 100644 test/request/image/normal.png

diff --git a/src/render/render2d.cpp b/src/render/render2d.cpp
index 710e795d..fd948e80 100644
--- a/src/render/render2d.cpp
+++ b/src/render/render2d.cpp
@@ -190,11 +190,11 @@ void SurfaceRenderer::DrawFaces(const SMesh &m, const std::vector<uint32_t> &fac
 void SurfaceRenderer::DrawPixmap(std::shared_ptr<const Pixmap> pm,
                     const Vector &o, const Vector &u, const Vector &v,
                     const Point2d &ta, const Point2d &tb, hFill hcf) {
-    ssassert(false, "Not implemented");
+    dbp("Not implemented");
 }
 
 void SurfaceRenderer::InvalidatePixmap(std::shared_ptr<const Pixmap> pm) {
-    ssassert(false, "Not implemented");
+    dbp("Not implemented");
 }
 
 //-----------------------------------------------------------------------------
diff --git a/test/request/image/linked.png b/test/request/image/linked.png
new file mode 100644
index 0000000000000000000000000000000000000000..8667e34140ad2c7704ef6f2ca9b11630c3c03765
GIT binary patch
literal 4309
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

literal 0
HcmV?d00001

diff --git a/test/request/image/normal.png b/test/request/image/normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..a44f72d7da75e0aa129b23545314d951a5104bdf
GIT binary patch
literal 4292
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

literal 0
HcmV?d00001

diff --git a/test/request/image/test.cpp b/test/request/image/test.cpp
index da0954e0..a9507bee 100644
--- a/test/request/image/test.cpp
+++ b/test/request/image/test.cpp
@@ -2,13 +2,12 @@
 
 TEST_CASE(normal_roundtrip) {
     CHECK_LOAD("normal.slvs");
-    // Can't render images through cairo for now.
-    // CHECK_RENDER("normal.png");
+    CHECK_RENDER("normal.png");
     CHECK_SAVE("normal.slvs");
 }
 
 TEST_CASE(linked_roundtrip) {
     CHECK_LOAD("linked.slvs");
-    // CHECK_RENDER("linked.png");
+    CHECK_RENDER("linked.png");
     CHECK_SAVE("linked.slvs");
 }