Update to trunk

(bzr r13090.1.32)

6 files changed, 10 insertions, 9 deletions

diff --git a/src/extension/error-file.cpp b/src/extension/error-file.cpp
index 5a8bede70..f60af870f 100644
--- a/src/extension/error-file.cpp
+++ b/src/extension/error-file.cpp
@@ -39,7 +39,7 @@ namespace Extension {
     probably good to check anyway).
 */
 ErrorFileNotice::ErrorFileNotice (void) :
-    Gtk::MessageDialog::MessageDialog(
+    Gtk::MessageDialog(
             "",                    /* message */
             false,                 /* use markup */
             Gtk::MESSAGE_WARNING,  /* dialog type */
diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp
index a4d204472..eae3bfb5a 100644
--- a/src/extension/internal/emf-inout.cpp
+++ b/src/extension/internal/emf-inout.cpp
@@ -123,7 +123,7 @@ Emf::print_document_to_file(SPDocument *doc, const gchar *filename)
         throw Inkscape::Extension::Output::save_failed();
     }
     mod->base->invoke_print(&context);
-    ret = mod->finish();
+    (void) mod->finish();
     /* Release arena */
     mod->base->invoke_hide(mod->dkey);
     mod->base = NULL;
diff --git a/src/extension/internal/emf-print.cpp b/src/extension/internal/emf-print.cpp
index ed25bf767..f4f7f08cb 100644
--- a/src/extension/internal/emf-print.cpp
+++ b/src/extension/internal/emf-print.cpp
@@ -366,11 +366,13 @@ int PrintEmf::create_brush(SPStyle const *style, PU_COLORREF fcolor)
     if (!fcolor && style) {
         if (style->fill.isColor()) {
             fill_mode = DRAW_PAINT;
+#if 0
+// opacity not supported by EMF
             float opacity = SP_SCALE24_TO_FLOAT(style->fill_opacity.value);
             if (opacity <= 0.0) {
                 opacity = 0.0;    // basically the same as no fill
             }
-
+#endif
             sp_color_get_rgb_floatv(&style->fill.value.color, rgb);
             hatchColor = U_RGB(255 * rgb[0], 255 * rgb[1], 255 * rgb[2]);
 
diff --git a/src/extension/internal/text_reassemble.c b/src/extension/internal/text_reassemble.c
index e28e5effb..c62c83120 100644
--- a/src/extension/internal/text_reassemble.c
+++ b/src/extension/internal/text_reassemble.c
@@ -67,8 +67,8 @@ Optional compiler switches for development:
 
 
 File:      text_reassemble.c
-Version:   0.0.12
-Date:      07-FEB-2014
+Version:   0.0.13
+Date:      24-MAR-2014
 Author:    David Mathog, Biology Division, Caltech
 email:     mathog@caltech.edu
 Copyright: 2014 David Mathog and California Institute of Technology (Caltech)
@@ -2055,7 +2055,6 @@ void TR_layout_2_svg(TR_INFO *tri){
    }
 
 
-   tsp  = tpi->chunks;
    /* over all complex members from phase2.  Paragraphs == TR_PARA_*  */
    for(i=cxi->phase1; i<cxi->used;i++){
       csp    = &(cxi->cx[i]);
diff --git a/src/extension/internal/wmf-inout.cpp b/src/extension/internal/wmf-inout.cpp
index 9980d9d6d..ef95dbe45 100644
--- a/src/extension/internal/wmf-inout.cpp
+++ b/src/extension/internal/wmf-inout.cpp
@@ -1527,7 +1527,7 @@ int Wmf::myMetaFileProc(const char *contents, unsigned int length, PWMF_CALLBACK
                     iType = *(uint8_t *)(contents + off + offsetof(U_METARECORD, iType )  );
                     if(iType ==  U_WMR_SETWINDOWEXT){
                         OK=0;
-                        nSize = U_WMRSETWINDOWEXT_get(contents + off, &Dst);
+                        (void) U_WMRSETWINDOWEXT_get(contents + off, &Dst);
                         Placeable.Dst.right  = Dst.x;
                         Placeable.Dst.bottom = Dst.y;
                     }
diff --git a/src/extension/prefdialog.cpp b/src/extension/prefdialog.cpp
index f3c6508af..1b657f644 100644
--- a/src/extension/prefdialog.cpp
+++ b/src/extension/prefdialog.cpp
@@ -42,9 +42,9 @@ namespace Extension {
 */
 PrefDialog::PrefDialog (Glib::ustring name, gchar const * help, Gtk::Widget * controls, Effect * effect) :
 #if WITH_GTKMM_3_0
-    Gtk::Dialog::Dialog(_(name.c_str()), true),
+    Gtk::Dialog(_(name.c_str()), true),
 #else
-    Gtk::Dialog::Dialog(_(name.c_str()), true, true),
+    Gtk::Dialog(_(name.c_str()), true, true),
 #endif
     _help(help),
     _name(name),