Ok, diff file is attached. build.properties and build.xml is included in it but I guess you can scrap that part...
Regards, /Robert > -----Original Message----- > From: Jeremias Maerki [mailto:[EMAIL PROTECTED] > Sent: Wednesday, July 27, 2005 10:50 AM > To: fop-dev@xmlgraphics.apache.org > Subject: Re: Building Fop 1.0dev with JDK 1.3 ?? > > > I see. So, do you know how to create a patch? Just run "svn diff > >mydiff.txt" and send us the file. That way I don't have to > recreate all > your changes. Thanks in advance! >
Index: src/java/org/apache/fop/render/java2d/Java2DRenderer.java =================================================================== --- src/java/org/apache/fop/render/java2d/Java2DRenderer.java (revision 225262) +++ src/java/org/apache/fop/render/java2d/Java2DRenderer.java (working copy) @@ -883,7 +883,7 @@ state.getGraph().draw(line); // lower Leader line.setLine(startx, starty + thickness, endx, starty + thickness); - state.getGraph().setColor(Color.WHITE); + state.getGraph().setColor(Color.white); state.getGraph().draw(line); // TODO the implementation could be nicer, f.eg. with triangles at @@ -904,7 +904,7 @@ state.getGraph().draw(line); // upperLeader line.setLine(startx, starty, endx, starty); - state.getGraph().setColor(Color.WHITE); + state.getGraph().setColor(Color.white); state.getGraph().draw(line); // TODO the implementation could be nicer, f.eg. with triangles at @@ -998,9 +998,10 @@ byte[] raw = fopimage.getBitmaps(); // TODO Hardcoded color and sample models, FIX ME! - ColorModel cm = new ComponentColorModel(ColorSpace - .getInstance(ColorSpace.CS_LINEAR_RGB), false, false, - ColorModel.OPAQUE, DataBuffer.TYPE_BYTE); + ColorModel cm = new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), + new int[] {8, 8, 8}, + false, false, + ColorModel.OPAQUE, DataBuffer.TYPE_BYTE); SampleModel sampleModel = new PixelInterleavedSampleModel( DataBuffer.TYPE_BYTE, w, h, 3, w * 3, new int[] { 0, 1, 2 }); DataBuffer dbuf = new DataBufferByte(raw, w * h * 3); Index: src/java/org/apache/fop/render/pdf/PDFXMLHandler.java =================================================================== --- src/java/org/apache/fop/render/pdf/PDFXMLHandler.java (revision 225262) +++ src/java/org/apache/fop/render/pdf/PDFXMLHandler.java (working copy) @@ -266,8 +266,8 @@ PDFRenderer renderer = (PDFRenderer)context.getRenderer(); renderer.saveGraphicsState(); //pdfInfo.currentStream.add("q\n"); - renderer.setColor(Color.BLACK, false, null); - renderer.setColor(Color.BLACK, true, null); + renderer.setColor(Color.black, false, null); + renderer.setColor(Color.black, true, null); // transform so that the coordinates (0,0) is from the top left // and positive is down and to the right. (0,0) is where the // viewBox puts it. Index: src/java/org/apache/fop/render/bitmap/TIFFRenderer.java =================================================================== --- src/java/org/apache/fop/render/bitmap/TIFFRenderer.java (revision 225262) +++ src/java/org/apache/fop/render/bitmap/TIFFRenderer.java (working copy) @@ -185,7 +185,7 @@ } public Object next() { - getLogger().debug("[" + (current + 1) + "]"); + //getLogger().debug("[" + (current + 1) + "]"); // Renders current page as image BufferedImage pageImage = null; Index: src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java =================================================================== --- src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java (revision 225262) +++ src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java (working copy) @@ -188,7 +188,7 @@ needColumnBalancing = (childLC.getNextSpan() == Constants.EN_ALL); } if (needColumnBalancing) { - log.debug("Column balancing necessary for the next element list!!!"); + pslm.log.debug("Column balancing necessary for the next element list!!!"); } return nextSequenceStartsOn; } @@ -302,8 +302,8 @@ protected void doPhase3(PageBreakingAlgorithm alg, int partCount, BlockSequence originalList, BlockSequence effectiveList) { if (needColumnBalancing) { - log.debug("Column balancing now!!!"); - log.debug("==================================================="); + pslm.log.debug("Column balancing now!!!"); + pslm.log.debug("==================================================="); int restartPoint = pvProvider.getStartingPartIndexForLastPage(partCount); if (restartPoint > 0) { addAreas(alg, restartPoint, originalList, effectiveList); @@ -317,7 +317,7 @@ } else { newStartPos = 0; } - log.debug("Restarting at " + restartPoint + ", new start position: " + newStartPos); + pslm.log.debug("Restarting at " + restartPoint + ", new start position: " + newStartPos); //Handle page break right here to avoid any side-effects handleBreakTrait(EN_PAGE); @@ -337,7 +337,7 @@ int iOptPageCount = algRestart.findBreakingPoints(effectiveList, newStartPos, 1, true, true); - log.debug("restart: iOptPageCount= " + iOptPageCount + pslm.log.debug("restart: iOptPageCount= " + iOptPageCount + " pageBreaks.size()= " + algRestart.getPageBreaks().size()); if (iOptPageCount > getCurrentPV().getBodyRegion().getColumnCount()) { /* reenable when everything works @@ -348,7 +348,7 @@ //Make sure we only add the areas we haven't added already effectiveList.ignoreAtStart = newStartPos; addAreas(algRestart, iOptPageCount, originalList, effectiveList); - log.debug("==================================================="); + pslm.log.debug("==================================================="); } else { //Directly add areas after finding the breaks addAreas(alg, partCount, originalList, effectiveList); @@ -356,7 +356,7 @@ } protected void startPart(BlockSequence list, int breakClass) { - log.debug("startPart() breakClass=" + breakClass); + pslm.log.debug("startPart() breakClass=" + breakClass); if (curPV == null) { throw new IllegalStateException("curPV must not be null"); } Index: build.properties =================================================================== --- build.properties (revision 225262) +++ build.properties (working copy) @@ -12,4 +12,5 @@ # directory for optional-lib (so there is no need to copy the jar into # the fop/lib directory -# optional.lib.dir = <Optional Lib Directory> \ No newline at end of file +# optional.lib.dir = <Optional Lib Directory> + Index: build.xml =================================================================== --- build.xml (revision 225262) +++ build.xml (working copy) @@ -179,7 +179,7 @@ <property name="debug" value="on"/> <property name="optimize" value="off"/> <property name="deprecation" value="on"/> - + <property name="textfontencoding" value="WinAnsiEncoding"/> <property name="src.dir" value="${basedir}/src"/> @@ -478,7 +478,7 @@ <target name="hyphenation-jar" depends="hyphenation"> <tstamp> - <format property="ts" pattern="yyyy-MM-dd'T'HH:mm:ssZ"/> + <format property="ts" pattern="yyyyMMdd-HHmmss-z"/> </tstamp> <jar jarfile="${build.dir}/fop-hyph.jar" basedir="${build.dest}" includes="hyph/**"> <manifest> @@ -489,7 +489,7 @@ </manifest> </jar> </target> - + <target name="uptodate-jar" depends="compile, hyphenation"> <uptodate property="jar.uptodate" targetfile="${build.dir}/${name}.jar"> <srcfiles dir= "${build.dest}"/> @@ -1083,5 +1083,5 @@ </xmlcatalog> </xmlvalidate> </target> - -</project> + +</project> \ No newline at end of file