From 4ef3b2f17120c31ac522fc2e3227e6002f48a34a Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Sat, 20 Oct 2012 22:03:01 +0000
Subject: Taking the address of a temporary object is not valid C++.

---
 cad/boolean/distinfo                                     |  4 +++-
 .../patches/patch-apps_edit_src_drivers_printer.cpp      | 14 ++++++++++++++
 .../patches/patch-apps_edit_src_gdssourc_text.cpp        | 16 ++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 cad/boolean/patches/patch-apps_edit_src_drivers_printer.cpp
 create mode 100644 cad/boolean/patches/patch-apps_edit_src_gdssourc_text.cpp

diff --git a/cad/boolean/distinfo b/cad/boolean/distinfo
index 777c8286630..d9cc1e3a601 100644
--- a/cad/boolean/distinfo
+++ b/cad/boolean/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.16 2012/01/03 01:18:46 dholland Exp $
+$NetBSD: distinfo,v 1.17 2012/10/20 22:03:01 joerg Exp $
 
 SHA1 (boolean_6_99.tgz) = 03e8dc7c9aa2886b0d5663669248c507524c5b22
 RMD160 (boolean_6_99.tgz) = 7977bb140169fa15a7dde9709ba1867e763b7b9c
 Size (boolean_6_99.tgz) = 4270460 bytes
 SHA1 (patch-aa) = 0ca93dd87f8c314d718b63a14a94cbea7739b5a3
 SHA1 (patch-ab) = 688efee8aeb2f2616a6f67a2dbfd1055d48cb9b3
+SHA1 (patch-apps_edit_src_drivers_printer.cpp) = fcbe44d1f059bb9ee2cf8301a7f02ec0686b318a
+SHA1 (patch-apps_edit_src_gdssourc_text.cpp) = da50d4d3156e807177cdc7d71c8de586dbd04f6d
 SHA1 (patch-apps_edit_src_intrface_strucdlg_cpp) = 44637ca6b71f722c55f0986ee31ee29f35fe8858
diff --git a/cad/boolean/patches/patch-apps_edit_src_drivers_printer.cpp b/cad/boolean/patches/patch-apps_edit_src_drivers_printer.cpp
new file mode 100644
index 00000000000..2c2877f22df
--- /dev/null
+++ b/cad/boolean/patches/patch-apps_edit_src_drivers_printer.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-apps_edit_src_drivers_printer.cpp,v 1.1 2012/10/20 22:03:01 joerg Exp $
+
+--- apps/edit/src/drivers/printer.cpp.orig	2012-10-20 12:02:42.000000000 +0000
++++ apps/edit/src/drivers/printer.cpp
+@@ -87,7 +87,8 @@ bool PrintDriver::OnPrintPage(int)
+       // Multiply the points with the relative matrix
+       for (int i = 0; i < 4; i++)
+       {
+-         corners[i].Transform(&GLOB->SCRDRV->GetInverseMappingMatrix());
++         wxTransformMatrix tmp(GLOB->SCRDRV->GetInverseMappingMatrix());
++         corners[i].Transform(&tmp);
+       }
+       x = (int) corners[0].GetX();
+       y = (int) corners[0].GetY();
diff --git a/cad/boolean/patches/patch-apps_edit_src_gdssourc_text.cpp b/cad/boolean/patches/patch-apps_edit_src_gdssourc_text.cpp
new file mode 100644
index 00000000000..c6efd6c7577
--- /dev/null
+++ b/cad/boolean/patches/patch-apps_edit_src_gdssourc_text.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-apps_edit_src_gdssourc_text.cpp,v 1.1 2012/10/20 22:03:01 joerg Exp $
+
+--- apps/edit/src/gdssourc/text.cpp.orig	2012-10-20 11:58:47.000000000 +0000
++++ apps/edit/src/gdssourc/text.cpp
+@@ -61,9 +61,10 @@ void Text::DoWrite(DrawDriver& dr)
+ 
+ 	dr.SetSelected(GetSelect());
+ 
++   wxTransformMatrix tmp(*dr.GetMatrix() * *GetRelativeMatrix());
+    dr.GDSDrawText(_text, min_point.GetX(), min_point.GetY(),
+ 										  max_point.GetX(), max_point.GetY(),
+-								   	  this, &(*dr.GetMatrix() * *GetRelativeMatrix()));
++								   	  this, &tmp);
+ 
+ }
+ 
-- 
cgit v1.2.3