revert changes not strictly required for EMF support

(bzr r11668.1.12)

5 files changed, 20 insertions, 26 deletions

diff --git a/build.xml b/build.xml
index 3775b2d62..551ce7a36 100755
--- a/build.xml
+++ b/build.xml
@@ -453,7 +453,7 @@
               stripcommand="${archutil}strip"
               objcopycommand="${archutil}objcopy">
        <flags>
-           -mconsole
+           -mwindows
            -mthreads
        </flags>
        <fileset dir="${build}">
@@ -527,7 +527,7 @@
               stripcommand="${archutil}strip"
               objcopycommand="${archutil}objcopy">
        <flags>
-           -mconsole
+           -mwindows
            -mthreads
        </flags>
        <fileset dir="${build}">
diff --git a/configure.ac b/configure.ac
index 8a669c853..6174d0f94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,6 @@ AC_INIT(inkscape, 0.48+devel)
 
 AC_CANONICAL_HOST
 AC_CONFIG_SRCDIR([src/main.cpp])
-AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([dist-zip dist-bzip2 tar-pax])
 
 AC_ARG_ENABLE([lsb], AS_HELP_STRING([--enable-lsb], [LSB-compatible build configuration]), [
@@ -70,7 +69,7 @@ if test "$GCC" = "yes"; then
   AC_MSG_CHECKING([compiler support for -Werror=format-security])
   ink_svd_CPPFLAGS="$CPPFLAGS"
   CPPFLAGS="-Werror=format-security $CPPFLAGS"
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [ink_opt_ok=yes], [ink_opt_ok=no])
+  AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]), [ink_opt_ok=yes], [ink_opt_ok=no])
   AC_MSG_RESULT([$ink_opt_ok])
   if test "x$ink_opt_ok" != "xyes"; then
     CPPFLAGS="$ink_svd_CPPFLAGS"
@@ -84,7 +83,7 @@ if test "$GCC" = "yes"; then
   AC_MSG_CHECKING([compiler support for -Wno-pointer-sign])
   ink_svd_CFLAGS="$CFLAGS"
   CFLAGS="-Wno-pointer-sign $CFLAGS"
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [ink_opt_ok=yes], [ink_opt_ok=no])
+  AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]), [ink_opt_ok=yes], [ink_opt_ok=no])
   AC_MSG_RESULT([$ink_opt_ok])
   if test "x$ink_opt_ok" != "xyes"; then
     CFLAGS="$ink_svd_CFLAGS"
@@ -97,7 +96,7 @@ if test "$GCC" = "yes"; then
   AC_MSG_CHECKING([linker tolerates -z relro])
   ink_svd_LDFLAGS="$LDFLAGS"
   LDFLAGS="-Wl,-z,relro $LDFLAGS"
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([])], [ink_opt_ok=yes], [ink_opt_ok=no])
+  AC_LINK_IFELSE(AC_LANG_PROGRAM([]), [ink_opt_ok=yes], [ink_opt_ok=no])
   AC_MSG_RESULT([$ink_opt_ok])
   if test "x$ink_opt_ok" != "xyes"; then
     LDFLAGS="$ink_svd_LDFLAGS"
@@ -138,14 +137,14 @@ fi
 
 # Detect a working version of unordered containers.
 AC_MSG_CHECKING([TR1 unordered_set usability])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+AC_COMPILE_IFELSE([
 #include <tr1/unordered_set>
 int main() {
   std::tr1::unordered_set<int> i, j;
   i = j;
   return 0;
 }
-])], [unordered_set_works=yes], [unordered_set_works=no])
+], [unordered_set_works=yes], [unordered_set_works=no])
 if test "x$unordered_set_works" = "xyes"; then
 	AC_MSG_RESULT([ok])
 	AC_DEFINE(HAVE_TR1_UNORDERED_SET, 1, [Has working standard TR1 unordered_set])
@@ -162,13 +161,13 @@ AC_MSG_CHECKING([for overzealous strict aliasing warnings])
 ignore_strict_aliasing=no
 CXXFLAGS_SAVE=$CXXFLAGS
 CXXFLAGS="$CXXFLAGS -Werror=strict-aliasing"
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+AC_COMPILE_IFELSE([
 #include <boost/optional.hpp>
 boost::optional<int> x;
 int func() {
   return *x;
 }
-])], [ignore_strict_aliasing=no], [ignore_strict_aliasing=yes])
+], [ignore_strict_aliasing=no], [ignore_strict_aliasing=yes])
 AC_MSG_RESULT($ignore_strict_aliasing)
 CXXFLAGS=$CXXFLAGS_SAVE
 if test "x$ignore_strict_aliasing" = "xyes"; then
@@ -610,7 +609,7 @@ LIBS="$LIBS $POPPLER_LIBS"
 
 AC_MSG_CHECKING(for new color space API in Poppler)
 popplercolor="no"
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+AC_COMPILE_IFELSE([
 #include <GfxState.h>
 
 int main() {
@@ -619,7 +618,7 @@ int main() {
   p = &GfxColorSpace::parse;
   return 0;
 }
-])], [popplercolor=yes])
+], [popplercolor=yes])
 if test "x$popplercolor" = "xyes"; then
 	AC_DEFINE(POPPLER_NEW_COLOR_SPACE_API, 1, [Use color space API from Poppler >= 0.12.2])
 	AC_MSG_RESULT(yes)
