Mercurial > hg > octave-image

changeset 178:555d933113b6 Octave-Forge-2006.03.17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Imagemagick interface is broken for PNGs. Use pngread and jpgread in the meantime.
author sjvdw
date Mon, 27 Feb 2006 12:46:40 +0000
parents 36e459515715
children b4f5a702f92c
files imread.m
diffstat 1 files changed, 10 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/imread.m
+++ b/imread.m
@@ -45,11 +45,8 @@
 
 
     [ig, ig, ext] = fileparts(fn);
-    ext = upper(ext);
-    if ( file_in_loadpath("__magick_read__.oct") )
-        varargout{:} = __magick_read__(fn, varargin{:});
-        break
-    endif
+    ext = upper(ext);    
+    
     ## divert jpegs and pngs to "jpgread" and "pngread"
     if ( file_in_loadpath("jpgread.oct") &&
 	(strcmp(ext, ".JPG") || strcmp(ext, ".JPEG")) )
@@ -59,8 +56,14 @@
     if ( file_in_loadpath("pngread.oct") && (strcmp(ext, ".PNG")) )
 	varargout{1} = pngread(fn);
 	break
-    endif	
-
+    endif
+    
+    ## alternately, use imagemagick
+    if ( file_in_loadpath("__magick_read__.oct") )
+      varargout{:} = __magick_read__(fn, varargin{:});
+      break
+    endif
+    
     [ident, sys] = system(sprintf('identify -verbose %s | grep -e "Red: " -e Type',
 				  fn));
     if (sys != 0)