[Octave-cvsupdate] octave-forge/main/image imginfo.m,1.4,1.5 imread.m,1.19,1.20 imwrite.m,1.10,1.11

[Quentin S. <qsp...@us...>]

Update of /cvsroot/octave/octave-forge/main/image
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9677/main/image

Modified Files:
	imginfo.m imread.m imwrite.m 
Log Message:
Change calls to 'system' function to reflect new ordering of output arguments.

Index: imread.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/image/imread.m,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- imread.m	27 Feb 2006 12:46:40 -0000	1.19
+++ imread.m	22 Mar 2006 17:50:47 -0000	1.20
@@ -64,7 +64,7 @@
       break
     endif
     
-    [ident, sys] = system(sprintf('identify -verbose %s | grep -e "Red: " -e Type',
+    [sys, ident] = system(sprintf('identify -verbose %s | grep -e "Red: " -e Type',
 				  fn));
     if (sys != 0)
 	error("imread: error running ImageMagick's 'identify' on %s", fn)
@@ -98,7 +98,7 @@
     cmd = sprintf("convert -flatten -strip +compress '%s' '%s' 2>/dev/null",
 		  fn, tmpf);
 
-    [ignored, sys] = system(cmd);    
+    sys = system(cmd);    
     if (sys != 0)
 	error("imread: error running ImageMagick's 'convert'");
 	unlink(tmpf);

Index: imginfo.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/image/imginfo.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- imginfo.m	25 May 2005 03:43:40 -0000	1.4
+++ imginfo.m	22 Mar 2006 17:50:47 -0000	1.5
@@ -28,7 +28,7 @@
 
 function [h,w] = imginfo (fn)
 
-[res,status] = system(sprintf("convert -verbose '%s' /dev/null",fn),1);
+[status, res] = system(sprintf("convert -verbose '%s' /dev/null",fn),1);
 
 if status,
   error (["imginfo : 'convert' exited with status %i ",\

Index: imwrite.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/image/imwrite.m,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- imwrite.m	8 Sep 2005 02:00:17 -0000	1.10
+++ imwrite.m	22 Mar 2006 17:50:47 -0000	1.11
@@ -221,7 +221,7 @@
 
    fclose(fid);
    if ~usepipe
-      [jnk,retcode] = system(cmd);
+      retcode = system(cmd);
       if retcode !=0 
          error('could not call imagemagick convert');
       end
@@ -235,6 +235,9 @@
 
 #
 # $Log$
+# Revision 1.11  2006/03/22 17:50:47  qspencer
+# Change calls to 'system' function to reflect new ordering of output arguments.
+#
 # Revision 1.10  2005/09/08 02:00:17  pkienzle
 # [for Bill Denney] isstr -> ischar
 #