@@ -630,7 +629,7 @@ fi
 # Poppler's b604a008 commit changes this
 AC_MSG_CHECKING([whether Poppler's GfxPatch no longer uses GfxColor])
 popplergfxcolor="no"
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+AC_COMPILE_IFELSE([
 #include <GfxState.h>
 
 int main() {
@@ -639,7 +638,7 @@ int main() {
   patch.color[[0]][[0]] = color;
   return 0;
 }
-])], [popplergfxcolor=yes])
+], [popplergfxcolor=yes])
 if test "x$popplergfxcolor" = "xyes"; then
 	AC_DEFINE(POPPLER_NEW_GFXPATCH, 1, [GfxPatch no longer uses GfxColor in >= 0.15.1])
 	AC_MSG_RESULT(yes)
@@ -865,10 +864,10 @@ fi
 # Check for Apple Mac OS X Carbon framework
 carbon_ok=no
 AC_MSG_CHECKING([for Mac OS X Carbon support])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+AC_COMPILE_IFELSE([
 #include <Carbon/Carbon.h>
 #include <CoreServices/CoreServices.h>
-])], [carbon_ok=yes])
+], [carbon_ok=yes])
 AC_MSG_RESULT($carbon_ok)
 if test "x$carbon_ok" = "xyes"; then
   AC_DEFINE(HAVE_CARBON, 1, [define to 1 if Carbon is available])
@@ -1035,8 +1034,8 @@ if test "$GXX" = "yes"; then
   ink_svd_CXXFLAGS="$CXXFLAGS"
   CXXFLAGS="-Wno-unused-parameter $CXXFLAGS"
   # -Wno-unused-parameter isn't accepted by gcc 2.95.
-  AC_COMPILE_IFELSE([AC_LANG_SOURCE([int dummy;
-])], , CXXFLAGS="-Wno-unused $ink_svd_CXXFLAGS",)
+  AC_COMPILE_IFELSE([int dummy;
+], , CXXFLAGS="-Wno-unused $ink_svd_CXXFLAGS",)
   # Note: At least one bug has been caught from unused parameter warnings,
   # so it might be worth trying not to disable it.
   # One way of selectively disabling the warnings (i.e. only where the
diff --git a/src/sp-image.cpp b/src/sp-image.cpp
index 39e37ebc8..07885ff4d 100644
--- a/src/sp-image.cpp
+++ b/src/sp-image.cpp
@@ -1119,7 +1119,6 @@ static void sp_image_print( SPItem *item, SPPrintContext *ctx )
             t = ti * t;
             sp_print_image_R8G8B8A8_N(ctx, px + trimx*pixskip + trimy*rs, trimwidth, trimheight, rs, t, item->style);
         }
-        free(px);  // else big memory leak on each image print!
     }
 }
 
diff --git a/src/style.cpp b/src/style.cpp
index ab8b646aa..616474298 100644
--- a/src/style.cpp
+++ b/src/style.cpp
@@ -1236,9 +1236,7 @@ sp_style_merge_property(SPStyle *style, gint id, gchar const *val)
         case SP_PROP_COLOR_INTERPOLATION_FILTERS:
             // We read it but issue warning
             SPS_READ_IENUM_IF_UNSET(&style->color_interpolation_filters, val, enum_color_interpolation, true);
-            static bool blab=true; // eliminate annoying repeated messages to console
-            if( blab && style->color_interpolation_filters.value != SP_CSS_COLOR_INTERPOLATION_SRGB ) {
-                blab = false;
+            if( style->color_interpolation_filters.value != SP_CSS_COLOR_INTERPOLATION_SRGB ) {
                 g_warning("Inkscape currently only supports color-interpolation-filters = sRGB");
             }
             break;
diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp
index 8a5a79ec3..35eb23f42 100644
--- a/src/ui/tool/path-manipulator.cpp
+++ b/src/ui/tool/path-manipulator.cpp
@@ -949,12 +949,10 @@ void PathManipulator::hideDragPoint()
  * at the given time value */
 NodeList::iterator PathManipulator::subdivideSegment(NodeList::iterator first, double t)
 {
-    //throw originally used std::invalid_argument, that caused a link error against static libstdc++,
-    //this form was only used here.
-    if (!first) throw "Subdivide after invalid iterator";
+    if (!first) throw std::invalid_argument("Subdivide after invalid iterator");
     NodeList &list = NodeList::get(first);
     NodeList::iterator second = first.next();
-    if (!second) throw "Subdivide after last node in open path";
+    if (!second) throw std::invalid_argument("Subdivide after last node in open path");
 
     // We need to insert the segment after 'first'. We can't simply use 'second'
     // as the point of insertion, because when 'first' is the last node of closed path,