adapt to changes in r12471 (unit refactoring)

(bzr r11668.1.76)

4 files changed, 14 insertions, 18 deletions

diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp
index 7dc0ee314..9dba3b77c 100644
--- a/src/extension/internal/emf-inout.cpp
+++ b/src/extension/internal/emf-inout.cpp
@@ -42,11 +42,10 @@
 #include "extension/output.h"
 #include "display/drawing.h"
 #include "display/drawing-item.h"
-#include "unit-constants.h"
 #include "clear-n_.h"
 #include "document.h"
 #include "libunicode-convert/unicode-convert.h"
-
+#include "util/units.h"
 
 #include "emf-print.h"
 #include "emf-inout.h"
@@ -1784,7 +1783,7 @@ std::cout << "BEFORE DRAW"
             */
             if ((pEmr->szlMillimeters.cx + pEmr->szlMillimeters.cy) && ( pEmr->szlDevice.cx + pEmr->szlDevice.cy)){
                 d->E2IdirY = 1.0;  // assume MM_TEXT, if not, this will be changed later
-                d->D2PscaleX = d->D2PscaleY = PX_PER_MM *
+                d->D2PscaleX = d->D2PscaleY = Inkscape::Util::Quantity::convert(1, "mm", "px") *
                     (double)(pEmr->szlMillimeters.cx + pEmr->szlMillimeters.cy)/
                     (double)( pEmr->szlDevice.cx + pEmr->szlDevice.cy);
             }
@@ -1804,8 +1803,8 @@ std::cout << "BEFORE DRAW"
             d->MMX = d->MM100InX / 100.0;
             d->MMY = d->MM100InY / 100.0;
 
-            d->PixelsOutX = d->MMX * PX_PER_MM;
-            d->PixelsOutY = d->MMY * PX_PER_MM;
+            d->PixelsOutX = d->MMX * Inkscape::Util::Quantity::convert(1, "mm", "px");
+            d->PixelsOutY = d->MMY * Inkscape::Util::Quantity::convert(1, "mm", "px");
 
             // Upper left corner, from header rclBounds, in device units, usually both 0, but not always
             d->ulCornerInX = pEmr->rclBounds.left;
diff --git a/src/extension/internal/emf-print.cpp b/src/extension/internal/emf-print.cpp
index 7440b5380..33834bea8 100644
--- a/src/extension/internal/emf-print.cpp
+++ b/src/extension/internal/emf-print.cpp
@@ -40,14 +40,12 @@
 #include "helper/geom.h"
 #include "helper/geom-curves.h"
 #include "sp-item.h"
+#include "util/units.h"
 
 #include "style.h"
 #include "inkscape-version.h"
 #include "sp-root.h"
 
-
-#include "unit-constants.h"
-
 #include "extension/system.h"
 #include "extension/print.h"
 #include "document.h"
@@ -342,7 +340,7 @@ unsigned int PrintEmf::begin (Inkscape::Extension::Print *mod, SPDocument *doc)
         if (bbox) d = *bbox;
     }
 
-    d *= Geom::Scale(IN_PER_PX);
+    d *= Geom::Scale(Inkscape::Util::Quantity::convert(1, "px", "in"));
 
     float dwInchesX = d.width();
     float dwInchesY = d.height();
@@ -410,7 +408,7 @@ unsigned int PrintEmf::begin (Inkscape::Extension::Print *mod, SPDocument *doc)
             g_error("Fatal programming error in PrintEmf::begin at textcomment_set 1");
         }
 
