fix WMeasurePaintDevice not properly initializing underlying device

rgraebert · Sep 11, 2014 · 1646a7c · 1646a7c
1 parent 27107e8
commit 1646a7c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Wt/WDoubleValidator.C b/src/Wt/WDoubleValidator.C
@@ -146,14 +146,16 @@ std::string WDoubleValidator::javaScriptValidate() const
      << isMandatory()
      << ',';
 
-  if (bottom_ != -std::numeric_limits<double>::max())
+  if (bottom_ != -std::numeric_limits<double>::max() &&
+      bottom_ != -std::numeric_limits<double>::infinity())
     js << bottom_;
   else
     js << "null";
 
   js << ',';
 
-  if (top_ != std::numeric_limits<double>::max())
+  if (top_ != std::numeric_limits<double>::max() &&
+      top_ != std::numeric_limits<double>::infinity())
     js << top_;
   else
     js << "null";

diff --git a/src/Wt/WMeasurePaintDevice.C b/src/Wt/WMeasurePaintDevice.C
@@ -28,13 +28,15 @@ void WMeasurePaintDevice::init()
 {
   if (!device_->painter()) {
     device_->setPainter(painter_);
+    device_->init();
   } else
     device_->painter()->save();
 }
 
 void WMeasurePaintDevice::done()
 {
   if (painter_ == device_->painter()) {
+    device_->done();
     device_->setPainter(0);
   } else
     device_->painter()->restore();