Attachment #28686 for bug #43940

View | Details | Raw Unified | Return to bug 43940
Collapse All | Expand All




import org.apache.xmlgraphics.java2d.color.NamedColorSpace;
import org.apache.xmlgraphics.java2d.color.profile.ColorProfileUtil;

import org.apache.xmlgraphics.util.DoubleFormatUtil;

/**
 * This class handles the registration of color spaces and the generation of PDF code to select

        if (comps.length != componentCount) {
            throw new IllegalStateException("Color with unexpected component count encountered");
        }
        DecimalFormat df = DecimalFormatCache.getDecimalFormat(4);
        for (int i = 0, c = comps.length; i < c; i++) {
            DoubleFormatUtil.formatDouble(comps[i], 4, 4, codeBuffer);
            codeBuffer.append(" ");
        }
        codeBuffer.append(command).append("\n");
    }

Lines 24-31 Link Here

(-)src/java/org/apache/fop/render/intermediate/IFUtil.java (-2 / +5 lines)
24		24
25	import org.apache.fop.apps.FOPException;	25	import org.apache.fop.apps.FOPException;
26	import org.apache.fop.fonts.FontInfo;	26	import org.apache.fop.fonts.FontInfo;
27	import org.apache.fop.util.DecimalFormatCache;
28		27
		28	import org.apache.xmlgraphics.util.DoubleFormatUtil;
		29
29	/**	30	/**
30	* Utility functions for the intermediate format.	31	* Utility functions for the intermediate format.
31	*/	32	*/
Lines 40-46 Link Here
40	//See http://java.sun.com/docs/books/jls/third_edition/html/typesValues.html#4.2.3	41	//See http://java.sun.com/docs/books/jls/third_edition/html/typesValues.html#4.2.3
41	value = 0.0;	42	value = 0.0;
42	}	43	}
43	return DecimalFormatCache.getDecimalFormat(6).format(value);	44	StringBuffer buf = new StringBuffer();
		45	DoubleFormatUtil.formatDouble(value, 6, 6, buf);
		46	return buf.toString();
44	}	47	}
45		48
46	/**	49	/**

Return to bug 43940

Lines 36-42 Link Here

(-)src/java/org/apache/fop/pdf/PDFColorHandler.java (-3 / +3 lines)
36	import org.apache.xmlgraphics.java2d.color.NamedColorSpace;	36	import org.apache.xmlgraphics.java2d.color.NamedColorSpace;
37	import org.apache.xmlgraphics.java2d.color.profile.ColorProfileUtil;	37	import org.apache.xmlgraphics.java2d.color.profile.ColorProfileUtil;
38		38
39	import org.apache.fop.util.DecimalFormatCache;	39	import org.apache.xmlgraphics.util.DoubleFormatUtil;
40		40
41	/**	41	/**
42	* This class handles the registration of color spaces and the generation of PDF code to select	42	* This class handles the registration of color spaces and the generation of PDF code to select
Lines 225-233 Link Here
225	if (comps.length != componentCount) {	225	if (comps.length != componentCount) {
226	throw new IllegalStateException("Color with unexpected component count encountered");	226	throw new IllegalStateException("Color with unexpected component count encountered");
227	}	227	}
228	DecimalFormat df = DecimalFormatCache.getDecimalFormat(4);
229	for (int i = 0, c = comps.length; i < c; i++) {	228	for (int i = 0, c = comps.length; i < c; i++) {
230	codeBuffer.append(df.format(comps[i])).append(" ");	229	DoubleFormatUtil.formatDouble(comps[i], 4, 4, codeBuffer);
		230	codeBuffer.append(" ");
231	}	231	}
232	codeBuffer.append(command).append("\n");	232	codeBuffer.append(command).append("\n");
233	}	233	}