-        snprintf(buff, sizeof(buff)-1, "Drawing=%.1lfx%.1lfpx, %.1lfx%.1lfmm", _width, _height, dwInchesX * MM_PER_IN, dwInchesY * MM_PER_IN);
+        snprintf(buff, sizeof(buff)-1, "Drawing=%.1lfx%.1lfpx, %.1lfx%.1lfmm", _width, _height, dwInchesX * Inkscape::Util::Quantity::convert(1, "in", "mm"), dwInchesY * Inkscape::Util::Quantity::convert(1, "in", "mm"));
         rec = textcomment_set(buff);
         if(!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)){
             g_error("Fatal programming error in PrintEmf::begin at textcomment_set 1");
@@ -1715,7 +1713,7 @@ unsigned int PrintEmf::image(
     unsigned int w,      /** width of bitmap */
     unsigned int h,      /** height of bitmap */
     unsigned int rs,     /** row stride (normally w*4) */
-    Geom::Affine const &tf_ignore,  /** WRONG affine transform, use the one from m_tr_stack */
+    Geom::Affine const &/*tf_ignore*/,  /** WRONG affine transform, use the one from m_tr_stack */
     SPStyle const *style)  /** provides indirect link to image object */
 {
     double x1,y1,dw,dh;
diff --git a/src/extension/internal/wmf-inout.cpp b/src/extension/internal/wmf-inout.cpp
index 4c69c76a0..7147b3433 100644
--- a/src/extension/internal/wmf-inout.cpp
+++ b/src/extension/internal/wmf-inout.cpp
@@ -42,7 +42,7 @@
 #include "extension/output.h"
 #include "display/drawing.h"
 #include "display/drawing-item.h"
-#include "unit-constants.h"
+#include "util/units.h"
 #include "clear-n_.h"
 #include "document.h"
 #include "libunicode-convert/unicode-convert.h"
@@ -1720,7 +1720,7 @@ int Wmf::myMetaFileProc(const char *contents, unsigned int length, PWMF_CALLBACK
         d->ulCornerInY  = Placeable.Dst.top;
 
         d->E2IdirY = 1.0;  // assume MM_ANISOTROPIC, if not, this will be changed later
-        d->D2PscaleX = d->D2PscaleY = PX_PER_IN/(double) Placeable.Inch;
+        d->D2PscaleX = d->D2PscaleY = Inkscape::Util::Quantity::convert(1, "in", "px")/(double) Placeable.Inch;
         trinfo_load_qe(d->tri, d->D2PscaleX);  /* quantization error that will affect text positions */
 
         // drawing size in Inkscape pixels
@@ -1745,8 +1745,8 @@ int Wmf::myMetaFileProc(const char *contents, unsigned int length, PWMF_CALLBACK
         tmp_outdef << "  version=\"1.0\"\n";
 
         tmp_outdef <<
-            "  width=\"" << d->PixelsOutX/ PX_PER_MM << "mm\"\n" <<
-            "  height=\"" << d->PixelsOutY/ PX_PER_MM  << "mm\">\n";
+            "  width=\"" << d->PixelsOutX/ Inkscape::Util::Quantity::convert(1, "mm", "px") << "mm\"\n" <<
+            "  height=\"" << d->PixelsOutY/ Inkscape::Util::Quantity::convert(1, "mm", "px")  << "mm\">\n";
         *(d->outdef) += tmp_outdef.str().c_str();
         *(d->outdef) += "<defs>";                           // temporary end of header
 
diff --git a/src/extension/internal/wmf-print.cpp b/src/extension/internal/wmf-print.cpp
index e91a74b20..b7ab49b57 100644
--- a/src/extension/internal/wmf-print.cpp
+++ b/src/extension/internal/wmf-print.cpp
@@ -45,8 +45,7 @@
 #include "inkscape-version.h"
 #include "sp-root.h"
 
-
-#include "unit-constants.h"
+#include "util/units.h"
 
 #include "extension/system.h"
 #include "extension/print.h"
@@ -336,7 +335,7 @@ unsigned int PrintWmf::begin (Inkscape::Extension::Print *mod, SPDocument *doc)
         if (bbox) d = *bbox;
     }
 
-    d *= Geom::Scale(IN_PER_PX);  // 90 dpi inside inkscape, wmf file will be 1200 dpi
+    d *= Geom::Scale(Inkscape::Util::Quantity::convert(1, "px", "in"));  // 90 dpi inside inkscape, wmf file will be 1200 dpi
 
     /* -1/1200 in next two lines so that WMF read in will write out again at exactly the same size */
     float dwInchesX = d.width()  - 1.0/1200.0;