From bug-octave-request at bevo dot che dot wisc dot edu Mon Aug 7 14:14:01 2000 Subject: saveimage writes wrong b/w images in some cases From: Kai Habel To: bug-octave Date: Mon, 07 Aug 2000 21:05:24 +0200 Dies ist eine mehrteilige Nachricht im MIME-Format. --------------5A215BF00BEE68BBD70F0962 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Bug report for Octave 2.1.31 configured for %OCTAVE_CANONICAL_HOST_TYPE% Description: ----------- saveimage writes distorted b/w images in same cases Repeat-By: --------- X = [ones(42,22),zeros(42,22)]; imshow(X,2); Fix: --- See patch appended. I have decided to rewrite the black/ white image section (ppb) for the ppm case. ChangeLog: 2000-08-08 Kai Habel * saveimage.m: fix distortion bug for ppm(pbm) image. Configuration (please do not edit this section): ----------------------------------------------- uname output: Linux enterprise 2.2.14 #7 Fri Jul 28 22:08:07 CEST 2000 i586 unknown configure opts: --enable-lite-kernel --enable-shared --enable-dl --without-fastblas --enable-readline --with-g77 Fortran compiler: g77 FFLAGS: -O F2C: F2CFLAGS: FLIBS: -lg2c -lm -L/usr/lib/gcc-lib/i486-linux/egcs-2.91.66 -L/usr/i486-linux/lib -lm CPPFLAGS: INCFLAGS: -I. -I. -I./liboctave -I./src -I./libcruft/misc -I./glob -I./glob C compiler: gcc, version 2.91.66 19990314/Linux (egcs-1.1.2 release) CFLAGS: -g -O2 -Wall CPICFLAG: -fPIC C++ compiler: c++, version 2.91.66 19990314/Linux (egcs-1.1.2 release) CXXFLAGS: -g -O2 -Wall CXXPICFLAG: -fPIC LDFLAGS: -g LIBFLAGS: -L. RLD_FLAG: -Xlinker -rpath -Xlinker /usr/local/lib/octave-2.1.31 TERMLIBS: -lncurses LIBS: LEXLIB: LIBPLPLOT: LIBDLFCN: LIBGLOB: ./glob/glob.o ./glob/fnmatch.o DEFS: -DOCTAVE_SOURCE=1 -DSEPCHAR=':' -DSEPCHAR_STR=":" -DUSE_READLINE=1 -D__NO_MATH_INLINES=1 -DCXX_NEW_FRIEND_TEMPLATE_DECL=1 -DHAVE_LIBM=1 -DHAVE_LIBZ=1 -DHAVE_HDF5_H=1 -DHAVE_HDF5=1 -DF77_APPEND_UNDERSCORE=1 -DOCTAVE_LITE=1 -DSIZEOF_SHORT=2 -DSIZEOF_INT=4 -DSIZEOF_LONG=4 -DSIZEOF_LONG_LONG=8 -DHAVE_ALLOCA_H=1 -DHAVE_ALLOCA=1 -DNPOS=std::string::npos -DSTDC_HEADERS=1 -DHAVE_DIRENT_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_SYS_WAIT_H=1 -DHAVE_ASSERT_H=1 -DHAVE_CURSES_H=1 -DHAVE_DLFCN_H=1 -DHAVE_FCNTL_H=1 -DHAVE_FLOAT_H=1 -DHAVE_FNMATCH_H=1 -DHAVE_GLOB_H=1 -DHAVE_GRP_H=1 -DHAVE_LIMITS_H=1 -DHAVE_MEMORY_H=1 -DHAVE_NCURSES_H=1 -DHAVE_POLL_H=1 -DHAVE_PWD_H=1 -DHAVE_SGTTY_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_SYS_PARAM_H=1 -DHAVE_SYS_POLL_H=1 -DHAVE_SYS_RESOURCE_H=1 -DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_TIMES_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_UTSNAME_H=1 -DHAVE_TERMCAP_H=1 -DHAVE_TERMIO_H=1 -DHAVE_UNISTD_H=1 -DHAVE_VARARGS_H=1 -DHAVE_ATEXIT=1 -DHAVE_BCOPY=1 -DHAVE_BZERO=1 -DHAVE_DUP2=1 -DHAVE_ENDGRENT=1 -DHAVE_ENDPWENT=1 -DHAVE_EXECVP=1 -DHAVE_FCNTL=1 -DHAVE_FORK=1 -DHAVE_GETCWD=1 -DHAVE_GETEGID=1 -DHAVE_GETEUID=1 -DHAVE_GETGID=1 -DHAVE_GETGRENT=1 -DHAVE_GETGRGID=1 -DHAVE_GETGRNAM=1 -DHAVE_GETHOSTNAME=1 -DHAVE_GETPGRP=1 -DHAVE_GETPID=1 -DHAVE_GETPPID=1 -DHAVE_GETPWENT=1 -DHAVE_GETPWNAM=1 -DHAVE_GETPWUID=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_GETUID=1 -DHAVE_GETWD=1 -DHAVE_LOCALTIME_R=1 -DHAVE_LSTAT=1 -DHAVE_MEMMOVE=1 -DHAVE_MKDIR=1 -DHAVE_MKFIFO=1 -DHAVE_ON_EXIT=1 -DHAVE_PIPE=1 -DHAVE_POLL=1 -DHAVE_PUTENV=1 -DHAVE_RENAME=1 -DHAVE_RINDEX=1 -DHAVE_RMDIR=1 -DHAVE_SELECT=1 -DHAVE_SETGRENT=1 -DHAVE_SETPWENT=1 -DHAVE_SETVBUF=1 -DHAVE_SIGACTION=1 -DHAVE_SIGPENDING=1 -DHAVE_SIGPROCMASK=1 -DHAVE_SIGSUSPEND=1 -DHAVE_STAT=1 -DHAVE_STRCASECMP=1 -DHAVE_STRDUP=1 -DHAVE_STRERROR=1 -DHAVE_STRFTIME=1 -DHAVE_STRNCASECMP=1 -DHAVE_STRPTIME=1 -DHAVE_TEMPNAM=1 -DHAVE_UMASK=1 -DHAVE_UNLINK=1 -DHAVE_USLEEP=1 -DHAVE_VFPRINTF=1 -DHAVE_VSPRINTF=1 -DHAVE_VSNPRINTF=1 -DHAVE_WAITPID=1 -DHAVE_LIBDL=1 -DHAVE_DLOPEN=1 -DHAVE_DLSYM=1 -DHAVE_DLERROR=1 -DHAVE_DLCLOSE=1 -DWITH_DL=1 -DWITH_DYNAMIC_LINKING=1 -DHAVE_TIMEVAL=1 -DHAVE_FINITE=1 -DHAVE_ISNAN=1 -DHAVE_ISINF=1 -DHAVE_ACOSH=1 -DHAVE_ASINH=1 -DHAVE_ATANH=1 -DHAVE_ERF=1 -DHAVE_ERFC=1 -DHAVE_ST_BLKSIZE=1 -DHAVE_ST_BLOCKS=1 -DHAVE_ST_RDEV=1 -DHAVE_TM_ZONE=1 -DHAVE_GR_PASSWD=1 -DEXCEPTION_IN_MATH=1 -DRETSIGTYPE=void -DSYS_SIGLIST_DECLARED=1 -DHAVE_SYS_SIGLIST=1 -DHAVE_POSIX_SIGNALS=1 -DHAVE_GETRUSAGE=1 -DHAVE_TIMES=1 -DGNUPLOT_HAS_MULTIPLOT=1 -DGNUPLOT_HAS_FRAMES=1 -- Kai Habel mailto:kahacjde at linux dot zrz dot tu-berlin dot de --------------5A215BF00BEE68BBD70F0962 Content-Type: text/plain; charset=us-ascii; name="patch-saveimage" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="patch-saveimage" *** /usr/local/share/octave/2.1.31/m/image/saveimage.m Tue Jul 18 10:39:02 2000 --- ./saveimage.m Mon Aug 7 20:54:23 2000 *************** *** 160,166 **** tagline = sprintf ("# Created by Octave %s, %s", __OCTAVE_VERSION__, time_string); ! if (grey && map_nr == 2 && bw) if (map(1) != 0) map = [0; 1]; --- 160,166 ---- tagline = sprintf ("# Created by Octave %s, %s", __OCTAVE_VERSION__, time_string); ! if (grey && bw) if (map(1) != 0) map = [0; 1]; *************** *** 168,193 **** 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"); --- 168,183 ---- map = [1; 0]; endif ! k = ceil (img_nr/8); ! tmp = zeros (k, img_nc); ! ## append columns with zeros to original img, that mod(cols,8) = 0 ! ! bwimg = postpad (reshape (map(img), img_nr, img_nc), k * 8, 0); ! ! b = kron (pow2 (7:-1:0)', ones (1, img_nc)); ! ! for i = 1:k ! tmp(i,:) = sum (bwimg(8*(i-1)+1:8*i,:) .* b); endfor fid = fopen (filename, "w"); --------------5A215BF00BEE68BBD70F0962-- ----------------------------------------------------------------------- Octave is freely available under the terms of the GNU GPL. Octave's home on the web: http://www.che.wisc.edu/octave/octave.html How to fund new projects: http://www.che.wisc.edu/octave/funding.html Subscription information: http://www.che.wisc.edu/octave/archive.html -----------------------------------------------------------------------