From f6c82a02188953dcb6d2119123ffc0aaa8d35010 Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Sat, 16 Mar 2013 20:42:47 +0100
Subject: cppcheck

(bzr r12217)
---
 src/trace/siox.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/trace/siox.cpp')

diff --git a/src/trace/siox.cpp b/src/trace/siox.cpp
index 9376fad66..1a1426b83 100644
--- a/src/trace/siox.cpp
+++ b/src/trace/siox.cpp
@@ -591,7 +591,7 @@ bool SioxImage::writePPM(const std::string &fileName)
     if (!f)
         return false;
 
-    fprintf(f, "P6 %d %d 255\n", width, height);
+    fprintf(f, "P6 %u %u 255\n", width, height);
 
     for (unsigned int y=0 ; y<height; y++)
         {
@@ -933,7 +933,7 @@ SioxImage Siox::extractForeground(const SioxImage &originalImage,
 
     //trace("### bgSignature:%d", bgSignature.size());
 
-    if (bgSignature.size() < 1)
+    if (bgSignature.empty())
         {
         // segmentation impossible
         error("Signature size is < 1.  Segmentation is impossible");
-- 
cgit v1.2.3


From c34892c61ec3c5af7aae2cd3f5b64ddafd47e81c Mon Sep 17 00:00:00 2001
From: Martin Owens <doctormo@gmail.com>
Date: Tue, 11 Jun 2013 23:48:35 -0400
Subject: Fix Apache2 license conflict with GPL with re-license from SOIX
 upstream

Fixed bugs:
  - https://launchpad.net/bugs/357043

(bzr r12370)
---
 src/trace/siox.cpp | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'src/trace/siox.cpp')

diff --git a/src/trace/siox.cpp b/src/trace/siox.cpp
index 1a1426b83..8c9130412 100644
--- a/src/trace/siox.cpp
+++ b/src/trace/siox.cpp
@@ -2,18 +2,8 @@
    Copyright 2005, 2006 by Gerald Friedland, Kristian Jantz and Lars Knipping
 
    Conversion to C++ for Inkscape by Bob Jamison
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+   
+   Released under GNU GPL, read the file 'COPYING' for more information
  */
 #include "siox.h"
 
-- 
cgit v1.2.3


From 2405b993bb6e77f6f4b8752bbdc05abfcad17329 Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Tue, 29 Oct 2013 22:21:53 +0100
Subject: fix warning

(bzr r12748)
---
 src/trace/siox.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/trace/siox.cpp')

diff --git a/src/trace/siox.cpp b/src/trace/siox.cpp
index 8c9130412..92992d440 100644
--- a/src/trace/siox.cpp
+++ b/src/trace/siox.cpp
@@ -888,7 +888,7 @@ SioxImage Siox::extractForeground(const SioxImage &originalImage,
         return workImage;
         }
 
-    trace("knownBg:%zu knownFg:%zu", knownBg.size(), knownFg.size());
+    trace("knownBg:%u knownFg:%u", knownBg.size(), knownFg.size());
 
 
     std::vector<CieLab> bgSignature ;
-- 
cgit v1.2.3


From ab423632c0e41eaacd513ae874640bc32a335c11 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Tue, 12 Nov 2013 23:07:48 +0100
Subject: part of patch by David Evans to fix C++11 build

Fixed bugs:
  - https://launchpad.net/bugs/1244295

(bzr r12801)
---
 src/trace/siox.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/trace/siox.cpp')

diff --git a/src/trace/siox.cpp b/src/trace/siox.cpp
index 92992d440..0706cfed1 100644
--- a/src/trace/siox.cpp
+++ b/src/trace/siox.cpp
@@ -11,6 +11,7 @@
 #include <stdarg.h>
 #include <map>
 #include <algorithm>
+#include <cstdlib>
 
 
 namespace org
-- 
cgit v1.2.3


From b74a8597149d17529201fb8c9d9a92e29cc821ad Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Mon, 17 Mar 2014 18:52:59 -0700
Subject: Warning cleanups.

(bzr r13162)
---
 src/trace/siox.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/trace/siox.cpp')

diff --git a/src/trace/siox.cpp b/src/trace/siox.cpp
index 0706cfed1..065e891ed 100644
--- a/src/trace/siox.cpp
+++ b/src/trace/siox.cpp
@@ -889,7 +889,7 @@ SioxImage Siox::extractForeground(const SioxImage &originalImage,
         return workImage;
         }
 
-    trace("knownBg:%u knownFg:%u", knownBg.size(), knownFg.size());
+    trace("knownBg:%u knownFg:%u", static_cast<unsigned int>(knownBg.size()), static_cast<unsigned int>(knownFg.size()));
 
 
     std::vector<CieLab> bgSignature ;
-- 
cgit v1.2.3