Merge branch 'master' of https://github.com/andre-simon/ansifilter

andre-simon · Jul 25, 2017 · 9ab1a27 · 9ab1a27
2 parents 4126308 + 2e9e954
commit 9ab1a27
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/makefile b/src/makefile
@@ -23,7 +23,7 @@ $(EXECUTABLE): $(OBJECTS)
 	$(CC) $(LDFLAGS) $(EXTRA_LDFLAGS) $(OBJECTS) -o $@
 
 .cpp.o:
-	$(CC) -c $(CXXFLAGS) $< -o $@
+	$(CC) -c $(CXXFLAGS) $(EXTRA_CXXFLAGS) $< -o $@
 
 clean:
 	@rm -f *.o

diff --git a/src/pangogenerator.cpp b/src/pangogenerator.cpp
@@ -66,7 +66,7 @@ string PangoGenerator::getOpenTag()
            << "\"";
     }
     if (elementStyle.isBgColorSet()) {
-        fmtStream <<" bgcolor=#\""
+        fmtStream <<" bgcolor=\"#"
            << elementStyle.getBgColour().getRed(HTML)
            << elementStyle.getBgColour().getGreen(HTML)
            << elementStyle.getBgColour().getBlue(HTML)