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

andre-simon · andre-simon · commit 9ab1a2790e1a · 2017-07-25T20:15:52.000+02:00
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)

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ string PangoGenerator::getOpenTag()`
`66`	`66`	`<< "\"";`
`67`	`67`	`}`
`68`	`68`	`if (elementStyle.isBgColorSet()) {`
`69`		`- fmtStream <<" bgcolor=#\""`
	`69`	`+ fmtStream <<" bgcolor=\"#"`
`70`	`70`	`<< elementStyle.getBgColour().getRed(HTML)`
`71`	`71`	`<< elementStyle.getBgColour().getGreen(HTML)`
`72`	`72`	`<< elementStyle.getBgColour().getBlue(HTML)`