Mercurial > octave-nkf

changeset 3748:599fb10b454d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2000-12-08 04:43:33 by jwe]
author jwe
date Fri, 08 Dec 2000 04:43:34 +0000
parents 50f30e40abca
children 55df6f9044f6
files scripts/ChangeLog scripts/image/saveimage.m
diffstat 2 files changed, 5 insertions(+), 41 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog	Thu Dec 07 05:47:07 2000 +0000
+++ b/scripts/ChangeLog	Fri Dec 08 04:43:34 2000 +0000
@@ -1,3 +1,7 @@
+2000-12-07  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* image/saveimage.m: Don't try to create rawbit image.
+
 2000-11-21  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* Makefile.in (bin-dist): Pass -C to $(MAKE), not -c.
--- a/scripts/image/saveimage.m	Thu Dec 07 05:47:07 2000 +0000
+++ b/scripts/image/saveimage.m	Fri Dec 08 04:43:34 2000 +0000
@@ -133,10 +133,6 @@
 
   map = round (255 * map);
 
-  bw = (map_nr == 2
-        && ((map(1,1) == 0 && map(2,1) == 255)
-            || (map(1,1) == 255 && map(2,1) == 0)));
-
   img = round (img');
   [img_nr, img_nc] = size (img);
 
@@ -160,43 +156,7 @@
     tagline = sprintf ("# Created by Octave %s, %s",
 		       __OCTAVE_VERSION__, time_string);
 
-    if (grey && map_nr == 2 && bw)
-
-      if (map(1) != 0)
-        map = [0; 1];
-      else
-        map = [1; 0];
-      endif
-
-      n_long = rem (img_nc, 8);
-      tmp = zeros (ceil (img_nc/8), img_nr);
-
-      for i = 1:img_nr
-        idx = (i-1)*img_nc+1:i*img_nc;
-        if (n_long > 0)
-          img_row = [map(img(idx)); (zeros (8-n_long, 1))];
-        else
-          img_row = map(img(idx));
-        endif
-	l_img_row = length (img_row);
-        if (img_nc < 8)
-          for j = 1:8
-            tmp(:,i) = tmp(:,i) + img_row (j) * 2^(8-j);
-          endfor
-        else
-          for j = 1:8
-            tmp(:,i) = tmp(:,i) + img_row (j:8:l_img_row) * 2^(8-j);
-          endfor
-        endif
-      endfor
-
-      fid = fopen (filename, "w");
-      fprintf (fid, "P4\n%s\n%d %d\n", tagline, img_nr, img_nc);
-      fwrite (fid, tmp, "char");
-      fprintf (fid, "\n");
-      fclose (fid);
-
-    elseif (grey)
+    if (grey)
 
       fid = fopen (filename, "w");
       fprintf (fid, "P5\n%s\n%d %d\n255\n", tagline, img_nr, img_nc);