From e8377a78c88424dd76f8fc47c61f436efd5470e7 Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Mon, 11 Feb 2013 18:57:49 +0100
Subject: cppcheck

(bzr r12117)
---
 src/dom/xpathparser.cpp                         |  2 +-
 src/dom/xpathtoken.cpp                          | 20 +++++++-------------
 src/dom/xpathtoken.h                            |  6 +-----
 src/extension/internal/filter/bumps.h           |  3 ---
 src/extension/internal/image-resolution.cpp     |  8 +-------
 src/extension/internal/pdfinput/svg-builder.cpp |  4 ++--
 6 files changed, 12 insertions(+), 31 deletions(-)

(limited to 'src')

diff --git a/src/dom/xpathparser.cpp b/src/dom/xpathparser.cpp
index 393c12cda..b19975966 100644
--- a/src/dom/xpathparser.cpp
+++ b/src/dom/xpathparser.cpp
@@ -131,7 +131,7 @@ void XPathParser::lexicalTokenDump()
     printf("####### LEXICAL TOKENS #######\n");
     for (unsigned int i=0 ; i<lexicalTokens.size() ; i++)
         {
-        printf("%d : ", i);
+        printf("%u : ", i);
         lexicalTokens[i].print();
         }
     printf("##### END LEXICAL TOKENS #####\n\n");
diff --git a/src/dom/xpathtoken.cpp b/src/dom/xpathtoken.cpp
index 79948e55e..216c7a069 100644
--- a/src/dom/xpathtoken.cpp
+++ b/src/dom/xpathtoken.cpp
@@ -937,19 +937,21 @@ Token Token::create(int type, long ival,
 /**
  *
  */
-TokenExecutor::TokenExecutor()
+TokenExecutor::TokenExecutor() :
+    tokenList (),
+    nodeList ()
 {
-    reset();
 }
 
 
 /**
  *
  */
-TokenExecutor::TokenExecutor(const TokenExecutor &other)
+TokenExecutor::TokenExecutor(const TokenExecutor &other) :
+    tokenList (other.tokenList),
+    nodeList ()
 {
-    reset();
-    assign(other);
+    // assign(other);
 }
 
 
@@ -970,14 +972,6 @@ void TokenExecutor::assign(const TokenExecutor &other)
 }
 
 
-/**
- *
- */
-void TokenExecutor::reset()
-{
-}
-
-
 
 
 /**
diff --git a/src/dom/xpathtoken.h b/src/dom/xpathtoken.h
index 5bb87917b..cfd54298e 100644
--- a/src/dom/xpathtoken.h
+++ b/src/dom/xpathtoken.h
@@ -457,7 +457,7 @@ public:
      */
     StackItem pop()
         {
-        if (stackItems.size() < 1)
+        if (stackItems.empty())
             {
             //TODO: error here
             StackItem item;
@@ -619,10 +619,6 @@ public:
      */
     virtual void assign(const TokenExecutor &other);
 
-    /**
-     * Reset the stack to its original settings
-     */
-    virtual void reset();
 
     /**
      * Execute a list upon a given node.  For each Axis encountered,
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/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/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;
     }
-- 
cgit v1.2.3