From a7f2b2ba3f13ceb60376802f4a31e104153839e8 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Tue, 17 Feb 2015 03:00:37 +0100 Subject: At first, I was thinking "I just have to go to the selection file, and change that GSList* with a std::list, then resolve the few problems" So, i tried that. And I will continue tomorrow, and the days after, on and on. (bzr r13922.1.1) --- src/trace/trace.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/trace') diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp index cc3d000a3..892ecdb87 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(); + SelContainer const list = sel->itemList(); std::vector 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(SelContainer::const_iterator x=list.begin();x!=list.end();x++){ { - if (!SP_IS_ITEM(list->data)) + if (!SP_IS_ITEM(*x)) { continue; } - SPItem *item = SP_ITEM(list->data); + SPItem *item = SP_ITEM(*x); items.insert(items.begin(), item); } std::vector::iterator iter; -- cgit v1.2.3 From 193b25a53c51a36fe9538e03203b0054c8cfc355 Mon Sep 17 00:00:00 2001 From: mc <> Date: Wed, 18 Feb 2015 02:02:37 +0100 Subject: Just... some... more... lines... (bzr r13922.1.2) --- src/trace/trace.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/trace') diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp index 892ecdb87..2becca5cc 100644 --- a/src/trace/trace.cpp +++ b/src/trace/trace.cpp @@ -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(SelContainer::const_iterator x=list.begin();x!=list.end();x++){ + for (SelContainer::const_iterator i=list.begin() ; list.end()!=i ; i++) { - if (!SP_IS_ITEM(*x)) + if (!SP_IS_ITEM(*i)) { continue; } - SPItem *item = SP_ITEM(*x); + SPItem *item = SP_ITEM(*i); items.insert(items.begin(), item); } std::vector::iterator iter; -- cgit v1.2.3 From 5fd00cab14d48beaf2279a2b8f3ad5b02b76c87b Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Thu, 19 Feb 2015 04:25:21 +0100 Subject: Put a few std::vector (bzr r13922.1.5) --- src/trace/trace.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/trace') diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp index 2becca5cc..4853f127c 100644 --- a/src/trace/trace.cpp +++ b/src/trace/trace.cpp @@ -65,7 +65,7 @@ SPImage *Tracer::getSelectedSPImage() if (sioxEnabled) { SPImage *img = NULL; - SelContainer const list = sel->itemList(); + std::vector const list = sel->itemList(); std::vector items; sioxShapes.clear(); @@ -74,7 +74,7 @@ SPImage *Tracer::getSelectedSPImage() them as bottom-to-top so that we can discover the image and any SPItems above it */ - for (SelContainer::const_iterator i=list.begin() ; list.end()!=i ; i++) + for (std::vector::const_iterator i=list.begin() ; list.end()!=i ; i++) { if (!SP_IS_ITEM(*i)) { -- cgit v1.2.3 From 9a7fa4d1899d30ec745107823f307b2a0bf3172f Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Fri, 27 Feb 2015 03:10:36 +0100 Subject: corrected the casts (hopefully) (bzr r13922.1.10) --- src/trace/trace.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/trace') diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp index 4853f127c..91c230920 100644 --- a/src/trace/trace.cpp +++ b/src/trace/trace.cpp @@ -80,7 +80,7 @@ SPImage *Tracer::getSelectedSPImage() { continue; } - SPItem *item = SP_ITEM(*i); + SPItem *item = *i; items.insert(items.begin(), item); } std::vector::iterator iter; -- cgit v1.2.3 From 48e0423afcb02fe4a0f705d828a0dbdb3106b397 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Fri, 8 May 2015 15:46:25 +0200 Subject: fixes a few of jenkins warnings (bzr r14126) --- src/trace/siox.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/trace') 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; } -- cgit v1.2.3 From 26236dee0e90bb23678a6b1ec52138c7f6dde32b Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Mon, 8 Jun 2015 12:01:23 -0700 Subject: cmake: Add some missing header files to CMakeLists.txt These were found by running cmake_consistency_check.py (bzr r14198) --- src/trace/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'src/trace') 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 -- cgit v1.2.3 From 59d0b04b1ab9af5da2df93825580a071afa521bb Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Mon, 22 Jun 2015 21:16:52 +0200 Subject: Tracing. Fix for Bug #1456387 (Trace Bitmap: Multiscan > Brightness steps produces mostly black result). Fixed bugs: - https://launchpad.net/bugs/1456387 (bzr r14209) --- src/trace/potrace/inkscape-potrace.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/trace') 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 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); -- cgit v1.2.3