Changeset 6127 in josm for trunk/src/com/drew/metadata/jpeg/JpegComponent.java

Timestamp:

2013-08-09T18:05:11+02:00 (12 years ago)

Author:

bastiK

Message:

applied #8895 - Upgrade metadata-extractor to v. 2.6.4 (patch by ebourg)

File:

• trunk/src/com/drew/metadata/jpeg/JpegComponent.java (modified) (3 diffs)

trunk/src/com/drew/metadata/jpeg/JpegComponent.java

@@ -1 +1 @@
 /*
- * This is public domain software - that is, you can do whatever you want
- * with it, and include it software that is licensed under the GNU or the
- * BSD license, or whatever other licence you choose, including proprietary
- * closed source licenses.  I do ask that you leave this header in tact.
+ * Copyright 2002-2012 Drew Noakes
  *
- * If you make modifications to this code that you think would benefit the
- * wider community, please send me a copy and I'll post it on my site.
+ *    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
  *
- * If you make use of this code, I'd appreciate hearing about it.
- *   drew@drewnoakes.com
- * Latest version of this software kept at
- *   http://drewnoakes.com/
+ *        http://www.apache.org/licenses/LICENSE-2.0
  *
- * Created by dnoakes on Oct 9, 17:04:07 using IntelliJ IDEA.
+ *    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.
+ *
+ * More information about this project is available at:
+ *
+ *    http://drewnoakes.com/code/exif/
+ *    http://code.google.com/p/metadata-extractor/
  */
 package com.drew.metadata.jpeg;
 
-import com.drew.metadata.MetadataException;
+import com.drew.lang.annotations.Nullable;
 
 import java.io.Serializable;
 
 /**
- * Created by IntelliJ IDEA.
- * User: dnoakes
- * Date: 09-Oct-2003
- * Time: 17:04:07
- * To change this template use Options | File Templates.
+ * Stores information about a Jpeg image component such as the component id, horiz/vert sampling factor and
+ * quantization table number.
+ *
+ * @author Drew Noakes http://drewnoakes.com
  */
 public class JpegComponent implements Serializable
 {
+    private static final long serialVersionUID = 61121257899091914L;
+
     private final int _componentId;
     private final int _samplingFactorByte;
@@ -46 +51 @@
     }
 
-    public String getComponentName() throws MetadataException
+    /**
+     * Returns the component name (one of: Y, Cb, Cr, I, or Q)
+     * @return the component name
+     */
+    @Nullable
+    public String getComponentName()
     {
         switch (_componentId)
@@ -61 +71 @@
                 return "Q";
         }
-
-        throw new MetadataException("Unsupported component id: " + _componentId);
+        return null;
     }