merge from trunk (r12240)

(bzr r11668.1.64)

5 files changed, 10 insertions, 10 deletions

diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index 8a39f4ea9..983c9dfb5 100644
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -319,8 +319,8 @@ CairoPsOutput::init (void)
             "<param name=\"blurToBitmap\" gui-text=\"" N_("Rasterize filter effects") "\" type=\"boolean\">true</param>\n"
             "<param name=\"resolution\" gui-text=\"" N_("Resolution for rasterization (dpi):") "\" type=\"int\" min=\"1\" max=\"10000\">90</param>\n"
             "<param name=\"area\" gui-text=\"" N_("Output page size") "\" type=\"optiongroup\" >\n"
-                "<option value=\"page\">" N_("Use document's page size") "</option>"
-                "<option value=\"drawing\">" N_("Use exported object's size") "</option>"
+                "<_option value=\"page\">" N_("Use document's page size") "</_option>"
+                "<_option value=\"drawing\">" N_("Use exported object's size") "</_option>"
             "</param>"
             "<param name=\"exportId\" gui-text=\"" N_("Limit export to the object with ID:") "\" type=\"string\"></param>\n"
             "<output>\n"
@@ -359,8 +359,8 @@ CairoEpsOutput::init (void)
             "<param name=\"blurToBitmap\" gui-text=\"" N_("Rasterize filter effects") "\" type=\"boolean\">true</param>\n"
             "<param name=\"resolution\" gui-text=\"" N_("Resolution for rasterization (dpi):") "\" type=\"int\" min=\"1\" max=\"10000\">90</param>\n"
             "<param name=\"area\" gui-text=\"" N_("Output page size") "\" type=\"optiongroup\" >\n"
-                "<option value=\"page\">" N_("Use document's page size") "</option>"
-                "<option value=\"drawing\">" N_("Use exported object's size") "</option>"
+                "<_option value=\"page\">" N_("Use document's page size") "</_option>"
+                "<_option value=\"drawing\">" N_("Use exported object's size") "</_option>"
             "</param>"
             "<param name=\"exportId\" gui-text=\"" N_("Limit export to the object with ID:") "\" type=\"string\"></param>\n"
             "<output>\n"
diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp
index b6a58c526..cf6730650 100644
--- a/src/extension/internal/cairo-render-context.cpp
+++ b/src/extension/internal/cairo-render-context.cpp
@@ -708,7 +708,7 @@ CairoRenderContext::popLayer(void)
             for (int row = 0 ; row < height; row++) {
                 unsigned char *row_data = pixels + (row * stride);
                 for (int i = 0 ; i < width; i++) {
-                    guint32 *pixel = (guint32 *)row_data + i;
+                    guint32 *pixel = reinterpret_cast<guint32 *>(row_data) + i;
                     float lum_alpha = (((*pixel & 0x00ff0000) >> 16) * coeff_r +
                                        ((*pixel & 0x0000ff00) >>  8) * coeff_g +
                                        ((*pixel & 0x000000ff)      ) * coeff_b );
diff --git a/src/extension/internal/cairo-renderer-pdf-out.cpp b/src/extension/internal/cairo-renderer-pdf-out.cpp
index 773109c77..63e46ad17 100644
--- a/src/extension/internal/cairo-renderer-pdf-out.cpp
+++ b/src/extension/internal/cairo-renderer-pdf-out.cpp
@@ -252,8 +252,8 @@ CairoRendererPdfOutput::init (void)
             "<param name=\"blurToBitmap\" gui-text=\"" N_("Rasterize filter effects") "\" type=\"boolean\">true</param>\n"
             "<param name=\"resolution\" gui-text=\"" N_("Resolution for rasterization (dpi):") "\" type=\"int\" min=\"1\" max=\"10000\">90</param>\n"
             "<param name=\"area\" gui-text=\"" N_("Output page size") "\" type=\"optiongroup\" >\n"
-                "<option value=\"page\">" N_("Use document's page size") "</option>"
-                "<option value=\"drawing\">" N_("Use exported object's size") "</option>"
+                "<_option value=\"page\">" N_("Use document's page size") "</_option>"
+                "<_option value=\"drawing\">" N_("Use exported object's size") "</_option>"
             "</param>"
             "<param name=\"bleed\" gui-text=\"" N_("Bleed/margin (mm)") "\" type=\"float\" min=\"-10000\" max=\"10000\">0</param>\n"
             "<param name=\"exportId\" gui-text=\"" N_("Limit export to the object with ID:") "\" type=\"string\"></param>\n"
diff --git a/src/extension/internal/filter/filter.cpp b/src/extension/internal/filter/filter.cpp
index 9f7a45f7f..a2c565699 100644
--- a/src/extension/internal/filter/filter.cpp
+++ b/src/extension/internal/filter/filter.cpp
@@ -144,11 +144,11 @@ void Filter::effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::Vie
 		if (filter == NULL) {
 
 			Inkscape::XML::Node * newfilterroot = xmldoc->createElement("svg:filter");
+			merge_filters(newfilterroot, filterdoc->root(), xmldoc);
 			defsrepr->appendChild(newfilterroot);
 
 			Glib::ustring url = "url(#"; url += newfilterroot->attribute("id"); url += ")";
 
-			merge_filters(newfilterroot, filterdoc->root(), xmldoc);
 
       Inkscape::GC::release(newfilterroot);
 
diff --git a/src/extension/internal/image-resolution.cpp b/src/extension/internal/image-resolution.cpp
index 3b3b85d06..51a3fe9c1 100644
--- a/src/extension/internal/image-resolution.cpp
+++ b/src/extension/internal/image-resolution.cpp
@@ -159,10 +159,10 @@ static double exifDouble(ExifEntry *entry, ExifByteOrder byte_order) {
             return double(r.numerator) / double(r.denominator);
         }
         case EXIF_FORMAT_FLOAT: {
-            return double(((float *)entry->data)[0]);
+            return double((reinterpret_cast<float *>(entry->data))[0]);
         }
         case EXIF_FORMAT_DOUBLE: {
-            return ((double *)entry->data)[0];
+            return (reinterpret_cast<double *>(entry->data))[0];
         }
         default: {
             return nan(0);