deweese 2002/08/14 05:59:47
Modified: samples/tests/spec/text textLength.svg
test-references/samples batikCandyBumpMap1.png
bookOfKells.png mapSpain.png mapWaadt.png
mathMetal.png moonPhases.png sizeOfSun.png
sunRise.png textRotate.png textRotateShadows.png
test-references/samples/extensions
histogramNormalization.png multi.png
test-references/samples/tests/spec/color colorProfile.png
systemColors.png
test-references/samples/tests/spec/coordinates em.png
percentagesAndUnits.png
test-references/samples/tests/spec/filters
enableBackground.png feColorMatrix.png
feComponentTransfer.png feComponentTransfer2.png
feComposite.png feConvolveMatrix.png
feDisplacementMap.png feImage.png feMerge.png
feMorphology.png feTile.png feTileTarget.png
feTurbulence.png filterRegions.png
svgEnableBackground.png
test-references/samples/tests/spec/fonts batikFont.png
fontAltGlyph.png fontArabic.png fontChoice.png
fontDecorations.png fontExternalFont.png
fontGlyphChoice.png fontGlyphsBoth.png
fontGlyphsChildSVG.png fontGlyphsD.png
fontKerning.png fontOnPath.png fontStyling.png
test-references/samples/tests/spec/linking anchor.png
anchorInsideText.png linkingTransform.png
linkingViewBox.png pointerEvents.png
pointerEvents2.png
test-references/samples/tests/spec/masking clip.png
clipTransform.png maskRegions.png
test-references/samples/tests/spec/painting bboxOnText.png
display.png image-rendering.png markersMisc.png
markersOrientA.png markersOrientB.png
markersPreserveAspectRatio.png markersShapes.png
shape-rendering.png text-rendering.png
text-rendering2.png visibility.png
test-references/samples/tests/spec/paints externalPaints.png
gradientLimit.png gradientPoint.png
linearGradientLine.png
linearGradientOrientation.png
patternPreserveAspectRatioA.png patternRegionA.png
patternRegions.png radialGradient.png
radialGradient2.png radialGradient3.png
radialGradientLine.png
radialGradientOrientation.png
test-references/samples/tests/spec/rendering opacity.png
opacity2.png paintOpacity.png
test-references/samples/tests/spec/scripting add.png
circle.png ellipse.png fill.png image.png
imageraster.png imagesvg.png line.png path.png
polygon.png polyline.png rect.png remove.png
removeOnclick.png text.png textAllProperties.png
textProperties.png text_children1.png
text_children2.png text_children3.png
textpathProperties.png transform.png transform2.png
trefProperties.png tspan.png tspanProperties.png
visibility.png xyModifOnLoad.png
test-references/samples/tests/spec/shapes zero.png
test-references/samples/tests/spec/structure
dataProtocol.png externalUseCascading.png image.png
rasterImageViewBox.png rasterImageViewBoxClip.png
rasterImageViewBoxOverflow.png requiredFeatures.png
requiredFeaturesCombo.png svgImageViewBox.png
svgImageViewBoxClip.png svgImageViewBoxOverflow.png
symbolViewBox.png symbolViewBoxClip.png
symbolViewBoxOverflow.png systemLanguage.png
systemLanguageDialect.png tiff.png toolTips.png
useMultiple.png useMultipleURI.png
useStylesheet.png useStyling.png useStylingURI.png
useTargets.png useTargets2.png xmlBase.png
xmlBaseStyling.png
test-references/samples/tests/spec/styling
alternateStylesheet.png alternateStylesheetCold.png
alternateStylesheetHot.png cssMedia.png
cssMediaList.png cssMediaPrint.png
cssMediaProjection.png cssMediaScreen.png
smiley.png smileyBasic Sad.png smileyGrim.png
smileyOups.png smileySmiling.png smileyWow!.png
test-references/samples/tests/spec/text longTextOnPath.png
smallFonts.png textAnchor.png textAnchor2.png
textAnchor3.png textDecoration.png textEffect.png
textEffect2.png textEffect3.png textFeatures.png
textLayout.png textLayout2.png textLength.png
textOnPath.png textOnPathSpaces.png textPCDATA.png
textPosition.png textPosition2.png
textProperties.png textStyles.png verticalText.png
verticalTextOnPath.png
test-resources/org/apache/batik/test samplesRendering.xml
test-sources/org/apache/batik/test/svg
SVGRenderingAccuracyTest.java
Added: samples/tests/spec/fonts fontBounds.svg
test-references/samples/tests/spec/fonts fontBounds.png
test-references/samples/tests/spec/painting markersExt.png
Log:
1) Fixed a bug in regard's SVGRenderingAccuracyTest where it didn't always
produce a candidate-reference when the images didn't match. I think the
bug was caused by not being allowed to rename a file when a stream was open
to it (so if a GC happened the stream was closed if not it wasn't closed
and rename failed).
2) Added test of font bounds calculation on SVG fonts with strokes
3) added test for text length.
4) Updated reference images for new centering alg
Revision Changes Path
1.1 xml-batik/samples/tests/spec/fonts/fontBounds.svg
Index: fontBounds.svg
===================================================================
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd";>
<!-- ====================================================================== -->
<!-- Copyright (C) The Apache Software Foundation. All rights reserved. -->
<!-- -->
<!-- This software is published under the terms of the Apache Software -->
<!-- License version 1.1, a copy of which has been included with this -->
<!-- distribution in the LICENSE file. -->
<!-- ====================================================================== -->
<!-- ====================================================================== -->
<!-- Tests various altGlyph uses -->
<!-- -->
<!-- @author [EMAIL PROTECTED] -->
<!-- @version $Id: fontBounds.svg,v 1.1 2002/08/14 12:59:32 deweese Exp $ -->
<!-- ====================================================================== -->
<?xml-stylesheet type="text/css" href="../../resources/style/test.css" ?>
<svg id="body" width="450" height="500" viewBox="0 0 450 500"
xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; >
<title>SVGFont - Text/Font Bounds computation.</title>
<text class="title" x="50%" y="40"
>SVGFont - Text/Font Bounds computation.</text>
<font horiz-adv-x="150">
<font-face
font-family="FOPFont"
units-per-em="250"
ascent="200"
descent="50"
alphabetic="0"/>
<missing-glyph horiz-adv-x="150" d="M20 0 V240 H100 V0 z"/>
<glyph unicode=" " glyph-name=" " horiz-adv-x="100"/>
<glyph unicode="F" glyph-name="F" horiz-adv-x="100">
<path style="fill:none;stroke-width:25; stroke-linecap:square"
d="M13,0 v162 h80 m-75-87 h50"/>
</glyph>
<glyph unicode="O" glyph-name="O" horiz-adv-x="130">
<ellipse style="fill:none;stroke-width:25"
cx="63" cy="82" rx="40" ry="82"/>
</glyph>
<glyph unicode="P" glyph-name="p" horiz-adv-x="120">
<path style="fill:none; stroke-width:25; stroke-linecap:square"
d="M13,0 v162 h60 a 25,43 0 1 0 0 -86 h-55"/>
</glyph>
<hkern g1="F" g2="O" k="5"/>
<hkern g1="O" g2="P" k="4"/>
</font>
<text x="150" y="200"
style="stroke:lightgrey;font-family:FOPFont;font-size:120"
>FOP</text>
<svg x="150" y="201" width="162" height="20">
<rect x="0%" y="0%" width="100%" height="100%" fill="#88F"/>
<!-- This svg element is designed to only intersect
the wide stroke on the text. If it doesn't
properly include the stroke (from the
SVG font defn) in the text rendering bounds it will skip
the text entirely resulting in nothing being drawn on
top of the rect -->
<text y="-1" style="stroke:black; font-family:FOPFont; font-size:120"
>FOP</text>
</svg>
<text x="225" y="250" class="legend">The bottoms of the letters should
<tspan x="225" dy="1em">appear in black on top of the blue rect</tspan>
</text>
</svg>
1.2 +45 -30 xml-batik/samples/tests/spec/text/textLength.svg
Index: textLength.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/spec/text/textLength.svg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- textLength.svg 24 Jan 2002 21:35:32 -0000 1.1
+++ textLength.svg 14 Aug 2002 12:59:32 -0000 1.2
@@ -20,24 +20,24 @@
<svg width="450" height="500" viewBox="0 0 450 500">
- <text class="title" x="50%" y="40">textLength with Anchor</text>
+ <text class="title" x="50%" y="20">textLength with Anchor</text>
<defs>
<g id="fill-rgn">
- <rect x="200" y="10" width="50" height="20"
+ <rect x="200" y="5" width="50" height="20"
fill="#DDE8FF" stroke="none"/>
- <line x1="225" y1="8" x2="225" y2="32" stroke="red"/>
+ <line x1="225" y1="3" x2="225" y2="27" stroke="red"/>
</g>
<g id="bg1">
- <rect x="50" y="0" width ="350" height="50"
+ <rect x="50" y="0" width ="350" height="45"
fill="lightGrey" stroke="black"/>
<use xlink:href="#fill-rgn"/>
</g>
<g id="bg2">
- <rect x="50" y="0" width ="350" height="50"
+ <rect x="50" y="0" width ="350" height="45"
fill="white" stroke="black"/>
<use xlink:href="#fill-rgn"/>
</g>
@@ -45,66 +45,81 @@
<g font-size="12" >
<!-- no lengthadjust -->
- <g transform="translate(0, 50)">
+ <g transform="translate(0, 30)">
<use xlink:href="#bg1"/>
- <text x="225" y="24" text-anchor="middle">xml-batik</text>
- <text x="225" y="45" text-anchor="middle">No textLength</text>
+ <text x="225" y="19" text-anchor="middle">xml-batik</text>
+ <text x="225" y="40" text-anchor="middle">No textLength</text>
</g>
<!-- With lengthAdjust spacingAndGlyphs -->
- <g transform="translate(0, 100)">
+ <g transform="translate(0, 75)">
<use xlink:href="#bg2"/>
- <text x="225" y="24" text-anchor="middle" textLength="50"
+ <text x="225" y="19" text-anchor="middle" textLength="50"
lengthAdjust="spacingAndGlyphs">B</text>
- <text x="225" y="45" text-anchor="middle">textLength="50"
lengthAdjust="spacingAndGlyphs"</text>
+ <text x="225" y="40" text-anchor="middle">textLength="50"
lengthAdjust="spacingAndGlyphs"</text>
</g>
<!-- with lengthAdjust spacing -->
- <g transform="translate(0, 150)">
+ <g transform="translate(0, 120)">
<use xlink:href="#bg1"/>
- <text x="225" y="24" text-anchor="middle" textLength="50"
+ <text x="225" y="19" text-anchor="middle" textLength="50"
lengthAdjust="spacing">B</text>
- <text x="225" y="45" text-anchor="middle">textLength="50"
lengthAdjust="spacing"</text>
+ <text x="225" y="40" text-anchor="middle">textLength="50"
lengthAdjust="spacing"</text>
</g>
<!-- with lengthAdjust spacing -->
- <g transform="translate(0, 200)">
+ <g transform="translate(0, 165)">
<use xlink:href="#bg2"/>
- <text x="225" y="24" text-anchor="middle" textLength="50"
+ <text x="225" y="19" text-anchor="middle" textLength="50"
lengthAdjust="spacingAndGlyphs">Batik</text>
- <text x="225" y="45" text-anchor="middle">textLength="50"
lengthAdjust="spacingAndGlyphs"</text>
+ <text x="225" y="40" text-anchor="middle">textLength="50"
lengthAdjust="spacingAndGlyphs"</text>
</g>
<!-- with lengthAdjust spacing -->
- <g transform="translate(0, 250)">
+ <g transform="translate(0, 210)">
<use xlink:href="#bg1"/>
- <text x="225" y="24" text-anchor="middle" textLength="50"
+ <text x="225" y="19" text-anchor="middle" textLength="50"
lengthAdjust="spacing">Batik</text>
- <text x="225" y="45" text-anchor="middle">textLength="50"
lengthAdjust="spacing"</text>
+ <text x="225" y="40" text-anchor="middle">textLength="50"
lengthAdjust="spacing"</text>
</g>
<!-- large number -->
- <g transform="translate(0, 300)">
+ <g transform="translate(0, 255)">
<use xlink:href="#bg2"/>
- <text x="225" y="24" text-anchor="middle" textLength="50"
+ <text x="225" y="19" text-anchor="middle" textLength="50"
lengthAdjust="spacingAndGlyphs">Apache Batik</text>
- <text x="225" y="45" text-anchor="middle">textLength="50"
lengthAdjust="spacingAndGlyphs" (shrinking)</text>
+ <text x="225" y="40" text-anchor="middle">textLength="50"
lengthAdjust="spacingAndGlyphs" (shrinking)</text>
</g>
<!-- large number, no anchor -->
- <g transform="translate(0, 350)">
+ <g transform="translate(0, 300)">
<use xlink:href="#bg1"/>
- <text x="200" y="24" textLength="50"
+ <text x="200" y="19" textLength="50"
lengthAdjust="spacingAndGlyphs">Apache Batik</text>
- <text x="225" y="45" text-anchor="middle">textLength="50"
lengthAdjust="spacingAndGlyphs" (no anchor)</text>
+ <text x="225" y="40" text-anchor="middle">textLength="50"
lengthAdjust="spacingAndGlyphs" (no anchor)</text>
</g>
<!-- large number, tspan -->
- <g transform="translate(0, 400)">
+ <g transform="translate(0, 345)">
<use xlink:href="#bg2"/>
- <text x="225" y="24" text-anchor="middle" textLength="50"
+ <text x="225" y="19" text-anchor="middle" textLength="50"
lengthAdjust="spacingAndGlyphs">Apache <tspan
fill="red">Batik</tspan>!!</text>
- <text x="225" y="45" text-anchor="middle">textLength="50"
lengthAdjust="spacingAndGlyphs" (tspan)</text>
+ <text x="225" y="40" text-anchor="middle">textLength="50"
lengthAdjust="spacingAndGlyphs" (tspan)</text>
+ </g>
+
+ <!-- Big Font Squeezed alot -->
+ <g transform="translate(0, 390)">
+ <rect x="50" y="0" width ="350" height="95"
+ fill="lightGrey" stroke="black"/>
+ <rect x="112.5" y="5" width="25" height="80"
+ fill="#DDE8FF" stroke="none"/>
+ <line x1="125" y1="3" x2="125" y2="87" stroke="red"/>
+ <text x="125" y="79" text-anchor="middle" textLength="25"
+ lengthAdjust="spacingAndGlyphs"
+ font-size="100">B a t i k</text>
+ <text x="160" y="40">lengthAdjust="spacingAndGlyphs"
+ <tspan x="160" dy="1.2em">textLength="25"</tspan>
+ <tspan x="160" dy="1.2em">font-size="100"</tspan></text>
</g>
</g>
1.2 +2 -2 xml-batik/test-references/samples/batikCandyBumpMap1.png
<<Binary file>>
1.6 +1770 -1882xml-batik/test-references/samples/bookOfKells.png
<<Binary file>>
1.5 +728 -701 xml-batik/test-references/samples/mapSpain.png
<<Binary file>>
1.5 +555 -512 xml-batik/test-references/samples/mapWaadt.png
<<Binary file>>
1.7 +824 -818 xml-batik/test-references/samples/mathMetal.png
<<Binary file>>
1.10 +360 -362 xml-batik/test-references/samples/moonPhases.png
<<Binary file>>
1.7 +199 -165 xml-batik/test-references/samples/sizeOfSun.png
<<Binary file>>
1.6 +628 -653 xml-batik/test-references/samples/sunRise.png
<<Binary file>>
1.9 +404 -420 xml-batik/test-references/samples/textRotate.png
<<Binary file>>
1.11 +613 -621 xml-batik/test-references/samples/textRotateShadows.png
<<Binary file>>
1.6 +341 -346
xml-batik/test-references/samples/extensions/histogramNormalization.png
<<Binary file>>
1.2 +665 -647 xml-batik/test-references/samples/extensions/multi.png
<<Binary file>>
1.6 +155 -187
xml-batik/test-references/samples/tests/spec/color/colorProfile.png
<<Binary file>>
1.5 +75 -78
xml-batik/test-references/samples/tests/spec/color/systemColors.png
<<Binary file>>
1.5 +36 -29 xml-batik/test-references/samples/tests/spec/coordinates/em.png
<<Binary file>>
1.5 +26 -27
xml-batik/test-references/samples/tests/spec/coordinates/percentagesAndUnits.png
<<Binary file>>
1.7 +85 -86
xml-batik/test-references/samples/tests/spec/filters/enableBackground.png
<<Binary file>>
1.5 +253 -236
xml-batik/test-references/samples/tests/spec/filters/feColorMatrix.png
<<Binary file>>
1.5 +465 -413
xml-batik/test-references/samples/tests/spec/filters/feComponentTransfer.png
<<Binary file>>
1.5 +460 -453
xml-batik/test-references/samples/tests/spec/filters/feComponentTransfer2.png
<<Binary file>>
1.6 +71 -97
xml-batik/test-references/samples/tests/spec/filters/feComposite.png
<<Binary file>>
1.5 +111 -126
xml-batik/test-references/samples/tests/spec/filters/feConvolveMatrix.png
<<Binary file>>
1.5 +55 -75
xml-batik/test-references/samples/tests/spec/filters/feDisplacementMap.png
<<Binary file>>
1.5 +102 -87 xml-batik/test-references/samples/tests/spec/filters/feImage.png
<<Binary file>>
1.6 +58 -55 xml-batik/test-references/samples/tests/spec/filters/feMerge.png
<<Binary file>>
1.5 +182 -146
xml-batik/test-references/samples/tests/spec/filters/feMorphology.png
<<Binary file>>
1.7 +123 -107 xml-batik/test-references/samples/tests/spec/filters/feTile.png
<<Binary file>>
1.5 +59 -75
xml-batik/test-references/samples/tests/spec/filters/feTileTarget.png
<<Binary file>>
1.5 +564 -558
xml-batik/test-references/samples/tests/spec/filters/feTurbulence.png
<<Binary file>>
1.5 +48 -54
xml-batik/test-references/samples/tests/spec/filters/filterRegions.png
<<Binary file>>
1.7 +116 -138
xml-batik/test-references/samples/tests/spec/filters/svgEnableBackground.png
<<Binary file>>
1.5 +48 -38 xml-batik/test-references/samples/tests/spec/fonts/batikFont.png
<<Binary file>>
1.5 +120 -101
xml-batik/test-references/samples/tests/spec/fonts/fontAltGlyph.png
<<Binary file>>
1.5 +225 -251
xml-batik/test-references/samples/tests/spec/fonts/fontArabic.png
<<Binary file>>
1.5 +128 -152
xml-batik/test-references/samples/tests/spec/fonts/fontChoice.png
<<Binary file>>
1.5 +75 -60
xml-batik/test-references/samples/tests/spec/fonts/fontDecorations.png
<<Binary file>>
1.5 +17 -21
xml-batik/test-references/samples/tests/spec/fonts/fontExternalFont.png
<<Binary file>>
1.5 +36 -30
xml-batik/test-references/samples/tests/spec/fonts/fontGlyphChoice.png
<<Binary file>>
1.5 +90 -90
xml-batik/test-references/samples/tests/spec/fonts/fontGlyphsBoth.png
<<Binary file>>
1.5 +136 -140
xml-batik/test-references/samples/tests/spec/fonts/fontGlyphsChildSVG.png
<<Binary file>>
1.5 +130 -132
xml-batik/test-references/samples/tests/spec/fonts/fontGlyphsD.png
<<Binary file>>
1.5 +152 -142
xml-batik/test-references/samples/tests/spec/fonts/fontKerning.png
<<Binary file>>
1.5 +113 -109
xml-batik/test-references/samples/tests/spec/fonts/fontOnPath.png
<<Binary file>>
1.5 +38 -30
xml-batik/test-references/samples/tests/spec/fonts/fontStyling.png
<<Binary file>>
1.1
xml-batik/test-references/samples/tests/spec/fonts/fontBounds.png
<<Binary file>>
1.5 +82 -83 xml-batik/test-references/samples/tests/spec/linking/anchor.png
<<Binary file>>
1.3 +99 -95
xml-batik/test-references/samples/tests/spec/linking/anchorInsideText.png
<<Binary file>>
1.5 +10 -7
xml-batik/test-references/samples/tests/spec/linking/linkingTransform.png
<<Binary file>>
1.5 +31 -34
xml-batik/test-references/samples/tests/spec/linking/linkingViewBox.png
<<Binary file>>
1.4 +42 -39
xml-batik/test-references/samples/tests/spec/linking/pointerEvents.png
<<Binary file>>
1.4 +101 -96
xml-batik/test-references/samples/tests/spec/linking/pointerEvents2.png
<<Binary file>>
1.5 +47 -63 xml-batik/test-references/samples/tests/spec/masking/clip.png
<<Binary file>>
1.4 +13 -16
xml-batik/test-references/samples/tests/spec/masking/clipTransform.png
<<Binary file>>
1.5 +49 -42
xml-batik/test-references/samples/tests/spec/masking/maskRegions.png
<<Binary file>>
1.5 +13 -14
xml-batik/test-references/samples/tests/spec/painting/bboxOnText.png
<<Binary file>>
1.6 +32 -32
xml-batik/test-references/samples/tests/spec/painting/display.png
<<Binary file>>
1.5 +172 -179
xml-batik/test-references/samples/tests/spec/painting/image-rendering.png
<<Binary file>>
1.5 +109 -100
xml-batik/test-references/samples/tests/spec/painting/markersMisc.png
<<Binary file>>
1.5 +98 -86
xml-batik/test-references/samples/tests/spec/painting/markersOrientA.png
<<Binary file>>
1.5 +72 -94
xml-batik/test-references/samples/tests/spec/painting/markersOrientB.png
<<Binary file>>
1.5 +110 -97
xml-batik/test-references/samples/tests/spec/painting/markersPreserveAspectRatio.png
<<Binary file>>
1.7 +120 -141
xml-batik/test-references/samples/tests/spec/painting/markersShapes.png
<<Binary file>>
1.5 +28 -50
xml-batik/test-references/samples/tests/spec/painting/shape-rendering.png
<<Binary file>>
1.5 +63 -70
xml-batik/test-references/samples/tests/spec/painting/text-rendering.png
<<Binary file>>
1.5 +78 -95
xml-batik/test-references/samples/tests/spec/painting/text-rendering2.png
<<Binary file>>
1.5 +44 -36
xml-batik/test-references/samples/tests/spec/painting/visibility.png
<<Binary file>>
1.1
xml-batik/test-references/samples/tests/spec/painting/markersExt.png
<<Binary file>>
1.5 +275 -171
xml-batik/test-references/samples/tests/spec/paints/externalPaints.png
<<Binary file>>
1.5 +22 -27
xml-batik/test-references/samples/tests/spec/paints/gradientLimit.png
<<Binary file>>
1.2 +59 -49
xml-batik/test-references/samples/tests/spec/paints/gradientPoint.png
<<Binary file>>
1.2 +28 -19
xml-batik/test-references/samples/tests/spec/paints/linearGradientLine.png
<<Binary file>>
1.5 +41 -35
xml-batik/test-references/samples/tests/spec/paints/linearGradientOrientation.png
<<Binary file>>
1.5 +61 -70
xml-batik/test-references/samples/tests/spec/paints/patternPreserveAspectRatioA.png
<<Binary file>>
1.5 +77 -72
xml-batik/test-references/samples/tests/spec/paints/patternRegionA.png
<<Binary file>>
1.7 +114 -132
xml-batik/test-references/samples/tests/spec/paints/patternRegions.png
<<Binary file>>
1.5 +164 -163
xml-batik/test-references/samples/tests/spec/paints/radialGradient.png
<<Binary file>>
1.5 +284 -198
xml-batik/test-references/samples/tests/spec/paints/radialGradient2.png
<<Binary file>>
1.5 +284 -205
xml-batik/test-references/samples/tests/spec/paints/radialGradient3.png
<<Binary file>>
1.2 +31 -26
xml-batik/test-references/samples/tests/spec/paints/radialGradientLine.png
<<Binary file>>
1.5 +28 -44
xml-batik/test-references/samples/tests/spec/paints/radialGradientOrientation.png
<<Binary file>>
1.6 +83 -106
xml-batik/test-references/samples/tests/spec/rendering/opacity.png
<<Binary file>>
1.6 +119 -138
xml-batik/test-references/samples/tests/spec/rendering/opacity2.png
<<Binary file>>
1.7 +244 -255
xml-batik/test-references/samples/tests/spec/rendering/paintOpacity.png
<<Binary file>>
1.5 +5 -2 xml-batik/test-references/samples/tests/spec/scripting/add.png
<<Binary file>>
1.5 +54 -65
xml-batik/test-references/samples/tests/spec/scripting/circle.png
<<Binary file>>
1.5 +45 -46
xml-batik/test-references/samples/tests/spec/scripting/ellipse.png
<<Binary file>>
1.3 +3 -5 xml-batik/test-references/samples/tests/spec/scripting/fill.png
<<Binary file>>
1.4 +63 -47 xml-batik/test-references/samples/tests/spec/scripting/image.png
<<Binary file>>
1.4 +35 -33
xml-batik/test-references/samples/tests/spec/scripting/imageraster.png
<<Binary file>>
1.4 +59 -61
xml-batik/test-references/samples/tests/spec/scripting/imagesvg.png
<<Binary file>>
1.5 +82 -81 xml-batik/test-references/samples/tests/spec/scripting/line.png
<<Binary file>>
1.5 +9 -7 xml-batik/test-references/samples/tests/spec/scripting/path.png
<<Binary file>>
1.5 +14 -25
xml-batik/test-references/samples/tests/spec/scripting/polygon.png
<<Binary file>>
1.5 +23 -23
xml-batik/test-references/samples/tests/spec/scripting/polyline.png
<<Binary file>>
1.5 +32 -50 xml-batik/test-references/samples/tests/spec/scripting/rect.png
<<Binary file>>
1.5 +5 -3
xml-batik/test-references/samples/tests/spec/scripting/remove.png
<<Binary file>>
1.2 +6 -1
xml-batik/test-references/samples/tests/spec/scripting/removeOnclick.png
<<Binary file>>
1.3 +116 -134 xml-batik/test-references/samples/tests/spec/scripting/text.png
<<Binary file>>
1.2 +84 -87
xml-batik/test-references/samples/tests/spec/scripting/textAllProperties.png
<<Binary file>>
1.3 +58 -63
xml-batik/test-references/samples/tests/spec/scripting/textProperties.png
<<Binary file>>
1.3 +87 -120
xml-batik/test-references/samples/tests/spec/scripting/text_children1.png
<<Binary file>>
1.3 +58 -69
xml-batik/test-references/samples/tests/spec/scripting/text_children2.png
<<Binary file>>
1.3 +182 -231
xml-batik/test-references/samples/tests/spec/scripting/text_children3.png
<<Binary file>>
1.2 +150 -140
xml-batik/test-references/samples/tests/spec/scripting/textpathProperties.png
<<Binary file>>
1.5 +114 -98
xml-batik/test-references/samples/tests/spec/scripting/transform.png
<<Binary file>>
1.5 +17 -31
xml-batik/test-references/samples/tests/spec/scripting/transform2.png
<<Binary file>>
1.2 +59 -62
xml-batik/test-references/samples/tests/spec/scripting/trefProperties.png
<<Binary file>>
1.2 +126 -116 xml-batik/test-references/samples/tests/spec/scripting/tspan.png
<<Binary file>>
1.2 +45 -71
xml-batik/test-references/samples/tests/spec/scripting/tspanProperties.png
<<Binary file>>
1.3 +3 -2
xml-batik/test-references/samples/tests/spec/scripting/visibility.png
<<Binary file>>
1.5 +3 -9
xml-batik/test-references/samples/tests/spec/scripting/xyModifOnLoad.png
<<Binary file>>
1.5 +50 -42 xml-batik/test-references/samples/tests/spec/shapes/zero.png
<<Binary file>>
1.6 +142 -225
xml-batik/test-references/samples/tests/spec/structure/dataProtocol.png
<<Binary file>>
1.5 +106 -130
xml-batik/test-references/samples/tests/spec/structure/externalUseCascading.png
<<Binary file>>
1.6 +286 -284 xml-batik/test-references/samples/tests/spec/structure/image.png
<<Binary file>>
1.5 +97 -109
xml-batik/test-references/samples/tests/spec/structure/rasterImageViewBox.png
<<Binary file>>
1.5 +84 -137
xml-batik/test-references/samples/tests/spec/structure/rasterImageViewBoxClip.png
<<Binary file>>
1.5 +111 -76
xml-batik/test-references/samples/tests/spec/structure/rasterImageViewBoxOverflow.png
<<Binary file>>
1.5 +45 -43
xml-batik/test-references/samples/tests/spec/structure/requiredFeatures.png
<<Binary file>>
1.5 +42 -39
xml-batik/test-references/samples/tests/spec/structure/requiredFeaturesCombo.png
<<Binary file>>
1.5 +196 -150
xml-batik/test-references/samples/tests/spec/structure/svgImageViewBox.png
<<Binary file>>
1.5 +97 -95
xml-batik/test-references/samples/tests/spec/structure/svgImageViewBoxClip.png
<<Binary file>>
1.5 +198 -180
xml-batik/test-references/samples/tests/spec/structure/svgImageViewBoxOverflow.png
<<Binary file>>
1.5 +166 -166
xml-batik/test-references/samples/tests/spec/structure/symbolViewBox.png
<<Binary file>>
1.5 +93 -93
xml-batik/test-references/samples/tests/spec/structure/symbolViewBoxClip.png
<<Binary file>>
1.5 +186 -210
xml-batik/test-references/samples/tests/spec/structure/symbolViewBoxOverflow.png
<<Binary file>>
1.5 +69 -96
xml-batik/test-references/samples/tests/spec/structure/systemLanguage.png
<<Binary file>>
1.5 +12 -9
xml-batik/test-references/samples/tests/spec/structure/systemLanguageDialect.png
<<Binary file>>
1.5 +6 -10 xml-batik/test-references/samples/tests/spec/structure/tiff.png
<<Binary file>>
1.5 +96 -90
xml-batik/test-references/samples/tests/spec/structure/toolTips.png
<<Binary file>>
1.5 +33 -31
xml-batik/test-references/samples/tests/spec/structure/useMultiple.png
<<Binary file>>
1.5 +49 -38
xml-batik/test-references/samples/tests/spec/structure/useMultipleURI.png
<<Binary file>>
1.5 +136 -142
xml-batik/test-references/samples/tests/spec/structure/useStylesheet.png
<<Binary file>>
1.5 +136 -142
xml-batik/test-references/samples/tests/spec/structure/useStyling.png
<<Binary file>>
1.5 +151 -163
xml-batik/test-references/samples/tests/spec/structure/useStylingURI.png
<<Binary file>>
1.6 +76 -71
xml-batik/test-references/samples/tests/spec/structure/useTargets.png
<<Binary file>>
1.4 +67 -69
xml-batik/test-references/samples/tests/spec/structure/useTargets2.png
<<Binary file>>
1.6 +85 -93
xml-batik/test-references/samples/tests/spec/structure/xmlBase.png
<<Binary file>>
1.5 +251 -247
xml-batik/test-references/samples/tests/spec/structure/xmlBaseStyling.png
<<Binary file>>
1.5 +123 -122
xml-batik/test-references/samples/tests/spec/styling/alternateStylesheet.png
<<Binary file>>
1.5 +137 -135
xml-batik/test-references/samples/tests/spec/styling/alternateStylesheetCold.png
<<Binary file>>
1.5 +144 -141
xml-batik/test-references/samples/tests/spec/styling/alternateStylesheetHot.png
<<Binary file>>
1.5 +195 -159
xml-batik/test-references/samples/tests/spec/styling/cssMedia.png
<<Binary file>>
1.5 +64 -37
xml-batik/test-references/samples/tests/spec/styling/cssMediaList.png
<<Binary file>>
1.5 +186 -165
xml-batik/test-references/samples/tests/spec/styling/cssMediaPrint.png
<<Binary file>>
1.5 +89 -102
xml-batik/test-references/samples/tests/spec/styling/cssMediaProjection.png
<<Binary file>>
1.5 +195 -159
xml-batik/test-references/samples/tests/spec/styling/cssMediaScreen.png
<<Binary file>>
1.5 +50 -61 xml-batik/test-references/samples/tests/spec/styling/smiley.png
<<Binary file>>
No revision
No revision
1.5 +46 -45
xml-batik/test-references/samples/tests/spec/styling/smileyGrim.png
<<Binary file>>
1.5 +57 -59
xml-batik/test-references/samples/tests/spec/styling/smileyOups.png
<<Binary file>>
1.5 +56 -68
xml-batik/test-references/samples/tests/spec/styling/smileySmiling.png
<<Binary file>>
1.5 +65 -66
xml-batik/test-references/samples/tests/spec/styling/smileyWow!.png
<<Binary file>>
1.5 +240 -245
xml-batik/test-references/samples/tests/spec/text/longTextOnPath.png
<<Binary file>>
1.8 +276 -261 xml-batik/test-references/samples/tests/spec/text/smallFonts.png
<<Binary file>>
1.5 +57 -61 xml-batik/test-references/samples/tests/spec/text/textAnchor.png
<<Binary file>>
1.5 +47 -54
xml-batik/test-references/samples/tests/spec/text/textAnchor2.png
<<Binary file>>
1.5 +81 -69
xml-batik/test-references/samples/tests/spec/text/textAnchor3.png
<<Binary file>>
1.5 +119 -68
xml-batik/test-references/samples/tests/spec/text/textDecoration.png
<<Binary file>>
1.5 +104 -127 xml-batik/test-references/samples/tests/spec/text/textEffect.png
<<Binary file>>
1.5 +16 -31
xml-batik/test-references/samples/tests/spec/text/textEffect2.png
<<Binary file>>
1.5 +103 -163
xml-batik/test-references/samples/tests/spec/text/textEffect3.png
<<Binary file>>
1.7 +223 -184
xml-batik/test-references/samples/tests/spec/text/textFeatures.png
<<Binary file>>
1.7 +141 -161 xml-batik/test-references/samples/tests/spec/text/textLayout.png
<<Binary file>>
1.5 +121 -112
xml-batik/test-references/samples/tests/spec/text/textLayout2.png
<<Binary file>>
1.2 +148 -134 xml-batik/test-references/samples/tests/spec/text/textLength.png
<<Binary file>>
1.5 +226 -205 xml-batik/test-references/samples/tests/spec/text/textOnPath.png
<<Binary file>>
1.6 +162 -133
xml-batik/test-references/samples/tests/spec/text/textOnPathSpaces.png
<<Binary file>>
1.5 +36 -42 xml-batik/test-references/samples/tests/spec/text/textPCDATA.png
<<Binary file>>
1.5 +70 -49
xml-batik/test-references/samples/tests/spec/text/textPosition.png
<<Binary file>>
1.5 +71 -74
xml-batik/test-references/samples/tests/spec/text/textPosition2.png
<<Binary file>>
1.6 +219 -147
xml-batik/test-references/samples/tests/spec/text/textProperties.png
<<Binary file>>
1.7 +219 -186 xml-batik/test-references/samples/tests/spec/text/textStyles.png
<<Binary file>>
1.6 +129 -119
xml-batik/test-references/samples/tests/spec/text/verticalText.png
<<Binary file>>
1.6 +250 -241
xml-batik/test-references/samples/tests/spec/text/verticalTextOnPath.png
<<Binary file>>
1.81 +2 -1
xml-batik/test-resources/org/apache/batik/test/samplesRendering.xml
Index: samplesRendering.xml
===================================================================
RCS file:
/home/cvs/xml-batik/test-resources/org/apache/batik/test/samplesRendering.xml,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- samplesRendering.xml 9 Jul 2002 17:17:54 -0000 1.80
+++ samplesRendering.xml 14 Aug 2002 12:59:47 -0000 1.81
@@ -113,6 +113,7 @@
<test id="samples/tests/spec/fonts/batikFont.svg" />
<test id="samples/tests/spec/fonts/fontAltGlyph.svg" />
<test id="samples/tests/spec/fonts/fontArabic.svg" />
+ <test id="samples/tests/spec/fonts/fontBounds.svg" />
<test id="samples/tests/spec/fonts/fontChoice.svg" />
<test id="samples/tests/spec/fonts/fontDecorations.svg" />
<test id="samples/tests/spec/fonts/fontExternalFont.svg" />
1.31 +16 -29
xml-batik/test-sources/org/apache/batik/test/svg/SVGRenderingAccuracyTest.java
Index: SVGRenderingAccuracyTest.java
===================================================================
RCS file:
/home/cvs/xml-batik/test-sources/org/apache/batik/test/svg/SVGRenderingAccuracyTest.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- SVGRenderingAccuracyTest.java 10 May 2002 06:32:04 -0000 1.30
+++ SVGRenderingAccuracyTest.java 14 Aug 2002 12:59:47 -0000 1.31
@@ -448,9 +448,12 @@
File tmpFile = null;
try{
- tmpFile = File.createTempFile(TEMP_FILE_PREFIX,
- TEMP_FILE_SUFFIX,
- null);
+ if (candidateReference != null)
+ tmpFile = candidateReference;
+ else
+ tmpFile = File.createTempFile(TEMP_FILE_PREFIX,
+ TEMP_FILE_SUFFIX,
+ null);
}catch(IOException e){
report.setErrorCode(ERROR_CANNOT_CREATE_TEMP_FILE);
report.setDescription(new TestReport.Entry[] {
@@ -536,12 +539,7 @@
e.getMessage()})) });
report.setPassed(false);
// Try and save tmp file as a candidate variation
- boolean deleteTmp = true;
- if (candidateReference != null){
- deleteTmp = tmpFile.renameTo(candidateReference);
- }
-
- if (deleteTmp){
+ if (candidateReference == null){
tmpFile.delete();
}
return report;
@@ -559,7 +557,6 @@
e.getMessage()}))});
report.setPassed(false);
tmpFile.delete();
- tmpFile.deleteOnExit();
return report;
}
@@ -575,12 +572,10 @@
new Object[]{refImgURL.toString(),
tmpFile.getAbsolutePath(),
e.getMessage()}))});
- if (candidateReference != null){
- tmpFile.renameTo(candidateReference);
- }
-
report.setPassed(false);
- tmpFile.deleteOnExit();
+ if (candidateReference == null){
+ tmpFile.delete();
+ }
return report;
}
@@ -652,18 +647,11 @@
new
TestReport.Entry(Messages.formatMessage(ENTRY_KEY_DIFFERENCE_IMAGE, null),
diffFile) });
- if (candidateReference != null){
- System.err.print(">>>>>> saving candidate reference : ");
- boolean res = tmpFile.renameTo(candidateReference);
- System.err.println(res);
- if (!res) {
- System.out.println("failed renaiming : " + tmpFile + "
to " + candidateReference);
- System.out.println("tmpFile.existis : " +
tmpFile.exists());
- }
+ if (candidateReference == null){
+ tmpFile.delete();
}
report.setPassed(false);
- tmpFile.deleteOnExit();
return report;
}
}catch(Exception e){
@@ -680,12 +668,11 @@
e.getMessage(),
trace.toString()})) });
- if (candidateReference != null){
- tmpFile.renameTo(candidateReference);
+ if (candidateReference == null){
+ tmpFile.delete();
}
report.setPassed(false);
- tmpFile.deleteOnExit();
return report;
}
}
@@ -695,7 +682,7 @@
// Yahooooooo! everything worked out well.
//
report.setPassed(true);
- tmpFile.deleteOnExit();
+ tmpFile.delete();
return report;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
