You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by je...@apache.org on 2006/07/28 18:01:56 UTC
svn commit: r426584 [2/4] - in /xmlgraphics/commons/trunk: ./
examples/java/java2d/ps/ examples/java/xmp/ src/documentation/
src/documentation/classes/ src/documentation/content/
src/documentation/content/xdocs/ src/documentation/resources/images/ src/...
Modified: xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/util/ImageIODebugUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/util/ImageIODebugUtil.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/util/ImageIODebugUtil.java (original)
+++ xmlgraphics/commons/trunk/src/java-1.4/org/apache/xmlgraphics/util/ImageIODebugUtil.java Fri Jul 28 09:01:47 2006
@@ -1,56 +1,57 @@
-/*
-
- Copyright 2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- */
-package org.apache.xmlgraphics.util;
-
-import javax.imageio.metadata.IIOMetadata;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.w3c.dom.Node;
-
-/**
- * Helper class for debugging stuff in Image I/O.
- *
- * @version $Id$
- */
-public class ImageIODebugUtil {
-
- public static void dumpMetadata(IIOMetadata meta) {
- String format = meta.getNativeMetadataFormatName();
- Node node = meta.getAsTree(format);
- dumpNode(node);
- }
-
- public static void dumpNode(Node node) {
- try {
- TransformerFactory tf = TransformerFactory.newInstance();
- Transformer t = tf.newTransformer();
- Source src = new DOMSource(node);
- Result res = new StreamResult(System.out);
- t.transform(src, res);
- System.out.println();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
-}
+/*
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
+package org.apache.xmlgraphics.util;
+
+import javax.imageio.metadata.IIOMetadata;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.w3c.dom.Node;
+
+/**
+ * Helper class for debugging stuff in Image I/O.
+ *
+ * @version $Id$
+ */
+public class ImageIODebugUtil {
+
+ public static void dumpMetadata(IIOMetadata meta) {
+ String format = meta.getNativeMetadataFormatName();
+ Node node = meta.getAsTree(format);
+ dumpNode(node);
+ }
+
+ public static void dumpNode(Node node) {
+ try {
+ TransformerFactory tf = TransformerFactory.newInstance();
+ Transformer t = tf.newTransformer();
+ Source src = new DOMSource(node);
+ Result res = new StreamResult(System.out);
+ t.transform(src, res);
+ System.out.println();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+}
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/fonts/Glyphs.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/fonts/Glyphs.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/fonts/Glyphs.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/fonts/Glyphs.java Fri Jul 28 09:01:47 2006
@@ -1,9 +1,10 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/GraphicsUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/GraphicsUtil.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/GraphicsUtil.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/GraphicsUtil.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001-2004,2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGDecodeParam.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGDecodeParam.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGDecodeParam.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGDecodeParam.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGEncodeParam.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGEncodeParam.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGEncodeParam.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGEncodeParam.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001,2003 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGImageDecoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGImageDecoder.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGImageDecoder.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGImageDecoder.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001,2003,2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGImageEncoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGImageEncoder.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGImageEncoder.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGImageEncoder.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001,2003 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGRed.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGRed.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGRed.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGRed.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001-2003,2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGSuggestedPaletteEntry.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGSuggestedPaletteEntry.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGSuggestedPaletteEntry.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGSuggestedPaletteEntry.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFDecodeParam.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFDecodeParam.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFDecodeParam.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFDecodeParam.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFDirectory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFDirectory.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFDirectory.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFDirectory.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001,2003 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFEncodeParam.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFEncodeParam.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFEncodeParam.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFEncodeParam.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001,2003 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFFaxDecoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFFaxDecoder.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFFaxDecoder.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFFaxDecoder.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001,2003 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFField.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFField.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFField.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFField.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImage.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImage.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImage.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001,2003 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImageDecoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImageDecoder.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImageDecoder.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImageDecoder.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001,2003 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImageEncoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImageEncoder.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImageEncoder.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImageEncoder.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001-2003 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFLZWDecoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFLZWDecoder.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFLZWDecoder.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFLZWDecoder.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 1999-2003 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/FileCacheSeekableStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/FileCacheSeekableStream.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/FileCacheSeekableStream.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/FileCacheSeekableStream.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001,2003 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ForwardSeekableStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ForwardSeekableStream.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ForwardSeekableStream.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ForwardSeekableStream.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001,2003 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageDecodeParam.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageDecodeParam.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageDecodeParam.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageDecodeParam.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageDecoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageDecoder.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageDecoder.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageDecoder.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001,2003 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageDecoderImpl.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageDecoderImpl.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageDecoderImpl.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageDecoderImpl.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001,2003 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageEncodeParam.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageEncodeParam.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageEncodeParam.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageEncodeParam.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageEncoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageEncoder.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageEncoder.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageEncoder.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageEncoderImpl.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageEncoderImpl.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageEncoderImpl.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageEncoderImpl.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/MemoryCacheSeekableStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/MemoryCacheSeekableStream.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/MemoryCacheSeekableStream.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/MemoryCacheSeekableStream.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001,2003 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/PropertyUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/PropertyUtil.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/PropertyUtil.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/PropertyUtil.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001,2003,2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/SeekableOutputStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/SeekableOutputStream.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/SeekableOutputStream.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/SeekableOutputStream.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/SeekableStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/SeekableStream.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/SeekableStream.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/SeekableStream.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001,2003 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/SimpleRenderedImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/SimpleRenderedImage.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/SimpleRenderedImage.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/SimpleRenderedImage.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001,2003 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/SingleTileRenderedImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/SingleTileRenderedImage.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/SingleTileRenderedImage.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/SingleTileRenderedImage.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 1999-2003 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/AbstractRed.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/AbstractRed.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/AbstractRed.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/AbstractRed.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001,2003,2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/Any2sRGBRed.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/Any2sRGBRed.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/Any2sRGBRed.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/Any2sRGBRed.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001,2003 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/BufferedImageCachableRed.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/BufferedImageCachableRed.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/BufferedImageCachableRed.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/BufferedImageCachableRed.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001,2003 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/CachableRed.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/CachableRed.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/CachableRed.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/CachableRed.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001,2003 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/FormatRed.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/FormatRed.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/FormatRed.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/FormatRed.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001,2003 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/RenderedImageCachableRed.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/RenderedImageCachableRed.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/RenderedImageCachableRed.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/rendered/RenderedImageCachableRed.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001,2003 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriter.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriter.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriter.java Fri Jul 28 09:01:47 2006
@@ -1,54 +1,55 @@
-/*
-
- Copyright 2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- */
-package org.apache.xmlgraphics.image.writer;
-
-import java.awt.image.RenderedImage;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * Interface which allows image library independent image writing.
- *
- * @version $Id$
- */
-public interface ImageWriter {
-
- /**
- * Encodes an image and writes it to an OutputStream.
- * @param image the image to be encoded
- * @param out the OutputStream to write to
- * @throws IOException In case of an /IO problem
- */
- public void writeImage(RenderedImage image, OutputStream out)
- throws IOException;
-
- /**
- * Encodes an image and writes it to an OutputStream.
- * @param image the image to be encoded
- * @param out the OutputStream to write to
- * @param params a parameters object to customize the encoding.
- * @throws IOException In case of an /IO problem
- */
- public void writeImage(RenderedImage image, OutputStream out,
- ImageWriterParams params)
- throws IOException;
-
- /** @return the target MIME type supported by this ImageWriter */
- public String getMIMEType();
-
-}
+/*
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
+package org.apache.xmlgraphics.image.writer;
+
+import java.awt.image.RenderedImage;
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * Interface which allows image library independent image writing.
+ *
+ * @version $Id$
+ */
+public interface ImageWriter {
+
+ /**
+ * Encodes an image and writes it to an OutputStream.
+ * @param image the image to be encoded
+ * @param out the OutputStream to write to
+ * @throws IOException In case of an /IO problem
+ */
+ public void writeImage(RenderedImage image, OutputStream out)
+ throws IOException;
+
+ /**
+ * Encodes an image and writes it to an OutputStream.
+ * @param image the image to be encoded
+ * @param out the OutputStream to write to
+ * @param params a parameters object to customize the encoding.
+ * @throws IOException In case of an /IO problem
+ */
+ public void writeImage(RenderedImage image, OutputStream out,
+ ImageWriterParams params)
+ throws IOException;
+
+ /** @return the target MIME type supported by this ImageWriter */
+ public String getMIMEType();
+
+}
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriterParams.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriterParams.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriterParams.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriterParams.java Fri Jul 28 09:01:47 2006
@@ -1,93 +1,94 @@
-/*
-
- Copyright 2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- */
-package org.apache.xmlgraphics.image.writer;
-
-/**
- * Parameters for the encoder which is accessed through the
- * ImageWriter interface.
- *
- * @version $Id$
- */
-public class ImageWriterParams {
-
- private Integer resolution;
- private Float jpegQuality;
- private Boolean jpegForceBaseline;
- private String compressionMethod;
-
- /**
- * Default constructor.
- */
- public ImageWriterParams() {
- //nop
- }
-
- /**
- * @return the image resolution in dpi, or null if undefined
- */
- public Integer getResolution() {
- return this.resolution;
- }
-
- /**
- * @return the quality value for encoding a JPEG image
- * (0.0-1.0), or null if undefined
- */
- public Float getJPEGQuality() {
- return this.jpegQuality;
- }
-
- /**
- * @return true if the baseline quantization table is forced,
- * or null if undefined.
- */
- public Boolean getJPEGForceBaseline() {
- return this.jpegForceBaseline;
- }
-
- /** @return the compression method for encoding the image */
- public String getCompressionMethod() {
- return this.compressionMethod;
- }
-
- /**
- * Sets the target resolution of the bitmap image to be written.
- * @param dpi the resolution in dpi
- */
- public void setResolution(int dpi) {
- this.resolution = new Integer(dpi);
- }
-
- /**
- * Sets the quality setting for encoding JPEG images.
- * @param quality the quality setting (0.0-1.0)
- * @param forceBaseline force baseline quantization table
- */
- public void setJPEGQuality(float quality, boolean forceBaseline) {
- this.jpegQuality = new Float(quality);
- this.jpegForceBaseline = forceBaseline ? Boolean.TRUE : Boolean.FALSE;
- }
-
- /**
- * Set the compression method that shall be used to encode the image.
- * @param method the compression method
- */
- public void setCompressionMethod(String method) {
- this.compressionMethod = method;
- }
-}
+/*
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
+package org.apache.xmlgraphics.image.writer;
+
+/**
+ * Parameters for the encoder which is accessed through the
+ * ImageWriter interface.
+ *
+ * @version $Id$
+ */
+public class ImageWriterParams {
+
+ private Integer resolution;
+ private Float jpegQuality;
+ private Boolean jpegForceBaseline;
+ private String compressionMethod;
+
+ /**
+ * Default constructor.
+ */
+ public ImageWriterParams() {
+ //nop
+ }
+
+ /**
+ * @return the image resolution in dpi, or null if undefined
+ */
+ public Integer getResolution() {
+ return this.resolution;
+ }
+
+ /**
+ * @return the quality value for encoding a JPEG image
+ * (0.0-1.0), or null if undefined
+ */
+ public Float getJPEGQuality() {
+ return this.jpegQuality;
+ }
+
+ /**
+ * @return true if the baseline quantization table is forced,
+ * or null if undefined.
+ */
+ public Boolean getJPEGForceBaseline() {
+ return this.jpegForceBaseline;
+ }
+
+ /** @return the compression method for encoding the image */
+ public String getCompressionMethod() {
+ return this.compressionMethod;
+ }
+
+ /**
+ * Sets the target resolution of the bitmap image to be written.
+ * @param dpi the resolution in dpi
+ */
+ public void setResolution(int dpi) {
+ this.resolution = new Integer(dpi);
+ }
+
+ /**
+ * Sets the quality setting for encoding JPEG images.
+ * @param quality the quality setting (0.0-1.0)
+ * @param forceBaseline force baseline quantization table
+ */
+ public void setJPEGQuality(float quality, boolean forceBaseline) {
+ this.jpegQuality = new Float(quality);
+ this.jpegForceBaseline = forceBaseline ? Boolean.TRUE : Boolean.FALSE;
+ }
+
+ /**
+ * Set the compression method that shall be used to encode the image.
+ * @param method the compression method
+ */
+ public void setCompressionMethod(String method) {
+ this.compressionMethod = method;
+ }
+}
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriterRegistry.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriterRegistry.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriterRegistry.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriterRegistry.java Fri Jul 28 09:01:47 2006
@@ -1,149 +1,150 @@
-/*
-
- Copyright 2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- */
-package org.apache.xmlgraphics.image.writer;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Properties;
-
-import org.apache.xmlgraphics.util.Service;
-
-/**
- * Registry for ImageWriter implementations. They are primarily registered through the "Service
- * Provider" mechanism.
- * @see org.apache.xmlgraphics.util.Service
- */
-public class ImageWriterRegistry {
-
- private static ImageWriterRegistry instance;
-
- private Map imageWriterMap = new HashMap();
- private Map preferredOrder;
-
- /**
- * Default constructor. The default preferred order for the image writers is loaded from the
- * resources.
- */
- public ImageWriterRegistry() {
- Properties props = new Properties();
- InputStream in = getClass().getResourceAsStream("default-preferred-order.properties");
- if (in != null) {
- try {
- try {
- props.load(in);
- } finally {
- in.close();
- }
- } catch (IOException ioe) {
- throw new RuntimeException(
- "Could not load default preferred order due to I/O error: "
- + ioe.getMessage());
- }
- }
- this.preferredOrder = props;
- setup();
- }
-
- /**
- * Special constructor. The preferred order for the image writers can be specified as a
- * Map (for example a Properties file). The entries of the Map consists of fully qualified
- * class or package names as keys and integer numbers as values. Zero (0) is the default
- * priority.
- */
- public ImageWriterRegistry(Properties preferredOrder) {
- this.preferredOrder = preferredOrder;
- setup();
- }
-
- /** @return a singleton instance of the ImageWriterRegistry. */
- public static ImageWriterRegistry getInstance() {
- if (instance == null) {
- instance = new ImageWriterRegistry();
- }
- return instance;
- }
-
- private void setup() {
- Iterator iter = Service.providers(ImageWriter.class);
- while (iter.hasNext()) {
- ImageWriter writer = (ImageWriter)iter.next();
- register(writer);
- }
- }
-
- private int getPriority(ImageWriter writer) {
- String key = writer.getClass().getName();
- Object value = preferredOrder.get(key);
- while (value == null) {
- int pos = key.lastIndexOf(".");
- if (pos < 0) {
- break;
- }
- key = key.substring(0, pos);
- value = preferredOrder.get(key);
- }
- return (value != null) ? Integer.parseInt(value.toString()) : 0;
- }
-
- /**
- * Registers a new ImageWriter implementation in the registry. If an ImageWriter for the same
- * target MIME type has already been registered, it is overwritten with the new one.
- * @param writer the ImageWriter instance to register.
- */
- public void register(ImageWriter writer) {
- List entries = (List)imageWriterMap.get(writer.getMIMEType());
- if (entries == null) {
- entries = new java.util.ArrayList();
- imageWriterMap.put(writer.getMIMEType(), entries);
- }
-
- int priority = getPriority(writer);
- ListIterator li;
- li = entries.listIterator();
- while (li.hasNext()) {
- ImageWriter w = (ImageWriter)li.next();
- if (getPriority(w) > priority) {
- li.previous();
- li.add(writer);
- return;
- }
- }
- li.add(writer);
- }
-
- /**
- * Returns an ImageWriter that can be used to encode an image to the requested MIME type.
- * @param mime the MIME type of the desired output format
- * @return an ImageWriter instance handling the desired output format or null if none can be
- * found.
- */
- public ImageWriter getWriterFor(String mime) {
- List entries = (List)imageWriterMap.get(mime);
- if (entries == null) {
- return null;
- } else {
- return (ImageWriter)entries.get(0);
- }
- }
-
-}
+/*
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
+package org.apache.xmlgraphics.image.writer;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Properties;
+
+import org.apache.xmlgraphics.util.Service;
+
+/**
+ * Registry for ImageWriter implementations. They are primarily registered through the "Service
+ * Provider" mechanism.
+ * @see org.apache.xmlgraphics.util.Service
+ */
+public class ImageWriterRegistry {
+
+ private static ImageWriterRegistry instance;
+
+ private Map imageWriterMap = new HashMap();
+ private Map preferredOrder;
+
+ /**
+ * Default constructor. The default preferred order for the image writers is loaded from the
+ * resources.
+ */
+ public ImageWriterRegistry() {
+ Properties props = new Properties();
+ InputStream in = getClass().getResourceAsStream("default-preferred-order.properties");
+ if (in != null) {
+ try {
+ try {
+ props.load(in);
+ } finally {
+ in.close();
+ }
+ } catch (IOException ioe) {
+ throw new RuntimeException(
+ "Could not load default preferred order due to I/O error: "
+ + ioe.getMessage());
+ }
+ }
+ this.preferredOrder = props;
+ setup();
+ }
+
+ /**
+ * Special constructor. The preferred order for the image writers can be specified as a
+ * Map (for example a Properties file). The entries of the Map consists of fully qualified
+ * class or package names as keys and integer numbers as values. Zero (0) is the default
+ * priority.
+ */
+ public ImageWriterRegistry(Properties preferredOrder) {
+ this.preferredOrder = preferredOrder;
+ setup();
+ }
+
+ /** @return a singleton instance of the ImageWriterRegistry. */
+ public static ImageWriterRegistry getInstance() {
+ if (instance == null) {
+ instance = new ImageWriterRegistry();
+ }
+ return instance;
+ }
+
+ private void setup() {
+ Iterator iter = Service.providers(ImageWriter.class);
+ while (iter.hasNext()) {
+ ImageWriter writer = (ImageWriter)iter.next();
+ register(writer);
+ }
+ }
+
+ private int getPriority(ImageWriter writer) {
+ String key = writer.getClass().getName();
+ Object value = preferredOrder.get(key);
+ while (value == null) {
+ int pos = key.lastIndexOf(".");
+ if (pos < 0) {
+ break;
+ }
+ key = key.substring(0, pos);
+ value = preferredOrder.get(key);
+ }
+ return (value != null) ? Integer.parseInt(value.toString()) : 0;
+ }
+
+ /**
+ * Registers a new ImageWriter implementation in the registry. If an ImageWriter for the same
+ * target MIME type has already been registered, it is overwritten with the new one.
+ * @param writer the ImageWriter instance to register.
+ */
+ public void register(ImageWriter writer) {
+ List entries = (List)imageWriterMap.get(writer.getMIMEType());
+ if (entries == null) {
+ entries = new java.util.ArrayList();
+ imageWriterMap.put(writer.getMIMEType(), entries);
+ }
+
+ int priority = getPriority(writer);
+ ListIterator li;
+ li = entries.listIterator();
+ while (li.hasNext()) {
+ ImageWriter w = (ImageWriter)li.next();
+ if (getPriority(w) > priority) {
+ li.previous();
+ li.add(writer);
+ return;
+ }
+ }
+ li.add(writer);
+ }
+
+ /**
+ * Returns an ImageWriter that can be used to encode an image to the requested MIME type.
+ * @param mime the MIME type of the desired output format
+ * @return an ImageWriter instance handling the desired output format or null if none can be
+ * found.
+ */
+ public ImageWriter getWriterFor(String mime) {
+ List entries = (List)imageWriterMap.get(mime);
+ if (entries == null) {
+ return null;
+ } else {
+ return (ImageWriter)entries.get(0);
+ }
+ }
+
+}
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/internal/JPEGImageWriter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/internal/JPEGImageWriter.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/internal/JPEGImageWriter.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/internal/JPEGImageWriter.java Fri Jul 28 09:01:47 2006
@@ -1,82 +1,83 @@
-/*
-
- Copyright 2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- */
-package org.apache.xmlgraphics.image.writer.internal;
-
-import java.awt.image.BufferedImage;
-import java.awt.image.RenderedImage;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.xmlgraphics.image.GraphicsUtil;
-import org.apache.xmlgraphics.image.writer.ImageWriter;
-import org.apache.xmlgraphics.image.writer.ImageWriterParams;
-
-import com.sun.image.codec.jpeg.JPEGCodec;
-import com.sun.image.codec.jpeg.JPEGEncodeParam;
-import com.sun.image.codec.jpeg.JPEGImageEncoder;
-
-/**
- * ImageWriter implementation that uses the sun.com.image.codec.jpeg
- * intefaces to write JPEG files.
- *
- * @version $Id$
- */
-public class JPEGImageWriter implements ImageWriter {
-
- /**
- * @see ImageWriter#writeImage(java.awt.image.RenderedImage, java.io.OutputStream)
- */
- public void writeImage(RenderedImage image, OutputStream out)
- throws IOException {
- writeImage(image, out, null);
- }
-
- /**
- * @see ImageWriter#writeImage(java.awt.image.RenderedImage, java.io.OutputStream, ImageWriterParams)
- */
- public void writeImage(RenderedImage image, OutputStream out,
- ImageWriterParams params) throws IOException {
- BufferedImage bi;
- if (image instanceof BufferedImage) {
- bi = (BufferedImage)image;
- } else {
- //TODO Is this the right way?
- bi = GraphicsUtil.makeLinearBufferedImage(
- image.getWidth(), image.getHeight(), false);
- }
- JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(out);
- if (params != null) {
- JPEGEncodeParam param = encoder.getDefaultJPEGEncodeParam(bi);
- if (params.getJPEGQuality() != null) {
- param.setQuality(
- params.getJPEGQuality().floatValue(),
- params.getJPEGForceBaseline().booleanValue());
- }
- encoder.encode(bi, param);
- } else {
- encoder.encode(bi);
- }
- }
-
- /**
- * @see ImageWriter#getMIMEType()
- */
- public String getMIMEType() {
- return "image/jpeg";
- }
-}
+/*
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
+package org.apache.xmlgraphics.image.writer.internal;
+
+import java.awt.image.BufferedImage;
+import java.awt.image.RenderedImage;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import org.apache.xmlgraphics.image.GraphicsUtil;
+import org.apache.xmlgraphics.image.writer.ImageWriter;
+import org.apache.xmlgraphics.image.writer.ImageWriterParams;
+
+import com.sun.image.codec.jpeg.JPEGCodec;
+import com.sun.image.codec.jpeg.JPEGEncodeParam;
+import com.sun.image.codec.jpeg.JPEGImageEncoder;
+
+/**
+ * ImageWriter implementation that uses the sun.com.image.codec.jpeg
+ * intefaces to write JPEG files.
+ *
+ * @version $Id$
+ */
+public class JPEGImageWriter implements ImageWriter {
+
+ /**
+ * @see ImageWriter#writeImage(java.awt.image.RenderedImage, java.io.OutputStream)
+ */
+ public void writeImage(RenderedImage image, OutputStream out)
+ throws IOException {
+ writeImage(image, out, null);
+ }
+
+ /**
+ * @see ImageWriter#writeImage(java.awt.image.RenderedImage, java.io.OutputStream, ImageWriterParams)
+ */
+ public void writeImage(RenderedImage image, OutputStream out,
+ ImageWriterParams params) throws IOException {
+ BufferedImage bi;
+ if (image instanceof BufferedImage) {
+ bi = (BufferedImage)image;
+ } else {
+ //TODO Is this the right way?
+ bi = GraphicsUtil.makeLinearBufferedImage(
+ image.getWidth(), image.getHeight(), false);
+ }
+ JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(out);
+ if (params != null) {
+ JPEGEncodeParam param = encoder.getDefaultJPEGEncodeParam(bi);
+ if (params.getJPEGQuality() != null) {
+ param.setQuality(
+ params.getJPEGQuality().floatValue(),
+ params.getJPEGForceBaseline().booleanValue());
+ }
+ encoder.encode(bi, param);
+ } else {
+ encoder.encode(bi);
+ }
+ }
+
+ /**
+ * @see ImageWriter#getMIMEType()
+ */
+ public String getMIMEType() {
+ return "image/jpeg";
+ }
+}
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/internal/PNGImageWriter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/internal/PNGImageWriter.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/internal/PNGImageWriter.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/internal/PNGImageWriter.java Fri Jul 28 09:01:47 2006
@@ -1,59 +1,60 @@
-/*
-
- Copyright 2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- */
-package org.apache.xmlgraphics.image.writer.internal;
-
-import java.awt.image.RenderedImage;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.xmlgraphics.image.codec.png.PNGImageEncoder;
-import org.apache.xmlgraphics.image.writer.ImageWriter;
-import org.apache.xmlgraphics.image.writer.ImageWriterParams;
-
-/**
- * ImageWriter implementation that uses Batik's PNG codec to
- * write PNG files.
- *
- * @version $Id$
- */
-public class PNGImageWriter implements ImageWriter {
-
- /**
- * @see ImageWriter#writeImage(java.awt.image.RenderedImage, java.io.OutputStream)
- */
- public void writeImage(RenderedImage image, OutputStream out)
- throws IOException {
- writeImage(image, out, null);
- }
-
- /**
- * @see ImageWriter#writeImage(java.awt.image.RenderedImage, java.io.OutputStream, ImageWriterParams)
- */
- public void writeImage(RenderedImage image, OutputStream out,
- ImageWriterParams params) throws IOException {
- PNGImageEncoder encoder = new PNGImageEncoder(out, null);
- encoder.encode(image);
- }
-
- /**
- * @see ImageWriter#getMIMEType()
- */
- public String getMIMEType() {
- return "image/png";
- }
-}
+/*
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
+package org.apache.xmlgraphics.image.writer.internal;
+
+import java.awt.image.RenderedImage;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import org.apache.xmlgraphics.image.codec.png.PNGImageEncoder;
+import org.apache.xmlgraphics.image.writer.ImageWriter;
+import org.apache.xmlgraphics.image.writer.ImageWriterParams;
+
+/**
+ * ImageWriter implementation that uses Batik's PNG codec to
+ * write PNG files.
+ *
+ * @version $Id$
+ */
+public class PNGImageWriter implements ImageWriter {
+
+ /**
+ * @see ImageWriter#writeImage(java.awt.image.RenderedImage, java.io.OutputStream)
+ */
+ public void writeImage(RenderedImage image, OutputStream out)
+ throws IOException {
+ writeImage(image, out, null);
+ }
+
+ /**
+ * @see ImageWriter#writeImage(java.awt.image.RenderedImage, java.io.OutputStream, ImageWriterParams)
+ */
+ public void writeImage(RenderedImage image, OutputStream out,
+ ImageWriterParams params) throws IOException {
+ PNGImageEncoder encoder = new PNGImageEncoder(out, null);
+ encoder.encode(image);
+ }
+
+ /**
+ * @see ImageWriter#getMIMEType()
+ */
+ public String getMIMEType() {
+ return "image/png";
+ }
+}
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/AbstractGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/AbstractGraphics2D.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/AbstractGraphics2D.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/AbstractGraphics2D.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001,2003 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/DefaultGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/DefaultGraphics2D.java?rev=426584&r1=426583&r2=426584&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/DefaultGraphics2D.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/DefaultGraphics2D.java Fri Jul 28 09:01:47 2006
@@ -1,10 +1,11 @@
/*
- Copyright 2001,2003 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
---------------------------------------------------------------------
Apache XML Graphics Project URL: http://xmlgraphics.apache.org/
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org