[Octave-cvsupdate] SF.net SVN: octave:[10189] trunk/octave-forge/main/image

[<car...@us...>]

Revision: 10189
          http://octave.svn.sourceforge.net/octave/?rev=10189&view=rev
Author:   carandraug
Date:     2012-04-11 14:08:27 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
im2double: added support for binary images (patch by Martin Helm <ma...@mh...>)

Modified Paths:
--------------
    trunk/octave-forge/main/image/NEWS
    trunk/octave-forge/main/image/inst/im2double.m

Modified: trunk/octave-forge/main/image/NEWS
===================================================================
--- trunk/octave-forge/main/image/NEWS	2012-04-11 13:34:25 UTC (rev 10188)
+++ trunk/octave-forge/main/image/NEWS	2012-04-11 14:08:27 UTC (rev 10189)
@@ -43,6 +43,7 @@
       bweuler
       imhist
       conndef
+      im2double
       isbw
       isgray
       isrgb

Modified: trunk/octave-forge/main/image/inst/im2double.m
===================================================================
--- trunk/octave-forge/main/image/inst/im2double.m	2012-04-11 13:34:25 UTC (rev 10188)
+++ trunk/octave-forge/main/image/inst/im2double.m	2012-04-11 14:08:27 UTC (rev 10189)
@@ -28,15 +28,16 @@
   ## Input checking
   if (nargin < 1)
     print_usage();
-  endif
-  if (!isgray(im1) && !isrgb(im1))
+  elseif (!isgray(im1) && !isrgb(im1) && !isbw(im1))
     error("im2double: input must be an image");
   endif
-  
+
   ## Take action depending on the class of the data
   switch (class(im1))
     case "double"
       im2 = im1;
+    case "logical"
+      im2 = double(im1);
     case "uint8"
       im2 = double(im1) / 255;
     case "uint16"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.