Changeset 15012 for gli/trunk/src/org/greenstone/gatherer
- Timestamp:
- 2008-02-27T16:28:31+13:00 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gli/trunk/src/org/greenstone/gatherer/Gatherer.java
r14974 r15012 1160 1160 //new way of detection of ImageMagick 1161 1161 InputStreamReader isr = new InputStreamReader(image_magick_process.getInputStream()); 1162 1162 1163 BufferedReader br = new BufferedReader(isr); 1163 1164 // Capture the standard output stream and seach for two particular occurances: Version and ImageMagick. 1164 String line = br.readLine().toLowerCase(); 1165 if (line.indexOf("version") != -1 || line.indexOf("imagemagick") != -1) { 1165 1166 String line = br.readLine(); 1167 if (line == null) { 1168 return false; 1169 } 1170 String lc_line = line.toLowerCase(); 1171 if (lc_line.indexOf("version") != -1 || lc_line.indexOf("imagemagick") != -1) { 1166 1172 return true; 1167 1173 } else { 1168 1174 return false; 1169 1175 } 1176 1170 1177 //return (image_magick_process.exitValue() == 0); 1171 1178 }
Note:
See TracChangeset
for help on using the changeset viewer.