update to trunk

(bzr r12588.1.45)

4 files changed, 7 insertions, 6 deletions

diff --git a/src/trace/CMakeLists.txt b/src/trace/CMakeLists.txt
index 958907df6..bf7cfa276 100644
--- a/src/trace/CMakeLists.txt
+++ b/src/trace/CMakeLists.txt
@@ -28,6 +28,7 @@ set(trace_SRC
 
 	potrace/auxiliary.h
 	potrace/bitmap.h
+	potrace/bitops.h
 	potrace/curve.h
 	potrace/decompose.h
 	potrace/greymap.h
diff --git a/src/trace/potrace/inkscape-potrace.cpp b/src/trace/potrace/inkscape-potrace.cpp
index e9e708f52..8f3bb7bdf 100644
--- a/src/trace/potrace/inkscape-potrace.cpp
+++ b/src/trace/potrace/inkscape-potrace.cpp
@@ -497,7 +497,7 @@ std::vector<TracingEngineResult> PotraceTracingEngine::traceBrightnessMulti(GdkP
                 if ( !d.empty() ) {
                     //### get style info
                     int grayVal = (int)(256.0 * brightnessThreshold);
-                    ustring style = ustring::compose("fill-opacity:1.0;fill:%1%2%3", twohex(grayVal), twohex(grayVal), twohex(grayVal) );
+                    ustring style = ustring::compose("fill-opacity:1.0;fill:#%1%2%3", twohex(grayVal), twohex(grayVal), twohex(grayVal) );
 
                     //g_message("### GOT '%s' \n", style.c_str());
                     TracingEngineResult result(style, d, nodeCount);
diff --git a/src/trace/siox.cpp b/src/trace/siox.cpp
index 065e891ed..9df4e561c 100644
--- a/src/trace/siox.cpp
+++ b/src/trace/siox.cpp
@@ -682,7 +682,7 @@ GdkPixbuf *SioxImage::getGdkPixbuf()
             }
         row += rowstride;
         }
-
+    free(pixdata);
     return buf;
 }
 
diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp
index cc3d000a3..91c230920 100644
--- a/src/trace/trace.cpp
+++ b/src/trace/trace.cpp
@@ -65,7 +65,7 @@ SPImage *Tracer::getSelectedSPImage()
     if (sioxEnabled)
         {
         SPImage *img = NULL;
-        GSList const *list = sel->itemList();
+        std::vector<SPItem*> const list = sel->itemList();
         std::vector<SPItem *> items;
         sioxShapes.clear();
 
@@ -74,13 +74,13 @@ SPImage *Tracer::getSelectedSPImage()
            them as bottom-to-top so that we can discover the image and any
            SPItems above it
         */
-        for ( ; list ; list=list->next)
+        for (std::vector<SPItem*>::const_iterator i=list.begin() ; list.end()!=i ; i++)
             {
-            if (!SP_IS_ITEM(list->data))
+            if (!SP_IS_ITEM(*i))
                 {
                 continue;
                 }
-            SPItem *item = SP_ITEM(list->data);
+            SPItem *item = *i;
             items.insert(items.begin(), item);
             }
         std::vector<SPItem *>::iterator iter;