Escape backslashes when finding a pattern. Closes #634.

ome · Jan 4, 2011 · 344fc41 · 344fc41
1 parent 48a5c38
commit 344fc41
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/components/bio-formats/src/loci/formats/FilePattern.java b/components/bio-formats/src/loci/formats/FilePattern.java
@@ -437,6 +437,14 @@ else if (p == null) {
       }
     }
     sb.append(q > 0 ? name.substring(endList[q - 1]) : name);
+
+    for (int i=0; i<sb.length(); i++) {
+      if (sb.charAt(i) == '\\') {
+        sb.insert(i, '\\');
+        i++;
+      }
+    }
+
     return sb.toString();
   }
 
@@ -560,6 +568,11 @@ private void buildFiles(String prefix, int ndx, List<String> fileList) {
     if (blocks.length == 0) {
       // regex pattern
 
+      if (new Location(pattern).exists()) {
+        fileList.add(pattern);
+        return;
+      }
+
       String[] files = null;
       int end = pattern.lastIndexOf(File.separator) + 1;
       String dir = pattern.substring(0, end);