Merge pull request #1 from austinhyde/image-text-improvments

Image/Text rendering improvments

Author: nkiraly

src/main/java/com/koadweb/javafpdf/FPDF.java

@@ -613,6 +613,7 @@ protected Map<String, Object> _parsejpg(final File file) {
 			image.put("cs", colspace); 
 			image.put("bpc", 8); 
 			image.put("f", "DCTDecode"); 
+			image.put("i", Integer.valueOf(this.images.size() + 1)); 
 
 			InputStream f = new FileInputStream(file);
 			byte[] data = new byte[f.available()];
@@ -2760,16 +2761,21 @@ public void setY(final float y) {
 	/** Output a string */
 	public void Text(final float x, final float y, final String txt) {
 		StringBuilder s = new StringBuilder();
-		s.append(String.format(Locale.ENGLISH, "BT %.2f %.2f Td (%s) Tj ET", 
-				Float.valueOf(x * this.k), Float.valueOf((this.h - y) * this.k), this._escape(txt)));
+		
+		if (this.colorFlag) {
+			s.append("q ").append(this.textColor).append(' '); 
+		}
+		
+		s.append(String.format("BT %.2f %.2f Td (%s) Tj ET", x * this.k, (this.h - y) * this.k, this._escape(txt)));
+		
 		if (this.underline && (txt != null)) {
 			s.append(' ').append(this._dounderline(x, y, txt));
 		}
+		
 		if (this.colorFlag) {
-			s.delete(0, s.length());
-			s.append("q ").append(this.textColor) 
-					.append(' ').append(s).append(" Q"); 
+			s.append(" Q");
 		}
+		
 		this._out(s.toString());
 	}