Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-08-05 04:25:29 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/haraldk/TwelveMonkeys

Browse Source 
Conflicts:
	imageio/imageio-reference/pom.xml
	imageio/imageio-thumbsdb/pom.xml
This commit is contained in:
Rune Bremnes 2014-03-03 12:33:01 +01:00
commit 113480b9e7
25 changed files with 680 additions and 567 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/common-image/pom.xml
View File

@ -1,7 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.twelvemonkeys.common</groupId> <groupId>com.twelvemonkeys.common</groupId>

62
common/common-io/pom.xml
View File

@ -1,32 +1,30 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <modelVersion>4.0.0</modelVersion>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent>
<modelVersion>4.0.0</modelVersion> <groupId>com.twelvemonkeys.common</groupId>
<parent> <artifactId>common</artifactId>
<groupId>com.twelvemonkeys.common</groupId> <version>3.0-SNAPSHOT</version>
<artifactId>common</artifactId> </parent>
<version>3.0-SNAPSHOT</version> <artifactId>common-io</artifactId>
</parent> <packaging>jar</packaging>
<artifactId>common-io</artifactId> <name>TwelveMonkeys :: Common :: IO</name>
<packaging>jar</packaging> <description>
<name>TwelveMonkeys :: Common :: IO</name> The TwelveMonkeys Common IO support
<description> </description>
The TwelveMonkeys Common IO support
</description> <dependencies>
<dependency>
<dependencies> <groupId>${project.groupId}</groupId>
<dependency> <artifactId>common-lang</artifactId>
<groupId>${project.groupId}</groupId> </dependency>
<artifactId>common-lang</artifactId>
</dependency> <dependency>
<groupId>${project.groupId}</groupId>
<dependency> <artifactId>common-lang</artifactId>
<groupId>${project.groupId}</groupId> <classifier>tests</classifier>
<artifactId>common-lang</artifactId> <scope>test</scope>
<classifier>tests</classifier> </dependency>
<scope>test</scope> </dependencies>
</dependency>
</dependencies> </project>
</project>

28
common/common-lang/pom.xml
View File

@ -1,18 +1,16 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.twelvemonkeys.common</groupId> <groupId>com.twelvemonkeys.common</groupId>
<artifactId>common</artifactId> <artifactId>common</artifactId>
<version>3.0-SNAPSHOT</version> <version>3.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>common-lang</artifactId> <artifactId>common-lang</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>TwelveMonkeys :: Common :: Language support</name> <name>TwelveMonkeys :: Common :: Language support</name>
<description> <description>
The TwelveMonkeys Common Language support The TwelveMonkeys Common Language support
</description> </description>
</project> </project>

110
common/pom.xml
View File

@ -1,56 +1,54 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <modelVersion>4.0.0</modelVersion>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent>
<modelVersion>4.0.0</modelVersion> <groupId>com.twelvemonkeys</groupId>
<parent> <artifactId>twelvemonkeys</artifactId>
<groupId>com.twelvemonkeys</groupId> <version>3.0-SNAPSHOT</version>
<artifactId>twelvemonkeys</artifactId> </parent>
<version>3.0-SNAPSHOT</version> <groupId>com.twelvemonkeys.common</groupId>
</parent> <artifactId>common</artifactId>
<groupId>com.twelvemonkeys.common</groupId> <packaging>pom</packaging>
<artifactId>common</artifactId> <name>TwelveMonkeys :: Common</name>
<packaging>pom</packaging> <description>
<name>TwelveMonkeys :: Common</name> The TwelveMonkeys Common library. Contains common utility classes.
<description> </description>
The TwelveMonkeys Common library. Contains common utility classes.
</description> <modules>
<module>common-lang</module>
<modules> <module>common-io</module>
<module>common-lang</module> <module>common-image</module>
<module>common-io</module> </modules>
<module>common-image</module>
</modules> <dependencyManagement>
<dependencies>
<dependencyManagement> <dependency>
<dependencies> <groupId>${project.groupId}</groupId>
<dependency> <artifactId>common-lang</artifactId>
<groupId>${project.groupId}</groupId> <version>${project.version}</version>
<artifactId>common-lang</artifactId> </dependency>
<version>${project.version}</version>
</dependency> <dependency>
<groupId>${project.groupId}</groupId>
<dependency> <artifactId>common-lang</artifactId>
<groupId>${project.groupId}</groupId> <version>${project.version}</version>
<artifactId>common-lang</artifactId> <classifier>tests</classifier>
<version>${project.version}</version> <scope>test</scope>
<classifier>tests</classifier> </dependency>
<scope>test</scope>
</dependency> <dependency>
<groupId>${project.groupId}</groupId>
<dependency> <artifactId>common-io</artifactId>
<groupId>${project.groupId}</groupId> <version>${project.version}</version>
<artifactId>common-io</artifactId> </dependency>
<version>${project.version}</version> </dependencies>
</dependency> </dependencyManagement>
</dependencies> <dependencies>
</dependencyManagement> <dependency>
<dependencies> <groupId>junit</groupId>
<dependency> <artifactId>junit</artifactId>
<groupId>junit</groupId> <version>4.7</version>
<artifactId>junit</artifactId> <scope>test</scope>
<version>4.7</version> </dependency>
<scope>test</scope> </dependencies>
</dependency> </project>
</dependencies>
</project>

