diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-11-03 00:10:02 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-11-03 00:10:02 +0000 |
| commit | d2df0412f728dd5bb54537dfdfe7c35b34d40e0e (patch) | |
| tree | e2703384779e83312c456399999997fcc289c5cf /src/trace | |
| parent | Merge branch 'master' into powerpencil (diff) | |
| parent | change assignment to equality (diff) | |
| download | inkscape-d2df0412f728dd5bb54537dfdfe7c35b34d40e0e.tar.gz inkscape-d2df0412f728dd5bb54537dfdfe7c35b34d40e0e.zip | |
Merge branch 'master' into powerpencil
Diffstat (limited to 'src/trace')
| -rw-r--r-- | src/trace/makefile.in | 17 | ||||
| -rw-r--r-- | src/trace/trace.cpp | 2 |
2 files changed, 1 insertions, 18 deletions
diff --git a/src/trace/makefile.in b/src/trace/makefile.in deleted file mode 100644 index 8c2bfd912..000000000 --- a/src/trace/makefile.in +++ /dev/null @@ -1,17 +0,0 @@ -# Convenience stub makefile to call the real Makefile. - -@SET_MAKE@ - -OBJEXT = @OBJEXT@ - -# Explicit so that it's the default rule. -all: - cd .. && $(MAKE) trace/all - -clean %.a %.$(OBJEXT): - cd .. && $(MAKE) trace/$@ - -.PHONY: all clean - -.SUFFIXES: -.SUFFIXES: .a .$(OBJEXT) diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp index 52e99886a..b93d8358f 100644 --- a/src/trace/trace.cpp +++ b/src/trace/trace.cpp @@ -527,7 +527,7 @@ void Tracer::traceThread() if (reprobj) { SPItem *newItem = SP_ITEM(reprobj); - newItem->doWriteTransform(pathRepr, tf, NULL); + newItem->doWriteTransform(tf); } if (nrPaths == 1) { |