Start proyect, Merge from Trunk

(bzr r11950.1.27)

8 files changed, 10 insertions, 13 deletions

diff --git a/src/extension/dependency.cpp b/src/extension/dependency.cpp
index f53dc93b4..7c358d871 100644
--- a/src/extension/dependency.cpp
+++ b/src/extension/dependency.cpp
@@ -13,6 +13,8 @@
 #endif
 
 #include <glibmm/i18n.h>
+#include <glibmm/fileutils.h>
+#include <glibmm/miscutils.h>
 #include "config.h"
 #include "path-prefix.h"
 #include "dependency.h"
diff --git a/src/extension/extension.h b/src/extension/extension.h
index e0b643b6d..78999631a 100644
--- a/src/extension/extension.h
+++ b/src/extension/extension.h
@@ -19,6 +19,7 @@
 #include <vector>
 #include <glibmm/ustring.h>
 #include "xml/repr.h"
+#include <sigc++/signal.h>
 
 namespace Gtk {
 	class Table;
diff --git a/src/extension/internal/filter/bumps.h b/src/extension/internal/filter/bumps.h
index 8db6c67d2..f0c4c16aa 100644
--- a/src/extension/internal/filter/bumps.h
+++ b/src/extension/internal/filter/bumps.h
@@ -167,9 +167,6 @@ Bump::get_filter_text (Inkscape::Extension::Extension * ext)
     std::ostringstream lightOptions;
     std::ostringstream lightEnd;
     
-    std::ostringstream lightRed;
-    std::ostringstream lightGreen;
-    std::ostringstream lightBlue;
     std::ostringstream floodRed;
     std::ostringstream floodGreen;
     std::ostringstream floodBlue;
diff --git a/src/extension/internal/filter/filter-file.cpp b/src/extension/internal/filter/filter-file.cpp
index d129f590c..d569c6438 100644
--- a/src/extension/internal/filter/filter-file.cpp
+++ b/src/extension/internal/filter/filter-file.cpp
@@ -20,6 +20,7 @@
 
 /* System includes */
 #include <glibmm/i18n.h>
+#include <glibmm/fileutils.h>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/image-resolution.cpp b/src/extension/internal/image-resolution.cpp
index a17a2bb30..3b3b85d06 100644
--- a/src/extension/internal/image-resolution.cpp
+++ b/src/extension/internal/image-resolution.cpp
@@ -286,13 +286,10 @@ void ImageResolution::readjfif(char const *fn) {
     struct jpeg_decompress_struct cinfo;
     jmp_buf jbuf;
     struct jpeg_error_mgr jerr;
-    bool constr = false;
 
     if (setjmp(jbuf)) {
         fclose(ifd);
-        if (constr) {
-            jpeg_destroy_decompress(&cinfo);
-        }
+        jpeg_destroy_decompress(&cinfo);
         return;
     }
     
@@ -305,8 +302,6 @@ void ImageResolution::readjfif(char const *fn) {
     jerr.reset_error_mgr = &irjfif_reset;
     cinfo.client_data = (void*)&jbuf;
 
-    constr = true;
-
     jpeg_stdio_src(&cinfo, ifd);
     jpeg_read_header(&cinfo, TRUE);
     
@@ -321,7 +316,6 @@ void ImageResolution::readjfif(char const *fn) {
             ok_ = true;
         }
     }
-    constr = false;
     jpeg_destroy_decompress(&cinfo);
     fclose(ifd);
 }
diff --git a/src/extension/internal/javafx-out.cpp b/src/extension/internal/javafx-out.cpp
index 67c0fae66..035a6f0aa 100644
--- a/src/extension/internal/javafx-out.cpp
+++ b/src/extension/internal/javafx-out.cpp
@@ -20,6 +20,8 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include <glibmm/miscutils.h>
 #include "javafx-out.h"
 #include <inkscape.h>
 #include <inkscape-version.h>
diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
index f0de3b709..75849f6cc 100644
--- a/src/extension/internal/pdfinput/svg-builder.cpp
+++ b/src/extension/internal/pdfinput/svg-builder.cpp
@@ -629,7 +629,6 @@ gchar *SvgBuilder::_createPattern(GfxPattern *pattern, GfxState *state, bool is_
         if ( pattern->getType() == 2 ) {  // Shading pattern
             GfxShadingPattern *shading_pattern = static_cast<GfxShadingPattern *>(pattern);
             double *ptm;
-            double ittm[6];	// invert ttm
             double m[6] = {1, 0, 0, 1, 0, 0};
             double det;
 
@@ -638,6 +637,7 @@ gchar *SvgBuilder::_createPattern(GfxPattern *pattern, GfxState *state, bool is_
             ptm = shading_pattern->getMatrix();
             det = ttm[0] * ttm[3] - ttm[1] * ttm[2];
             if (det) {
+                double ittm[6];	// invert ttm
                 ittm[0] =  ttm[3] / det;
                 ittm[1] = -ttm[1] / det;
                 ittm[2] = -ttm[2] / det;
@@ -1208,7 +1208,7 @@ void SvgBuilder::updateTextMatrix(GfxState *state) {
  */
 void SvgBuilder::_flushText() {
     // Ignore empty strings
-    if ( _glyphs.size() < 1 ) {
+    if ( _glyphs.empty()) {
         _glyphs.clear();
         return;
     }
diff --git a/src/extension/timer.cpp b/src/extension/timer.cpp
index 3941ddcfc..e4e8632d2 100644
--- a/src/extension/timer.cpp
+++ b/src/extension/timer.cpp
@@ -10,7 +10,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-
+#include <glibmm/main.h>
 
 #include "extension.h"
 #include "timer.h"