120
imageio/imageio-batik/pom.xml
View File

@ -1,64 +1,62 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <modelVersion>4.0.0</modelVersion>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio</artifactId> <artifactId>imageio</artifactId>
<version>3.0-SNAPSHOT</version> <version>3.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>imageio-batik</artifactId> <artifactId>imageio-batik</artifactId>
<name>TwelveMonkeys :: ImageIO :: Batik Plugin</name> <name>TwelveMonkeys :: ImageIO :: Batik Plugin</name>
<description> <description>
<![CDATA[ <![CDATA[
ImageIO wrapper for the Batik SVG Toolkit, enabling Scalable Vector Graphics (SVG) support. ImageIO wrapper for the Batik SVG Toolkit, enabling Scalable Vector Graphics (SVG) support.
See the <a href="http://xmlgraphics.apache.org/batik/">Batik Home page</a> See the <a href="http://xmlgraphics.apache.org/batik/">Batik Home page</a>
for more information.]]> for more information.]]>
</description> </description>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio-core</artifactId> <artifactId>imageio-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio-core</artifactId> <artifactId>imageio-core</artifactId>
<classifier>tests</classifier> <classifier>tests</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>batik</groupId> <groupId>batik</groupId>
<artifactId>batik-rasterizer-ext</artifactId> <artifactId>batik-rasterizer-ext</artifactId>
<version>1.6-1</version> <version>1.6-1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>batik</groupId> <groupId>batik</groupId>
<artifactId>batik-svggen</artifactId> <artifactId>batik-svggen</artifactId>
<version>1.6-1</version> <version>1.6-1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>batik</groupId> <groupId>batik</groupId>
<artifactId>batik-transcoder</artifactId> <artifactId>batik-transcoder</artifactId>
<version>1.6-1</version> <version>1.6-1</version>
<scope>provided</scope> <scope>provided</scope>
<!-- <!--
There seems to be some weirdness in the There seems to be some weirdness in the
Batik/FOP poms (Batik depends on FOP 0.20-5) that screws things up, Batik/FOP poms (Batik depends on FOP 0.20-5) that screws things up,
making everything end up depending on Batik 1.5, not 1.6 making everything end up depending on Batik 1.5, not 1.6
--> -->
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>fop</groupId> <groupId>fop</groupId>
<artifactId>fop</artifactId> <artifactId>fop</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

22
imageio/imageio-core/pom.xml
View File

@ -1,14 +1,12 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <modelVersion>4.0.0</modelVersion>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio</artifactId> <artifactId>imageio</artifactId>
<version>3.0-SNAPSHOT</version> <version>3.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>imageio-core</artifactId> <artifactId>imageio-core</artifactId>
<name>TwelveMonkeys :: ImageIO :: Core</name> <name>TwelveMonkeys :: ImageIO :: Core</name>
</project> </project>

1
imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/color/ColorSpaces.java
View File

