Newsgroups: fj.sources.d
Path: galaxy.trc.rwcp.or.jp!coconuts.jaist!cs.titech!nirvana.cs.titech!wnoc-tyo-news!aist-nara!yuuki-h
From: yuuki-h@is.aist-nara.ac.jp (Yuuki Harano)
Subject: Re: Mag/pic patch for XV-3.10a
Message-ID: <D4CsCn.F7F@newspost.aist-nara.ac.jp>
Sender: news@newspost.aist-nara.ac.jp (USENET News System)
Nntp-Posting-Host: alpha411.aist-nara.ac.jp
Organization: NARA Institute of Science and Technology
X-Newsreader: mnews [version 1.18PL3] 1994-08/01(Mon)
References: <N-MIYO.95Feb20220342@nadia.tempus.win.or.jp>
	<FALSE.95Feb21155259@susvr2.su.cit.nihon-u.ac.jp>
Date: Tue, 21 Feb 1995 14:02:47 GMT
Lines: 109
Xref: galaxy.trc.rwcp.or.jp fj.sources.d:2701
X-originally-archived-at: http://galaxy.rwcp.or.jp/text/cgi-bin/newsarticle2?ng=fj.sources.d&nb=2701&hd=a
X-reformat-date: Mon, 18 Oct 2004 15:18:22 +0900
X-reformat-comment: Tabs were expanded into 4 column tabstops by the Galaxy's archiver. See http://katsu.watanabe.name/ancientfj/galaxy-format.html for more info.

$B86Ln!w(Bxvmag.c$B$N:n<T$G$9!#(B

On Tue, 21 Feb 1995 15:52:59 JST,
false@su.cit.nihon-u.ac.jp said:
> xvmag.c $B$N(B 147 $B9TL\$"$?$j$N(B realloc $B$,!"(B*p $B$,(B NULL $B$@$H(B SUNOS 4.1.3 
> $B$J$I$G$O$&$^$/9T$+$J$$$h$&$G$9!#(B(NEWSOS 4.2.1 $B$G$O$&$^$/9T$-$^$7$?!#(B)

$B$I$&$b$9$$$^$;$s!#(BSunOS$B$G$O;n$7$F$^$;$s$G$7$?!#(B(^^;

MAG$B$rFI$b$&$H$7$?$i$*$A$k!"$H$$$&J}$O!"0J2<$N%Q%C%A$rEv$F$l$PD>$k$H;W(B
$B$$$^$9!#(B

---------------- xvmag.c$B$N%Q%C%A(B
*** xvmag.c.orgTue Feb 21 22:38:44 1995
--- xvmag.cTue Feb 21 22:40:26 1995
***************
*** 67,72 ****
--- 67,82 ----
  #define OK 1
  #define NG 0
  
+ char *Realloc(p, n)
+     char *p;
+     int n;
+ {
+     if(p == NULL)
+ return malloc(n);
+     else
+ return realloc(p, n);
+ }
+ 
  #define error(msg) {mag_error(fp, &mag, pinfo, msg); return 0;}
  
  int LoadMAG(fname, pinfo)
***************
*** 146,152 ****
  if(c == 0x1a)
      break;
  if(maxlen == i){
!     if((*p = realloc(*p, maxlen += 16)) == NULL)
  FatalError("can't allocate memory.");
  }
  (*p)[i++] = c;
--- 156,162 ----
  if(c == 0x1a)
      break;
  if(maxlen == i){
!     if((*p = Realloc(*p, maxlen += 16)) == NULL)
  FatalError("can't allocate memory.");
  }
  (*p)[i++] = c;
***************
*** 156,162 ****
  return NG;
      
      if(maxlen == i){
! if((*p = realloc(*p, ++maxlen)) == NULL)
      FatalError("can't allocate memory.");
      }
      (*p)[i] = '\0';
--- 166,172 ----
  return NG;
      
      if(maxlen == i){
! if((*p = Realloc(*p, ++maxlen)) == NULL)
      FatalError("can't allocate memory.");
      }
      (*p)[i] = '\0';
***************
*** 522,528 ****
      }else{
  flag(px, py) = 0;
  if(pmax <= pi + 1){
!     if((mi->p = realloc(mi->p, pmax += 128)) == NULL)
  FatalError("can't allocate memory.");
  }
  mi->p[pi++] = L8(pixel(px, py));
--- 532,538 ----
      }else{
  flag(px, py) = 0;
  if(pmax <= pi + 1){
!     if((mi->p = Realloc(mi->p, pmax += 128)) == NULL)
  FatalError("can't allocate memory.");
  }
  mi->p[pi++] = L8(pixel(px, py));
***************
*** 552,558 ****
      mi->a[ai] &= ~mask;
  }else{
      if(bmax == bi){
! if((mi->b = realloc(mi->b, bmax += 128)) == NULL)
      FatalError("can't allocate memory");
      }
      mi->b[bi++] = flag0[i];
--- 562,568 ----
      mi->a[ai] &= ~mask;
  }else{
      if(bmax == bi){
! if((mi->b = Realloc(mi->b, bmax += 128)) == NULL)
      FatalError("can't allocate memory");
      }
      mi->b[bi++] = flag0[i];
----------------


--
$BF`NI@hC<2J3X5;=QBg3X1!Bg3X(B $B>pJs2J3X8&5f2J(B
$BGn;NA04|2]Dx#1G/(B  $B86Ln(B $BM5<y(B
E-mail: yuuki-h@is.aist-nara.ac.jp
