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

Timestamp:

2016-08-20T20:58:03+02:00 (10 years ago)

Author:

Don-vip

Message:

update to metadata-extractor 2.9.1

File:

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

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

@@ -1 +1 @@
 /*
- * Copyright 2002-2015 Drew Noakes
+ * Copyright 2002-2016 Drew Noakes
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -21 +21 @@
 package com.drew.metadata.jpeg;
 
-import com.drew.lang.annotations.Nullable;
+import com.drew.lang.annotations.NotNull;
 
 import java.io.Serializable;
@@ -55 +55 @@
      * @return the component name
      */
-    @Nullable
+    @NotNull
     public String getComponentName()
     {
@@ -70 +70 @@
             case 5:
                 return "Q";
+            default:
+                return String.format("Unknown (%s)", _componentId);
         }
-        return null;
     }
 
@@ -81 +82 @@
     public int getHorizontalSamplingFactor()
     {
-        return _samplingFactorByte & 0x0F;
+        return (_samplingFactorByte>>4) & 0x0F;
     }
 
     public int getVerticalSamplingFactor()
     {
-        return (_samplingFactorByte>>4) & 0x0F;
+        return _samplingFactorByte & 0x0F;
     }
 }