@ -157,6 +157,7 @@ public final class ColorSpaces {
* to avoid unnecessary array copying. * to avoid unnecessary array copying.
*/ */
private static boolean fixProfileXYZTag(ICC_Profile profile, final int tagSignature) { private static boolean fixProfileXYZTag(ICC_Profile profile, final int tagSignature) {
// TODO: This blows up on OpenJDK... Bug?
byte[] data = profile.getData(tagSignature); byte[] data = profile.getData(tagSignature);
// The CMM expects 0x64 65 73 63 ('XYZ ') but is 0x17 A5 05 B8..? // The CMM expects 0x64 65 73 63 ('XYZ ') but is 0x17 A5 05 B8..?

46
imageio/imageio-icns/pom.xml
View File

@ -1,26 +1,24 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <modelVersion>4.0.0</modelVersion>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio</artifactId> <artifactId>imageio</artifactId>
<version>3.0-SNAPSHOT</version> <version>3.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>imageio-icns</artifactId> <artifactId>imageio-icns</artifactId>
<name>TwelveMonkeys :: ImageIO :: ICNS plugin</name> <name>TwelveMonkeys :: ImageIO :: ICNS plugin</name>
<description>ImageIO plugin for Apple Icon Image (icns) format.</description> <description>ImageIO plugin for Apple Icon Image (icns) format.</description>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio-core</artifactId> <artifactId>imageio-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio-core</artifactId> <artifactId>imageio-core</artifactId>
<classifier>tests</classifier> <classifier>tests</classifier>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

46
imageio/imageio-ico/pom.xml
View File

@ -1,26 +1,24 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <modelVersion>4.0.0</modelVersion>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio</artifactId> <artifactId>imageio</artifactId>
<version>3.0-SNAPSHOT</version> <version>3.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>imageio-ico</artifactId> <artifactId>imageio-ico</artifactId>
<name>TwelveMonkeys :: ImageIO :: ICO plugin</name> <name>TwelveMonkeys :: ImageIO :: ICO plugin</name>
<description>ImageIO plugin for Windows Icon (ICO) and Cursor (CUR) format.</description> <description>ImageIO plugin for Windows Icon (ICO) and Cursor (CUR) format.</description>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio-core</artifactId> <artifactId>imageio-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio-core</artifactId> <artifactId>imageio-core</artifactId>
<classifier>tests</classifier> <classifier>tests</classifier>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

4
imageio/imageio-iff/pom.xml
View File

@ -1,7 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>

4
imageio/imageio-jmagick/pom.xml
View File

@ -1,7 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>

44
imageio/imageio-jpeg/pom.xml
View File

@ -1,28 +1,26 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <modelVersion>4.0.0</modelVersion>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio</artifactId> <artifactId>imageio</artifactId>
<version>3.0-SNAPSHOT</version> <version>3.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>imageio-jpeg</artifactId> <artifactId>imageio-jpeg</artifactId>
<name>TwelveMonkeys :: ImageIO :: JPEG plugin</name> <name>TwelveMonkeys :: ImageIO :: JPEG plugin</name>
<description> <description>
ImageIO plugin for Joint Photographer Expert Group images (JPEG/JFIF). ImageIO plugin for Joint Photographer Expert Group images (JPEG/JFIF).
</description> </description>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio-core</artifactId> <artifactId>imageio-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio-core</artifactId> <artifactId>imageio-core</artifactId>
<classifier>tests</classifier> <classifier>tests</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>

21
imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java
View File

@ -212,7 +212,7 @@ public class JPEGImageReader extends ImageReaderBase {
@Override @Override
public Iterator<ImageTypeSpecifier> getImageTypes(int imageIndex) throws IOException { public Iterator<ImageTypeSpecifier> getImageTypes(int imageIndex) throws IOException {
Iterator<ImageTypeSpecifier> types = delegate.getImageTypes(imageIndex); Iterator<ImageTypeSpecifier> types = delegate.getImageTypes(imageIndex);
JPEGColorSpace csType = getSourceCSType(getAdobeDCT(), getSOF()); JPEGColorSpace csType = getSourceCSType(getJFIF(), getAdobeDCT(), getSOF());
if (types == null || !types.hasNext() || csType == JPEGColorSpace.CMYK || csType == JPEGColorSpace.YCCK) { if (types == null || !types.hasNext() || csType == JPEGColorSpace.CMYK || csType == JPEGColorSpace.YCCK) {
ArrayList<ImageTypeSpecifier> typeList = new ArrayList<ImageTypeSpecifier>(); ArrayList<ImageTypeSpecifier> typeList = new ArrayList<ImageTypeSpecifier>();
@ -266,7 +266,7 @@ public class JPEGImageReader extends ImageReaderBase {
} }
// Otherwise, consult the image metadata // Otherwise, consult the image metadata
JPEGColorSpace csType = getSourceCSType(getAdobeDCT(), getSOF()); JPEGColorSpace csType = getSourceCSType(getJFIF(), getAdobeDCT(), getSOF());
switch (csType) { switch (csType) {
case CMYK: case CMYK:
@ -318,7 +318,7 @@ public class JPEGImageReader extends ImageReaderBase {
ICC_Profile profile = getEmbeddedICCProfile(false); ICC_Profile profile = getEmbeddedICCProfile(false);
AdobeDCTSegment adobeDCT = getAdobeDCT(); AdobeDCTSegment adobeDCT = getAdobeDCT();
SOFSegment sof = getSOF(); SOFSegment sof = getSOF();
JPEGColorSpace sourceCSType = getSourceCSType(adobeDCT, sof); JPEGColorSpace sourceCSType = getSourceCSType(getJFIF(), adobeDCT, sof);
// We need to apply ICC profile unless the profile is sRGB/default gray (whatever that is) // We need to apply ICC profile unless the profile is sRGB/default gray (whatever that is)
// - or only filter out the bad ICC profiles in the JPEGSegmentImageInputStream. // - or only filter out the bad ICC profiles in the JPEGSegmentImageInputStream.
@ -438,7 +438,7 @@ public class JPEGImageReader extends ImageReaderBase {
// Unfortunately looping is slower than reading all at once, but // Unfortunately looping is slower than reading all at once, but
// that requires 2 x memory or more, so a few steps is an ok compromise I guess // that requires 2 x memory or more, so a few steps is an ok compromise I guess
try { try {
final int step = Math.max(1024, srcRegion.height / 10); // * param.getSourceYSubsampling(); // TODO: Using a multiple of 8 is probably a good idea for JPEG final int step = Math.max(1024, srcRegion.height / 10); // TODO: Using a multiple of 8 is probably a good idea for JPEG
final int srcMaxY = srcRegion.y + srcRegion.height; final int srcMaxY = srcRegion.y + srcRegion.height;
int destY = dstRegion.y; int destY = dstRegion.y;
@ -452,6 +452,11 @@ public class JPEGImageReader extends ImageReaderBase {
// Let the progress delegator handle progress, using corrected range // Let the progress delegator handle progress, using corrected range
progressDelegator.updateProgressRange(100f * (y + scan) / srcRegion.height); progressDelegator.updateProgressRange(100f * (y + scan) / srcRegion.height);
// Make sure subsampling is within bounds
if (scan <= param.getSubsamplingYOffset()) {
param.setSourceSubsampling(param.getSourceXSubsampling(), param.getSourceYSubsampling(), param.getSubsamplingXOffset(), scan - 1);
}
Rectangle subRegion = new Rectangle(srcRegion.x, y, srcRegion.width, scan); Rectangle subRegion = new Rectangle(srcRegion.x, y, srcRegion.width, scan);
param.setSourceRegion(subRegion); param.setSourceRegion(subRegion);
Raster raster = delegate.readRaster(imageIndex, param); // non-converted Raster raster = delegate.readRaster(imageIndex, param); // non-converted
@ -503,7 +508,7 @@ public class JPEGImageReader extends ImageReaderBase {
return image; return image;
} }
static JPEGColorSpace getSourceCSType(AdobeDCTSegment adobeDCT, final SOFSegment startOfFrame) throws IIOException { static JPEGColorSpace getSourceCSType(JFIFSegment jfif, AdobeDCTSegment adobeDCT, final SOFSegment startOfFrame) throws IIOException {
/* /*
ADAPTED from http://download.oracle.com/javase/6/docs/api/javax/imageio/metadata/doc-files/jpeg_metadata.html: ADAPTED from http://download.oracle.com/javase/6/docs/api/javax/imageio/metadata/doc-files/jpeg_metadata.html:
@ -590,7 +595,7 @@ public class JPEGImageReader extends ImageReaderBase {
} }
} }
return JPEGColorSpace.RGB; return jfif != null ? JPEGColorSpace.YCbCr : JPEGColorSpace.RGB;
} }
case 4: case 4:
if (startOfFrame.components[0].id == 1 && startOfFrame.components[1].id == 2 && startOfFrame.components[2].id == 3 && startOfFrame.components[3].id == 4) { if (startOfFrame.components[0].id == 1 && startOfFrame.components[1].id == 2 && startOfFrame.components[2].id == 3 && startOfFrame.components[3].id == 4) {
@ -633,10 +638,10 @@ public class JPEGImageReader extends ImageReaderBase {
// See ColorConvertOp#filter(Raster, WritableRaster) // See ColorConvertOp#filter(Raster, WritableRaster)
if (profile != null && profile.getProfileClass() != ICC_Profile.CLASS_DISPLAY) { if (profile != null && profile.getProfileClass() != ICC_Profile.CLASS_DISPLAY) {
byte[] profileData = profile.getData(); // Need to clone entire profile, due to a JDK 7 bug byte[] profileData = profile.getData(); // Need to clone entire profile, due to a OpenJDK bug
if (profileData[ICC_Profile.icHdrRenderingIntent] == ICC_Profile.icPerceptual) { if (profileData[ICC_Profile.icHdrRenderingIntent] == ICC_Profile.icPerceptual) {
processWarningOccurred("ICC profile is Perceptual but Display class, treating as Display class"); processWarningOccurred("ICC profile is Perceptual, ignoring, treating as Display class");
intToBigEndian(ICC_Profile.icSigDisplayClass, profileData, ICC_Profile.icHdrDeviceClass); // Header is first intToBigEndian(ICC_Profile.icSigDisplayClass, profileData, ICC_Profile.icHdrDeviceClass); // Header is first

143
imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
View File

@ -30,6 +30,7 @@ package com.twelvemonkeys.imageio.plugins.jpeg;
import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase; import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase;
import org.hamcrest.core.IsInstanceOf; import org.hamcrest.core.IsInstanceOf;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.mockito.internal.matchers.GreaterThan; import org.mockito.internal.matchers.GreaterThan;
import org.w3c.dom.Element; import org.w3c.dom.Element;
@ -329,6 +330,32 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTestCase<JPEGImageRe
verify(warningListener).warningOccurred(eq(reader), anyString()); verify(warningListener).warningOccurred(eq(reader), anyString());
} }
@Test
public void testYCbCrNotSubsampledNonstandardChannelIndexes() throws IOException {
// Regression: Make sure 3 channel, non-subsampled JFIF, defaults to YCbCr, even if unstandard channel indexes
JPEGImageReader reader = createReader();
reader.setInput(ImageIO.createImageInputStream(getClassLoaderResource("/jpeg/jfif-ycbcr-no-subsampling-intel.jpg")));
assertEquals(600, reader.getWidth(0));
assertEquals(600, reader.getHeight(0));
ImageReadParam param = reader.getDefaultReadParam();
param.setSourceRegion(new Rectangle(8, 8));
BufferedImage image = reader.read(0, param);
assertNotNull(image);
assertEquals(8, image.getWidth());
assertEquals(8, image.getHeight());
// QnD test: Make sure all pixels are white (if treated as RGB, they will be pink-ish)
for (int y = 0; y < image.getHeight(); y++) {
for (int x = 0; x < image.getWidth(); x++) {
assertEquals(0xffffff, image.getRGB(x, y) & 0xffffff);
}
}
}
@Test @Test
public void testCorbisRGB() throws IOException { public void testCorbisRGB() throws IOException {
// Special case, throws exception below without special treatment // Special case, throws exception below without special treatment
@ -659,6 +686,122 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTestCase<JPEGImageRe
} }
} }
// Regression: Test subsampling offset within of bounds
// NOTE: These tests assumes the reader will read at least 1024 scanlines (if available) each iteration,
// this might change in the future. If so, the tests will no longer test what tey are supposed to....
@Test
public void testReadSubsamplingBounds1028() throws IOException {
JPEGImageReader reader = createReader();
reader.setInput(ImageIO.createImageInputStream(getClassLoaderResource("/jpeg/read-error1028.jpg")));
ImageReadParam param = reader.getDefaultReadParam();
param.setSourceSubsampling(3, 3, 1, 1);
BufferedImage image = reader.read(0, param);
assertNotNull(image);
}
@Ignore
@Test
public void testReadSubsamplingNotSkippingLines1028() throws IOException {
JPEGImageReader reader = createReader();
reader.setInput(ImageIO.createImageInputStream(getClassLoaderResource("/jpeg/read-error1028.jpg")));
ImageReadParam param = reader.getDefaultReadParam();
param.setSourceSubsampling(3, 3, 1, 1);
BufferedImage image = reader.read(0, param);
assertNotNull(image);
// Make sure correct color is actually read, not just left empty
assertEquals(0xfefefd, image.getRGB(0, image.getHeight() - 2) & 0xffffff);
assertEquals(0xfefefd, image.getRGB(0, image.getHeight() - 1) & 0xffffff);
}
@Test
public void testReadSubsamplingBounds1027() throws IOException {
JPEGImageReader reader = createReader();
reader.setInput(ImageIO.createImageInputStream(getClassLoaderResource("/jpeg/read-error1027.jpg")));
ImageReadParam param = reader.getDefaultReadParam();
param.setSourceSubsampling(3, 3, 2, 2);
BufferedImage image = reader.read(0, param);
assertNotNull(image);
// Make sure correct color is actually read, not just left empty
assertEquals(0xfefefd, image.getRGB(0, image.getHeight() - 2) & 0xffffff);
assertEquals(0xfefefd, image.getRGB(0, image.getHeight() - 1) & 0xffffff);
}
@Test
public void testReadSubsamplingBounds1026() throws IOException {
JPEGImageReader reader = createReader();
reader.setInput(ImageIO.createImageInputStream(getClassLoaderResource("/jpeg/read-error1026.jpg")));
ImageReadParam param = reader.getDefaultReadParam();
param.setSourceSubsampling(3, 3, 1, 1);
BufferedImage image = reader.read(0, param);
assertNotNull(image);
// Make sure correct color is actually read, not just left empty
assertEquals(0xfefefd, image.getRGB(0, image.getHeight() - 2) & 0xffffff);
assertEquals(0xfefefd, image.getRGB(0, image.getHeight() - 1) & 0xffffff);
}
@Test
public void testReadSubsamplingBounds1025() throws IOException {
JPEGImageReader reader = createReader();
reader.setInput(ImageIO.createImageInputStream(getClassLoaderResource("/jpeg/read-error1025.jpg")));
ImageReadParam param = reader.getDefaultReadParam();
param.setSourceSubsampling(3, 3, 1, 1);
BufferedImage image = reader.read(0, param);
assertNotNull(image);
}
@Ignore
@Test
public void testReadSubsamplingNotSkippingLines1025() throws IOException {
JPEGImageReader reader = createReader();
reader.setInput(ImageIO.createImageInputStream(getClassLoaderResource("/jpeg/read-error1025.jpg")));
ImageReadParam param = reader.getDefaultReadParam();
param.setSourceSubsampling(3, 3, 1, 1);
BufferedImage image = reader.read(0, param);
assertNotNull(image);
// Make sure correct color is actually read, not just left empty
assertEquals(0xfefefd, image.getRGB(0, image.getHeight() - 2) & 0xffffff);
assertEquals(0xfefefd, image.getRGB(0, image.getHeight() - 1) & 0xffffff);
}
@Test
public void testReadSubsamplingBounds1024() throws IOException {
JPEGImageReader reader = createReader();
reader.setInput(ImageIO.createImageInputStream(getClassLoaderResource("/jpeg/read-error1024.jpg")));
ImageReadParam param = reader.getDefaultReadParam();
param.setSourceSubsampling(3, 3, 1, 1);
BufferedImage image = reader.read(0, param);
assertNotNull(image);
// Make sure correct color is actually read, not just left empty
assertEquals(0xfefefd, image.getRGB(0, image.getHeight() - 2) & 0xffffff);
assertEquals(0xfefefd, image.getRGB(0, image.getHeight() - 1) & 0xffffff);
}
@Test @Test
public void testXDensityOutOfRangeIssue() throws IOException { public void testXDensityOutOfRangeIssue() throws IOException {
// Image has JFIF with x/y density 0 // Image has JFIF with x/y density 0

BIN
imageio/imageio-jpeg/src/test/resources/jpeg/jfif-ycbcr-no-subsampling-intel.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 40 KiB

4
imageio/imageio-metadata/pom.xml
View File

@ -1,7 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio</artifactId> <artifactId>imageio</artifactId>

48
imageio/imageio-pdf/pom.xml
View File

@ -1,29 +1,27 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <modelVersion>4.0.0</modelVersion>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio</artifactId> <artifactId>imageio</artifactId>
<version>3.0-SNAPSHOT</version> <version>3.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>imageio-pdf</artifactId> <artifactId>imageio-pdf</artifactId>
<name>TwelveMonkeys :: ImageIO :: PDF plugin</name> <name>TwelveMonkeys :: ImageIO :: PDF plugin</name>
<description> <description>
ImageIO plugin for Adobe Portable Document Format (PDF). ImageIO plugin for Adobe Portable Document Format (PDF).
</description> </description>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio-core</artifactId> <artifactId>imageio-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio-core</artifactId> <artifactId>imageio-core</artifactId>
<classifier>tests</classifier> <classifier>tests</classifier>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

48
imageio/imageio-pict/pom.xml
View File

@ -1,27 +1,25 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <modelVersion>4.0.0</modelVersion>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio</artifactId> <artifactId>imageio</artifactId>
<version>3.0-SNAPSHOT</version> <version>3.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>imageio-pict</artifactId> <artifactId>imageio-pict</artifactId>
<name>TwelveMonkeys :: ImageIO :: PICT plugin</name> <name>TwelveMonkeys :: ImageIO :: PICT plugin</name>
<description>ImageIO plugin for Apple Mac Paint Picture (PICT) format.</description> <description>ImageIO plugin for Apple Mac Paint Picture (PICT) format.</description>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio-core</artifactId> <artifactId>imageio-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio-core</artifactId> <artifactId>imageio-core</artifactId>
<classifier>tests</classifier> <classifier>tests</classifier>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

44
imageio/imageio-psd/pom.xml
View File

@ -1,28 +1,26 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <modelVersion>4.0.0</modelVersion>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio</artifactId> <artifactId>imageio</artifactId>
<version>3.0-SNAPSHOT</version> <version>3.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>imageio-psd</artifactId> <artifactId>imageio-psd</artifactId>
<name>TwelveMonkeys :: ImageIO :: PSD plugin</name> <name>TwelveMonkeys :: ImageIO :: PSD plugin</name>
<description> <description>
ImageIO plugin for Adobe Photoshop Document (PSD). ImageIO plugin for Adobe Photoshop Document (PSD).
</description> </description>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio-core</artifactId> <artifactId>imageio-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio-core</artifactId> <artifactId>imageio-core</artifactId>
<classifier>tests</classifier> <classifier>tests</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>

4
imageio/imageio-reference/pom.xml
View File

@ -1,7 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>

4
imageio/imageio-thumbsdb/pom.xml
View File

@ -1,7 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>

4
imageio/imageio-tiff/pom.xml
View File

@ -1,7 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>

4
imageio/pom.xml
View File

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<groupId>com.twelvemonkeys</groupId> <groupId>com.twelvemonkeys</groupId>
<artifactId>twelvemonkeys</artifactId> <artifactId>twelvemonkeys</artifactId>

428
pom.xml
View File

@ -1,212 +1,216 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <modelVersion>4.0.0</modelVersion>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent>
<modelVersion>4.0.0</modelVersion> <groupId>org.sonatype.oss</groupId>
<groupId>com.twelvemonkeys</groupId> <artifactId>oss-parent</artifactId>
<artifactId>twelvemonkeys</artifactId> <version>7</version>
<version>3.0-SNAPSHOT</version> </parent>
<packaging>pom</packaging> <groupId>com.twelvemonkeys</groupId>
<name>Twelvemonkeys</name> <artifactId>twelvemonkeys</artifactId>
<version>3.0-SNAPSHOT</version>
<modules> <packaging>pom</packaging>
<module>common</module> <name>Twelvemonkeys</name>
<module>servlet</module>
<module>imageio</module> <modules>
<!--<module>swing</module>--> <module>common</module>
<!--<module>sandbox</module>--> <module>servlet</module>
</modules> <module>imageio</module>
<!--<module>swing</module>-->
<developers> <!--<module>sandbox</module>-->
<developer> </modules>
<id>harald.kuhr</id>
<name>Harald Kuhr</name> <developers>
<email>harald.kuhr@gmail.com</email> <developer>
<organization>Twelvemonkeys</organization> <id>harald.kuhr</id>
<roles> <name>Harald Kuhr</name>
<role>project-owner</role> <email>harald.kuhr@gmail.com</email>
<role>developer</role> <organization>Twelvemonkeys</organization>
</roles> <roles>
</developer> <role>project-owner</role>
</developers> <role>developer</role>
</roles>
<contributors> </developer>
<contributor> </developers>
<name>Erlend Hamnaberg</name>
<email>erlend@hamnaberg.net</email> <contributors>
<roles> <contributor>
<role>maven-guru</role> <name>Erlend Hamnaberg</name>
</roles> <email>erlend@hamnaberg.net</email>
</contributor> <roles>
</contributors> <role>maven-guru</role>
</roles>
<properties> </contributor>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </contributors>
</properties>
<scm>
<build> <connection>scm:git:https://github.com/haraldk/TwelveMonkeys</connection>
<finalName>twelvemonkeys-${project.artifactId}-${project.version}</finalName> <developerConnection>scm:git:https://github.com/haraldk/TwelveMonkeys</developerConnection>
<plugins> <url>https://github.com/haraldk/TwelveMonkeys</url>
<plugin> <tag>HEAD</tag>
<groupId>org.apache.maven.plugins</groupId> </scm>
<artifactId>maven-jar-plugin</artifactId>
<configuration> <properties>
<archive> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<manifestEntries> </properties>
<Implementation-Title>twelvemonkeys-${project.artifactId}</Implementation-Title>
<Implementation-Vendor>TwelveMonkeys</Implementation-Vendor> <build>
<Implementation-Version>${project.version}</Implementation-Version> <finalName>twelvemonkeys-${project.artifactId}-${project.version}</finalName>
<Implementation-URL>http://github.com/haraldk/TwelveMonkeys</Implementation-URL> <plugins>
</manifestEntries> <plugin>
</archive> <groupId>org.apache.maven.plugins</groupId>
</configuration> <artifactId>maven-jar-plugin</artifactId>
</plugin> <configuration>
</plugins> <archive>
<manifestEntries>
<pluginManagement> <Implementation-Title>twelvemonkeys-${project.artifactId}</Implementation-Title>
<plugins> <Implementation-Vendor>TwelveMonkeys</Implementation-Vendor>
<plugin> <Implementation-Version>${project.version}</Implementation-Version>
<groupId>org.apache.maven.plugins</groupId> <Implementation-URL>http://github.com/haraldk/TwelveMonkeys</Implementation-URL>
<artifactId>maven-resources-plugin</artifactId> </manifestEntries>
<version>2.5</version> </archive>
<configuration> </configuration>
<encoding>UTF-8</encoding> </plugin>
</configuration> </plugins>
</plugin>
<plugin> <pluginManagement>
<groupId>org.apache.maven.plugins</groupId> <plugins>
<artifactId>maven-jar-plugin</artifactId> <plugin>
<version>2.4</version> <groupId>org.apache.maven.plugins</groupId>
<inherited>true</inherited> <artifactId>maven-resources-plugin</artifactId>
<executions> <version>2.5</version>
<execution> <configuration>
<phase>package</phase> <encoding>UTF-8</encoding>
<id>attach-tests</id> </configuration>
<goals> </plugin>
<goal>test-jar</goal> <plugin>
</goals> <groupId>org.apache.maven.plugins</groupId>
</execution> <artifactId>maven-jar-plugin</artifactId>
</executions> <version>2.4</version>
</plugin> <inherited>true</inherited>
<plugin> <executions>
<groupId>org.apache.maven.plugins</groupId> <execution>
<artifactId>maven-source-plugin</artifactId> <phase>package</phase>
<version>2.2.1</version> <id>attach-tests</id>
<inherited>true</inherited> <goals>
<!-- THIS DOES NOT WORK..?! --> <goal>test-jar</goal>
<executions> </goals>
<execution> </execution>
<phase>package</phase> </executions>
<id>attach-sources</id> </plugin>
<goals> <plugin>
<goal>jar</goal> <groupId>org.apache.maven.plugins</groupId>
<goal>test-jar</goal> <artifactId>maven-javadoc-plugin</artifactId>
</goals> <version>2.9.1</version>
</execution> </plugin>
</executions> <plugin>
</plugin> <groupId>org.apache.maven.plugins</groupId>
<plugin> <artifactId>maven-source-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId> <version>2.2.1</version>
<artifactId>maven-compiler-plugin</artifactId> <inherited>true</inherited>
<version>2.3.2</version> <!-- THIS DOES NOT WORK..?! -->
<inherited>true</inherited> <executions>
<configuration> <execution>
<source>1.5</source> <phase>package</phase>
<target>1.5</target> <id>attach-sources</id>
<showDeprecation>false</showDeprecation> <goals>
<compilerArgument>-g:lines</compilerArgument> <goal>jar</goal>
<compilerArguments> <goal>test-jar</goal>
<encoding>iso-8859-1</encoding> </goals>
</compilerArguments> </execution>
</configuration> </executions>
</plugin> </plugin>
<plugin>
<plugin> <groupId>org.apache.maven.plugins</groupId>
<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId>
<artifactId>maven-surefire-plugin</artifactId> <version>2.3.2</version>
<version>2.10</version> <inherited>true</inherited>
<configuration> <configuration>
<systemProperties> <source>1.5</source>
<property> <target>1.5</target>
<name>java.awt.headless</name> <showDeprecation>false</showDeprecation>
<value>true</value> <compilerArgument>-g:lines</compilerArgument>
</property> <compilerArguments>
</systemProperties> <encoding>iso-8859-1</encoding>
</configuration> </compilerArguments>
</plugin> </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId> <plugin>
<artifactId>maven-idea-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<inherited>true</inherited> <artifactId>maven-surefire-plugin</artifactId>
<version>2.2</version> <version>2.10</version>
<configuration> <configuration>
<jdkName>1.5</jdkName> <systemProperties>
<jdkLevel>1.5</jdkLevel> <property>
<downloadSources>true</downloadSources> <name>java.awt.headless</name>
</configuration> <value>true</value>
</plugin> </property>
</plugins> </systemProperties>
</configuration>
</pluginManagement> </plugin>
<extensions> <plugin>
<extension> <groupId>org.apache.maven.plugins</groupId>
<groupId>org.jvnet.wagon-svn</groupId> <artifactId>maven-idea-plugin</artifactId>
<artifactId>wagon-svn</artifactId> <inherited>true</inherited>
<version>1.9</version> <version>2.2</version>
</extension> <configuration>
</extensions> <jdkName>1.5</jdkName>
<jdkLevel>1.5</jdkLevel>
</build> <downloadSources>true</downloadSources>
</configuration>
<reporting> </plugin>
<plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-release-plugin</artifactId>
<version>2.9.1</version> <version>2.4.2</version>
</plugin> <dependencies>
<plugin> <dependency>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.scm</groupId>
<artifactId>maven-surefire-report-plugin</artifactId> <artifactId>maven-scm-provider-gitexe</artifactId>
<version>2.16</version> <version>1.9</version>
</plugin> </dependency>
<plugin> </dependencies>
<groupId>org.codehaus.mojo</groupId> </plugin>
<artifactId>cobertura-maven-plugin</artifactId> </plugins>
<version>2.6</version>
</plugin> </pluginManagement>
<plugin>
<groupId>org.apache.maven.plugins</groupId> </build>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.0.1</version> <reporting>
<configuration> <plugins>
<targetJdk>1.5</targetJdk> <plugin>
</configuration> <groupId>org.apache.maven.plugins</groupId>
</plugin> <artifactId>maven-javadoc-plugin</artifactId>
<plugin> <version>2.9.1</version>
<groupId>org.apache.maven.plugins</groupId> </plugin>
<artifactId>maven-checkstyle-plugin</artifactId> <plugin>
<version>2.10</version> <groupId>org.apache.maven.plugins</groupId>
</plugin> <artifactId>maven-surefire-report-plugin</artifactId>
</plugins> <version>2.16</version>
</reporting> </plugin>
<plugin>
<repositories> <groupId>org.codehaus.mojo</groupId>
<repository> <artifactId>cobertura-maven-plugin</artifactId>
<id>maven2-repository.dev.java.net</id> <version>2.6</version>
<name>Java.net Repository for Maven</name> </plugin>
<url>http://download.java.net/maven/2/</url> <plugin>
<layout>default</layout> <groupId>org.apache.maven.plugins</groupId>
</repository> <artifactId>maven-pmd-plugin</artifactId>
</repositories> <version>3.0.1</version>
<configuration>
<distributionManagement> <targetJdk>1.5</targetJdk>
<repository> </configuration>
<id>java.net-m2-repository</id> </plugin>
<url>java-net:/maven2-repository/trunk/repository/</url> <plugin>
</repository> <groupId>org.apache.maven.plugins</groupId>
</distributionManagement> <artifactId>maven-checkstyle-plugin</artifactId>
<version>2.10</version>
</project> </plugin>
</plugins>
</reporting>
</project>

4
servlet/pom.xml
View File

@ -1,7 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<groupId>com.twelvemonkeys</groupId> <groupId>com.twelvemonkeys</groupId>
<artifactId>twelvemonkeys</artifactId> <artifactId>twelvemonkeys</artifactId>