Merge branch 'develop' of https://github.com/EasyinnovaSL/Tiff-Librar…

…y-4J into develop
openpreserve · May 30, 2017 · 954ab44 · 954ab44
2 parents 3cb5c49 + cc3a392
commit 954ab44
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 8 deletions.
diff --git a/src/main/java/com/easyinnova/tiff/model/TagValue.java b/src/main/java/com/easyinnova/tiff/model/TagValue.java
@@ -239,7 +239,27 @@ public int getCardinality() {
    */
   public long getFirstNumericValue() {
     String val = (value != null) ? value.get(0).toString() : readValue.get(0).toString();
-    return Long.parseLong(val);
+    if (isInteger(val)) {
+      return Long.parseLong(val);
+    } else {
+      return 0;
+    }
+  }
+
+  boolean isInteger(String s) {
+    return isInteger(s,10);
+  }
+
+  boolean isInteger(String s, int radix) {
+    if(s.isEmpty()) return false;
+    for(int i = 0; i < s.length(); i++) {
+      if(i == 0 && s.charAt(i) == '-') {
+        if(s.length() == 1) return false;
+        else continue;
+      }
+      if(Character.digit(s.charAt(i),radix) < 0) return false;
+    }
+    return true;
   }
 
   /**

diff --git a/src/main/resources/tifftags/ColorMap.json b/src/main/resources/tifftags/ColorMap.json
@@ -10,5 +10,6 @@
   "description": "",
   "source": "",
   "created": "18/05/2015",
-  "modified": "18/05/2015"
+  "modified": "18/05/2015",
+  "forceDescription": ""
 }
diff --git a/src/main/resources/tifftags/ColorMatrix1.json b/src/main/resources/tifftags/ColorMatrix1.json
@@ -10,5 +10,6 @@
   "description": "",
   "source": "",
   "created": "18/05/2015",
-  "modified": "18/05/2015"
+  "modified": "18/05/2015",
+  "forceDescription": ""
 }
diff --git a/src/main/resources/tifftags/ColorMatrix2.json b/src/main/resources/tifftags/ColorMatrix2.json
@@ -10,5 +10,6 @@
   "description": "",
   "source": "",
   "created": "18/05/2015",
-  "modified": "18/05/2015"
+  "modified": "18/05/2015",
+  "forceDescription": ""
 }
diff --git a/src/main/resources/tifftags/JPEGTables.json b/src/main/resources/tifftags/JPEGTables.json
@@ -10,5 +10,6 @@
   "description": "",
   "source": "",
   "created": "18/05/2015",
-  "modified": "18/05/2015"
+  "modified": "18/05/2015",
+  "forceDescription": ""
 }
diff --git a/src/main/resources/tifftags/ReductionMatrix1.json b/src/main/resources/tifftags/ReductionMatrix1.json
@@ -10,5 +10,6 @@
   "description": "",
   "source": "",
   "created": "18/05/2015",
-  "modified": "18/05/2015"
+  "modified": "18/05/2015",
+  "forceDescription": ""
 }
diff --git a/src/main/resources/tifftags/ReductionMatrix2.json b/src/main/resources/tifftags/ReductionMatrix2.json
@@ -10,5 +10,6 @@
   "description": "",
   "source": "",
   "created": "18/05/2015",
-  "modified": "18/05/2015"
+  "modified": "18/05/2015",
+  "forceDescription": ""
 }
diff --git a/src/main/resources/tifftags/TransferFunction.json b/src/main/resources/tifftags/TransferFunction.json
@@ -10,5 +10,6 @@
   "description": "",
   "source": "",
   "created": "18/05/2015",
-  "modified": "18/05/2015"
+  "modified": "18/05/2015",
+  "forceDescription": ""
 }