svg-flatten: Fix document scale with newer USVGmain

2 files changed, 6 insertions, 1 deletions

diff --git a/svg-flatten/src/svg_doc.cpp b/svg-flatten/src/svg_doc.cpp
index 935ae2e..a6d0430 100644
--- a/svg-flatten/src/svg_doc.cpp
+++ b/svg-flatten/src/svg_doc.cpp
@@ -60,7 +60,7 @@ bool gerbolyze::SVGDocument::load(istream &in, double scale) {
     /* Set up the document's viewport transform */
     istringstream vb_stream(root_elem.attribute("viewBox").value());
     vb_stream >> vb_x >> vb_y >> vb_w >> vb_h;
-    if (vb_stream.eof() || vb_stream.fail()) {
+    if (vb_stream.fail()) {
         if (root_elem.attribute("viewBox")) { /* A document with just width/height and no viewBox is okay. */
             cerr << "Warning: Invalid viewBox, defaulting to width/height values" << endl;
         }
diff --git a/svg-flatten/src/util.cpp b/svg-flatten/src/util.cpp
index c242e1b..901a98a 100644
--- a/svg-flatten/src/util.cpp
+++ b/svg-flatten/src/util.cpp
@@ -94,6 +94,11 @@ int gerbolyze::run_cargo_command(const char *cmd_name, std::vector<std::string>
 
     if (proc_rc) {
         std::cerr << cmd_name << " returned an error code: " << proc_rc << std::endl;
+        std::cerr << "Command line:";
+        for (auto elem:cmdline) {
+            std::cerr << " " << elem;
+        }
+        std::cerr << std::endl;
         return EXIT_FAILURE;
     }