Merge pull request #1299 from emilroz/CZI_empty_string_fix

Fix empty string error
ome · Sep 2, 2014 · 7291d94 · 7291d94
2 parents f5b52fe + 603099d
commit 7291d94
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/components/formats-gpl/src/loci/formats/in/ZeissCZIReader.java b/components/formats-gpl/src/loci/formats/in/ZeissCZIReader.java
@@ -1446,29 +1446,29 @@ else if ("Filament".equals(type)) {
           if (gain == null) {
             gain = getFirstNodeValue(detector, "Gain");
           }
-          if (gain != null) {
+          if (gain != null && !gain.equals("")) {
             store.setDetectorGain(new Double(gain), 0, i);
           }
 
           String offset = getFirstNodeValue(detector, "Offset");
-          if (offset != null) {
+          if (offset != null && !offset.equals("")) {
             store.setDetectorOffset(new Double(offset), 0, i);
           }
 
           if (zoom == null) {
             zoom = getFirstNodeValue(detector, "Zoom");
           }
-          if (zoom != null) {
+          if (zoom != null && !zoom.equals("")) {
             store.setDetectorZoom(new Double(zoom), 0, i);
           }
 
           String ampGain = getFirstNodeValue(detector, "AmplificationGain");
-          if (ampGain != null) {
+          if (ampGain != null && !ampGain.equals("")) {
             store.setDetectorAmplificationGain(new Double(ampGain), 0, i);
           }
 
           String detectorType = getFirstNodeValue(detector, "Type");
-          if (detectorType != null) {
+          if (detectorType != null && !detectorType.equals("")) {
             store.setDetectorType(getDetectorType(detectorType), 0, i);
           }
         }