Better error messages from instantiating and running of commands

[paperjam.git] / pdf-tools.cc

diff --git a/pdf-tools.cc b/pdf-tools.cc
index 973ba9a5199d4da64e21a93ed9c995bcd4054673..809238c3b662e6138f55eecd2f968584c61e89c5 100644 (file)
--- a/pdf-tools.cc
+++ b/pdf-tools.cc
@@ -84,6 +84,13 @@ void BBox::transform(pdf_matrix &m)
                swap(y_min, y_max);
 }
 
+BBox BBox::transformed(pdf_matrix &m)
+{
+       BBox b = *this;
+       b.transform(m);
+       return b;
+}
+
 void BBox::join(BBox &with)
 {
        x_min = min(x_min, with.x_min);
@@ -92,6 +99,21 @@ void BBox::join(BBox &with)
        y_max = max(y_max, with.y_max);
 }
 
+void BBox::enlarge(double by)
+{
+       x_min -= by;
+       x_max += by;
+       y_min -= by;
+       y_max += by;
+}
+
+BBox BBox::enlarged(double by)
+{
+       BBox b = *this;
+       b.enlarge(by);
+       return b;
+}
+
 /*** Unicode strings ***/
 
 // Construct PDF representation of a UTF-8 string
@@ -198,7 +220,12 @@ QPDFObjectHandle page_to_xobject(QPDF *out, QPDFObjectHandle page)
 
 string pdf_coord(double x, uint digits)
 {
-  char buf[16];
-  snprintf(buf, sizeof(buf), "%.*f", digits, x);
-  return buf;
+       char buf[16];
+       snprintf(buf, sizeof(buf), "%.*f", digits, x);
+       int n = strlen(buf);
+       while (n > 0 && buf[n-1] == '0')
+               buf[--n] = 0;
+       if (n > 0 && buf[n-1] == '.')
+               buf[--n] = 0;
+       return buf;
 }