Skip to content
Browse files

Merge from Trunk.

  • Loading branch information...
1 parent 1a26a8f commit ab634eb9095f020a1f9147eaa4d02cde745a3677 @jmaerki jmaerki committed
View
120 KEYS
@@ -8,7 +8,7 @@ Users:
Developers:
pgp -kxa <your name> and append it to this file.
(pgpk -ll <your name> && pgpk -xa <your name>) >> this file.
- (gpg --list-sigs <your name>
+ (gpg --list-keys <your name>
&& gpg --armor --export <your name>) >> this file.
pub 1024D/8408F755 2003-01-20 Christian Geisert <chrisg@apache.org>
@@ -209,3 +209,121 @@ tWcUInqOwhLX896WaH9Y5NJYe98MNpQxr3wizYOwdJa3t9+MVvH0+s6ih4aaJ49n
Jysr6rop4tOTfXLTX7m5hXkfJ/k=
=soRW
-----END PGP PUBLIC KEY BLOCK-----
+
+pub 1024D/5F298824 2006-09-30 [expires: 2011-09-29]
+uid Simon Pepping <spepping@leverkruid.eu>
+sub 2048g/40F32100 2006-09-30 [expires: 2011-09-29]
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+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
+=geh1
+-----END PGP PUBLIC KEY BLOCK-----
View
2 NOTICE
@@ -1,5 +1,5 @@
Apache XML Graphics Commons
-Copyright 2006-2008 The Apache Software Foundation
+Copyright 2006-2010 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
View
10 README
@@ -81,6 +81,16 @@ License labeling (according to http://www.apache.org/legal/3party.html):
For more detailed info about the changes, please see:
http://xmlgraphics.apache.org/commons/changes.html
+Version 1.4
+-----------
+
+This release adds the option to generate smaller PostScript files,
+support for the AdobeStandardCyrillic encoding, RefinedImageFlavor,
+TexturePaint support for PSGraphics2D (PostScript tiling patterns),
+improvements to the XMP framework, optimization for PostScript state
+handling in (E)PSDocumentGraphics2D, and more. In addition it contains
+a number of bug fixes.
+
Version 1.3.1
--------------
View
2 build.properties
@@ -34,7 +34,7 @@
## ===================================================================
## 3. Project specific properties
-version = 1.4svn
+version = 1.5svn
## Allows you to switch off the compilation of the internal image
## codecs which depend on Sun-private classes. Setting this to true
View
2 build.xml
@@ -670,6 +670,7 @@ NOTE:
<fileset dir="${build.dir}/maven"/>
<metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
</jar>
+ <move file="${build.dir}/${name}-${version}-bundle.jar" todir="${basedir}"/>
</target>
<!-- =================================================================== -->
@@ -685,6 +686,7 @@ NOTE:
<delete>
<fileset dir="${basedir}" includes="${name}-*.tar.gz*"/>
<fileset dir="${basedir}" includes="${name}-*.zip*"/>
+ <fileset dir="${basedir}" includes="${name}-*-bundle.jar*"/>
</delete>
</target>
View
5 src/documentation/content/doap.rdf
@@ -51,6 +51,11 @@
<release>
<Version>
<name>Latest release (stable)</name>
+ <created>2010-07-07</created>
+ <revision>1.4</revision>
+ </Version>
+ <Version>
+ <name>Previous release (stable)</name>
<created>2008-06-11</created>
<revision>1.3.1</revision>
</Version>
View
11 src/documentation/content/xdocs/index.xml
@@ -31,16 +31,9 @@
implementations that let you generate PDF &amp; PostScript files, and much more.
</p>
<p>
- Apache XML Graphics Commons has only just begun. It's in the process of being
- populated with components coming from <a href="ext:batik">Apache Batik</a>
- and <a href="ext:fop">Apache FOP</a>. Stay tuned for exciting treasures made
- available.
- </p>
- <p>
In the Wiki, we have a
- <a href="http://wiki.apache.org/xmlgraphics/XmlGraphicsCommonComponents">plan for building Apache XML Graphics Commons</a>.
- The plan provides an idea of what you can expect to find here when we're finished
- migrating components.
+ <a href="http://wiki.apache.org/xmlgraphics/XmlGraphicsCommonComponents">Roadmap for Apache XML Graphics Commons</a>.
+ This roadmap is the place to describe new ideas for the project.
</p>
</section>
<section id="features">
View
17 src/documentation/content/xdocs/news.xml
@@ -1,5 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<news>
+ <item date="2010-07-07" title="Version 1.4 Released">
+ <p>
+ This release adds the option to generate smaller PostScript
+ files, support for the AdobeStandardCyrillic encoding,
+ RefinedImageFlavor, TexturePaint support for PSGraphics2D
+ (PostScript tiling patterns), improvements to the XMP framework,
+ optimization for PostScript state handling in
+ (E)PSDocumentGraphics2D, and more. In addition it contains a
+ number of bug fixes. For details, please see the <a
+ href="changes.html#version_1.4">Changes</a> page.
+ </p>
+ <p>
+ We are pleased to note that many new features were contributed
+ from outside the team of committers. Such broader interest
+ ensures the healthy further development of the project.
+ </p>
+ </item>
<item date="2008-06-11" title="Version 1.3.1 Released">
<p>
This release is mostly a bugfix release for the image loading framework
View
2 src/documentation/skinconf.xml
@@ -362,6 +362,7 @@ which will be used to configure the chosen Forrest skin.
<height>125</height>
</credit>
-->
+ <!--
<credit box-location="alt2">
<name>ApacheCon US 2009</name>
<url>http://us.apachecon.com/</url>
@@ -369,6 +370,7 @@ which will be used to configure the chosen Forrest skin.
<width>125</width>
<height>125</height>
</credit>
+ -->
<!-- A credit with @role="pdf" will be used to compose a footer
for each page in the PDF, using either "name" or "url" or both.
View
5 src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderTIFF.java
@@ -127,7 +127,10 @@ private ImageInfo createImageInfo(String uri, ImageInputStream in, ImageContext
xRes = fldx.getAsFloat(0);
yRes = fldy.getAsFloat(0);
}
- if (unit == 2) {
+ if (xRes == 0 || yRes == 0) {
+ //Some TIFFs may report 0 here which would lead to problems
+ size.setResolution(context.getSourceResolution());
+ } else if (unit == 2) {
size.setResolution(xRes, yRes); //Inch
} else {
size.setResolution(
View
8 status.xml
@@ -40,6 +40,11 @@
</contexts>
<changes>
<release version="Trunk" date="n/a">
+ <action context="Code" dev="JM" type="fix">
+ Fix for TIFFs which report zero as their resolution. This resulted in an exception.
+ </action>
+ </release>
+ <release version="1.4" date="7 July 2010">
<action context="Code" dev="JM" type="fix" fixes-bug="49364" due-to="Julien Aymé">
Two properties didn't get copied in copy constructor of PSState.
</action>
@@ -68,6 +73,9 @@
<action context="Code" dev="JM" type="add" fixes-bug="48395" due-to="Andrey Koltunov">
Added code for supporting the AdobeStandardCyrillic encoding.
</action>
+ <action context="Code" dev="CB" type="add" fixes-bug="48237" due-to="Peter Hancock">
+ Added interface for Color Conversions.
+ </action>
<action context="Code" dev="JM" type="add">
Added support for configurable additional penalties for preloader, loader and converter
plug-ins in the ImageImplRegistry (in addition to the hard-coded penalties).

0 comments on commit ab634eb

Please sign in to comment.
Something went wrong with that request. Please try again.