ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/rt/RpictSimulManager.cpp

Comparing ray/src/rt/RpictSimulManager.cpp (file contents):
Revision 2.5 by greg, Wed Aug 21 23:32:24 2024 UTC vs.
Revision 2.15 by greg, Sat Jan 25 04:57:27 2025 UTC

#	Line 9 | Line 9 | static const char RCSid[] = "$Id$";
9		*  Created by Greg Ward on 07/11/2024.
10		*/
11
12	+	#define DEBUG   1       // XXX temporary!
13	+
14		#include <ctype.h>
15		#include "platform.h"
16		#include "RpictSimulManager.h"
#	Line 103 | Line 105 | RpictSimulManager::NewFrame(const VIEW &v, int xydim[2
105
106		if (!xydim) return false;
107		if (!ap) ap = &pasp;
108	<	pvw = vw;                       // save previous view for motion blur
109	<	vw = v;
108	>	if (&v == &vw) {
109	>	pvw.type = 0;
110	>	} else {
111	>	pvw = vw;               // save previous view for motion blur
112	>	vw = v;
113	>	}
114		const char *    verr = setview(&vw);
115		if (verr) {
116		error(WARNING, verr);
#	Line 196 | Line 202 | RpictSimulManager::SetTile(const int ti[2])
202		bool
203		RpictSimulManager::ComputePixel(int x, int y)
204		{
205	<	static const SCOLOR     scBlack = {0};
205	>	DCHECK(doneMap.OffBitMap(x,y),
206	>	CONSISTENCY, "illegal pixel index in ComputPixel()");
207		int     i;
208		FVECT   rodir[2];
209		double  hpos = (x+pixjitter())/TWidth();
210		double  vpos = (y+pixjitter())/THeight();
211		double  dlim = viewray(rodir[0], rodir[1], &tvw, hpos, vpos);
212		if (dlim < -FTINY) {    // off view?
213	<	pacc.SetPixel(x, y, scBlack);
213	>	pacc.SetPixel(x, y, scblack);
214		doneMap.Set(x, y);
215		return true;
216		}
#	Line 233 | Line 240 | RpictSimulManager::ComputePixel(int x, int y)
240
241		// Check if neighbor differences are below pixel sampling threshold
242		bool
243	<	RpictSimulManager::BelowSampThresh(int x, int y, const int noff[4][2]) const
243	>	RpictSimulManager::BelowSampThresh(const int x, const int y, const int noff[4][2]) const
244		{
245		SCOLOR  pval[4];
246		float   dist[4];
247		int     i, j;
248
249		for (i = 4; i--; ) {            // get pixels from tile store
250	<	int     px = x + noff[i][0];
251	<	int     py = y + noff[i][1];
250	>	const int       px = x + noff[i][0];
251	>	const int       py = y + noff[i][1];
252		if (!doneMap.Check(px, py) ||
253		!pacc.GetPixel(px, py, pval[i], &dist[i]))
254		return false;
255		}
256	<	const bool      spectr = (pacc.NC() > 3);
257	<	for (i = 4; --i; )              // do pairwise comparisons
258	<	for (j = i; j--; ) {
259	<	if (pacc.DepthType() &&
253	<	(dist[i] - dist[j] > maxdiff*dist[j]) |
256	>	// do pairwise comparisons
257	>	for (i = (pacc.DepthType() != RDTnone)*4; --i > 0; )
258	>	for (j = i; j--; )
259	>	if ((dist[i] - dist[j] > maxdiff*dist[j]) |
260		(dist[j] - dist[i] > maxdiff*dist[i]))
261		return false;
262	<	if (spectr ? sbigsdiff(pval[i], pval[j], maxdiff) :
263	<	bigdiff(pval[i], pval[j], maxdiff))
262	>	if (pacc.NC() > 3) {
263	>	for (i = 4; --i; )
264	>	for (j = i; j--; )
265	>	if (sbigsdiff(pval[i], pval[j], maxdiff))
266		return false;
267	<	}
268	<	return true;                    // linear interpolation OK
267	>	} else {
268	>	for (i = 4; --i; )
269	>	for (j = i; j--; )
270	>	if (bigdiff(pval[i], pval[j], maxdiff))
271	>	return false;
272	>	}
273	>	return true;
274		}
275
276		// Fill an interior square patch with interpolated values
#	Line 268 | Line 281 | RpictSimulManager::FillSquare(const int x, const int y
281		float   dist[4];
282		int     i, j;
283		// assumes 4 corners are valid!
284	<	for (i = 4; i--; )
284	>	for (i = 4; i--; ) {
285	>	DCHECK(!doneMap.Check(x+noff[i][0], y+noff[i][1]),
286	>	CONSISTENCY, "inclusion of bad pixel in FillSquare()");
287		pacc.GetPixel(x+noff[i][0], y+noff[i][1], pval[i], &dist[i]);
288	<
288	>	}
289		i = abs(noff[1][0]-noff[0][0]);
290		j = abs(noff[1][1]-noff[0][1]); // i==j for diamond fill
291		const int       slen =  (i > j) ? i : j;
#	Line 328 | Line 343 | RpictSimulManager::FillSquare(const int x, const int y
343
344		// helper function to set up quincunx sampling
345		static void
346	<	SetQuincunx(ABitMap2 *bmp2, int noff[4][2], const int spc, const bool odd)
346	>	SetQuincunx(ABitMap2 *bmp2, int noff[4][2], const int spc, bool odd, int x0, int y)
347		{
348	<	for (int y = 0; y < bmp2->Height(); y += spc>>1)
334	<	for (int x = (odd^(y&1))*(spc>>1); x < bmp2->Width(); x += spc)
335	<	bmp2->Set(x, y);
336	<	// order neighbors CCW
337	<	if (odd) {
348	>	if (odd) {                      // order neighbors CCW
349		noff[0][0] = spc>>1; noff[0][1] = 0;
350		noff[1][0] = 0; noff[1][1] = spc>>1;
351		noff[2][0] = -(spc>>1); noff[2][1] = 0;
#	Line 345 | Line 356 | SetQuincunx(ABitMap2 *bmp2, int noff[4][2], const int
356		noff[2][0] = -(spc>>1); noff[2][1] = -(spc>>1);
357		noff[3][0] = spc>>1; noff[3][1] = -(spc>>1);
358		}
359	+	int     nsteps;                 // non-negative range
360	+	if (x0 < -(spc>>1)) {
361	+	nsteps = (spc-1 - x0 - (spc>>1))/spc;
362	+	x0 += nsteps*spc;
363	+	}
364	+	if (y < 0) {                    // get past y==0
365	+	nsteps = ((spc>>1)-1 - y)/(spc>>1);
366	+	y += nsteps*(spc>>1);
367	+	odd ^= nsteps&1;
368	+	}
369	+	while (y < bmp2->Height()) {
370	+	for (int x = x0 + odd*(spc>>1); x < bmp2->Width(); x += spc)
371	+	bmp2->Set(x, y);
372	+	y += spc>>1;
373	+	odd = !odd;
374	+	}
375		}
376
377		// Render (or finish rendering) current tile
378		bool
379	<	RpictSimulManager::RenderRect()
379	>	RpictSimulManager::RenderRect(const int x0, const int y0)
380		{
381		if (!tvw.type || !Ready()) {
382		error(INTERNAL, "need octree and view for RenderRect()");
#	Line 359 | Line 386 | RpictSimulManager::RenderRect()
386		int             sp2 = ceil(log2((TWidth()>THeight() ? TWidth() : THeight()) - 1.));
387		int             layer = 0;
388		int             x, y;
362	–	// fprintf(stderr, "Rendering %dx%d tile with psample=%d, maxdiff=%.3f ...\n",
363	–	// TWidth(), THeight(), psample, maxdiff);
389		while (sp2 > 0) {
390		ABitMap2        sampMap(TWidth(), THeight());
391		int             noff[4][2];
392		if ((prCB != NULL) & (barPix == NULL))
393		(*prCB)(100.*doneMap.SumTotal()/doneMap.Width()/doneMap.Height());
394	<	SetQuincunx(&sampMap, noff, 1<<sp2, layer&1);
394	>	SetQuincunx(&sampMap, noff, 1<<sp2, layer&1, x0, y0);
395		sampMap -= doneSamples; // avoid resampling pixels
396		// Are we into adaptive sampling realm?
397		if (noff[0][0]*noff[0][0] + noff[0][1]*noff[0][1] < psample*psample) {
#	Line 380 | Line 405 | RpictSimulManager::RenderRect()
405		const ABitMap2  origSampMap = sampMap;
406		for (x = 4; x--; ) {
407		ABitMap2        stamp = origSampMap;
408	<	stamp.Shift(noff[x][0], noff[x][1]);
408	>	stamp.Shift(noff[x][0] + noff[(x+1)&3][0],
409	>	noff[x][1] + noff[(x+1)&3][1]);
410		sampMap |= stamp;
411		}               // ...but don't resample what's done
412		sampMap -= doneSamples;
413		// interpolate smooth regions
414		fillMap -= sampMap;
415	+	fillMap -= doneSamples;
416		for (x = y = 0; fillMap.Find(&x, &y); x++)
417		FillSquare(x, y, noff);
418		doneSamples |= doneMap;
419		}                       // compute required ray samples
420		for (x = y = 0; sampMap.Find(&x, &y); x++)
421	<	if (!ComputePixel(x, y))
421	>	if (!ComputePixel(x, y)) {
422	>	sprintf(errmsg, "ComputePixel(%d,%d) failed", x, y);
423	>	error(WARNING, errmsg);
424		return false;
425	+	}
426		doneSamples |= sampMap; // samples now done or at least queued
397	–	// fprintf(stderr, "Sampled %ld pixels at (sp2,layer)=(%d,%d)\n",
398	–	// (long)sampMap.SumTotal(), sp2, layer);
399	–	// fprintf(stderr, "\t%ld pixels (%.3f%%) completed (+%ld in process)\n",
400	–	// (long)doneMap.SumTotal(), 100.*doneMap.SumTotal()/doneMap.Width()/doneMap.Height(),
401	–	// (long)(doneSamples.SumTotal()-doneMap.SumTotal()));
427		sp2 -= layer++ & 1;     // next denser sampling
428		}
429	<	if (FlushQueue() < 0)           // make sure we got everyone
429	>	if (FlushQueue() < 0)           // compute stragglers
430		return false;
406	–	x = y = 0;
407	–	if (doneMap.Find(&x, &y, false)) {
408	–	sprintf(errmsg, "missed %ld tile pixels, e.g. (%d,%d)",
409	–	(long)doneMap.Width()*doneMap.Height() -
410	–	doneMap.SumTotal(), x, y);
411	–	error(WARNING, errmsg);
412	–	}
431		if ((prCB != NULL) & (barPix == NULL))
432		(*prCB)(100.);
433		return true;
#	Line 433 | Line 451 | RpictSimulManager::RenderTile(COLORV *rp, int ystride,
451		pacc.SetColorSpace(RDTxyz);
452		else if (prims)
453		pacc.SetColorSpace(RDTrgb, prims);
454	<
454	>
455		return SetTile(tile) && RenderRect();
456		}
457
#	Line 537 | Line 555 | RpictSimulManager::LowerBar(int v, int ytop)
555		sizeof(COLORV)*NC*TWidth()*(THeight()-v));
556		memmove(barDepth, barDepth + TWidth()*v,
557		sizeof(float)*TWidth()*(THeight()-v));
558	<	if (ytop < THeight()) {                 // mark what we won't do as finished
558	>	if (ytop < THeight())                   // mark what we won't do as finished
559		doneMap.ClearRect(0, 0, TWidth(), THeight()-ytop, true);
542	–	memset(barPix, 0, sizeof(COLORV)*NC*TWidth()*(THeight()-ytop));
543	–	memset(barDepth, 0, sizeof(float)*TWidth()*(THeight()-ytop));
544	–	}
560		return true;
561		}
562
#	Line 564 | Line 579 | RpictSimulManager::RenderBelow(int ytop, const int vst
579		cropview(&ptvw, 0., double(ytop-THeight())/GetHeight(),
580		1., double(ytop)/GetHeight()))
581		ptvw.type = 0;
582	<	// set up spectral sampling
583	<	if (setspectrsamp(CNDX, WLPART) <= 0) {
582	>	// update spectral sampling
583	>	int     rv = setspectrsamp(CNDX, WLPART);
584	>	if (rv < 0) {
585		error(USER, "unsupported spectral sampling");
586		return false;
587		}
588	+	if (!rv & (RDTcolorT(dt) != RDTscolor) & (RDTcolorT(dt) != RDTscolr))
589	+	error(WARNING, "spectral range incompatible with color output");
590		COLORV **       parr = NULL;            // set up tiny source drawing
591		float **        zarr = NULL;
592	<	if (!ptvw.type && directvis && dblur <= FTINY) {
592	>	if (!ptvw.type && directvis && (dblur <= FTINY) & (mblur <= FTINY)) {
593		parr = new COLORV * [THeight()];
594		zarr = new float * [THeight()];
595		for (int n = THeight(); n-- > 0; ) {
#	Line 583 | Line 601 | RpictSimulManager::RenderBelow(int ytop, const int vst
601		}
602		int             lastOut = ytop;         // render down frame
603		while (ytop > 0) {
586	–	// fprintf(stderr, "At y=%d, source drawing %s...\n", ytop, parr ? "ON" : "OFF");
604		if (prCB)
605		(*prCB)(100.*(GetHeight()-ytop)/GetHeight());
606	<	if (!RenderRect())              // render this bar
606	>	if (!RenderRect(0, THeight()-ytop))     // render this bar
607		return false;
608	<	int     nlines = lastOut - ytop + THeight();
608	>	int     nlines = lastOut - ytop + vstep;
609		if (nlines > ytop)
610		nlines = ytop;
611		else if (parr)                  // drawing sources?
#	Line 652 | Line 669 | RpictSimulManager::NewOutput(FILE *pdfp[2], const char
669		{
670		pdfp[0] = pdfp[1] = NULL;
671		if (!RDTcolorT(dt))
672	<	error(INTERNAL, "botched color output type in NewOutput()");
672	>	error(INTERNAL, "missing color output type in NewOutput()");
673		if (NCSAMP == 3) {
674		if (RDTcolorT(dt) == RDTscolr)
675		dt = RDTnewCT(dt, prims==xyzprims ? RDTxyze : RDTrgbe);
#	Line 667 | Line 684 | RpictSimulManager::NewOutput(FILE *pdfp[2], const char
684		error(INTERNAL, "writing picture to a command not supported");
685		return RDTnone;
686		}
687	<	fd = open(pfname, O_WRONLY|O_CREAT|O_EXCL, 0666);
687	>	fd = open(pfname, O_RDWR|O_CREAT|O_EXCL, 0666);
688		}
689		if (fd < 0) {
690		if ((frameNo <= 0) | (errno != EEXIST)) {
691		sprintf(errmsg, "cannot open picture file '%s'", pfname);
692		error(SYSTEM, errmsg);
693		}
694	<	return RDTnone;                 // expected in parallel sequence
694	>	return RDTnone;                 // may be expected in sequence run
695		}
696		if (fd == 1)
697		pdfp[0] = stdout;
698	<	else if (!(pdfp[0] = fdopen(fd, "w")))
698	>	else if (!(pdfp[0] = fdopen(fd, "w+")))
699		error(SYSTEM, "failure calling fdopen()");
700		SET_FILE_BINARY(pdfp[0]);               // write picture header
701		if ((pdfp[0] != stdout) | (frameNo <= 1)) {
702		newheader("RADIANCE", pdfp[0]);
703	<	fputs(GetHeader(), pdfp[0]);
703	>	fputs(GetHeadStr(), pdfp[0]);
704		}
705		fputs(VIEWSTR, pdfp[0]); fprintview(&vw, pdfp[0]); fputc('\n', pdfp[0]);
706		if (frameNo > 0)
#	Line 729 | Line 746 | RpictSimulManager::NewOutput(FILE *pdfp[2], const char
746		fputendian(pdfp[0]);
747		fputformat("float", pdfp[0]);
748		break;
749	<	default:;
749	>	default:;       // pro forma - caught this above
750		}
751	<	fputc('\n', pdfp[0]);                   // flush picture header + resolution
735	<	fprtresolu(GetWidth(), GetHeight(), pdfp[0]);
751	>	fputc('\n', pdfp[0]);                   // flush picture header
752		if (fflush(pdfp[0]) == EOF) {
753		sprintf(errmsg, "cannot write header to picture '%s'", pfname);
754		error(SYSTEM, errmsg);
#	Line 740 | Line 756 | RpictSimulManager::NewOutput(FILE *pdfp[2], const char
756		pdfp[0] = NULL;
757		return RDTnone;
758		}
759	<	if (dfname) {
759	>	if (dfname) {                           // open depth output
760		if (dfname[0] == '!')
761		pdfp[1] = popen(dfname+1, "w");
762		else
763	<	pdfp[1] = fopen(dfname, "w");
763	>	pdfp[1] = fopen(dfname, "w+");
764		if (!pdfp[1]) {
765		sprintf(errmsg, "cannot open depth output '%s'", dfname);
766		error(SYSTEM, errmsg);
#	Line 756 | Line 772 | RpictSimulManager::NewOutput(FILE *pdfp[2], const char
772		}
773		if (RDTdepthT(dt) == RDTdshort) {       // write header for 16-bit depth?
774		newheader("RADIANCE", pdfp[1]);
775	<	fputs(GetHeader(), pdfp[1]);
775	>	fputs(GetHeadStr(), pdfp[1]);
776		fputs(VIEWSTR, pdfp[1]); fprintview(&vw, pdfp[1]); fputc('\n', pdfp[1]);
777		fputs(DEPTHSTR, pdfp[1]); fputs(dunit, pdfp[1]); fputc('\n', pdfp[1]);
778		fputformat(DEPTH16FMT, pdfp[1]);
779		fputc('\n', pdfp[1]);           // end-of-info
764	–	fprtresolu(GetWidth(), GetHeight(), pdfp[1]);
780		if (fflush(pdfp[1]) == EOF) {
781		sprintf(errmsg, "cannot write header to '%s'", dfname);
782		error(SYSTEM, errmsg);
#	Line 788 | Line 803 | RpictSimulManager::RenderFrame(const char *pfname, Ren
803		dt = NewOutput(pdfp, pfname, dt, dfname);
804		if (dt == RDTnone)
805		return RDTnone;
806	+	// add resolution string(s)
807	+	fprtresolu(GetWidth(), GetHeight(), pdfp[0]);
808	+	if (RDTdepthT(dt) == RDTdshort)
809	+	fprtresolu(GetWidth(), GetHeight(), pdfp[1]);
810
811	<	const int       bheight = (psample > 1) ? int(2*psample+.99) : 4;
812	<	const int       vstep =  bheight >> (psample > 1);
811	>	const int       bheight = (psample > 1) ? int(8*psample+.99) : 16;
812	>	const int       vstep = bheight >> (psample > 1);
813
814		NewBar(bheight);                        // render frame if we can
815		if (!RenderBelow(GetHeight(), vstep, pdfp[0], dt, pdfp[1])) {
816		fclose(pdfp[0]);
817		if (pdfp[1]) (dfname[0] == '!') ? pclose(pdfp[1]) : fclose(pdfp[1]);
799	–	Cleanup();
818		return RDTnone;
819		}
820		NewBar();                               // clean up and return
#	Line 983 | Line 1001 | RpictSimulManager::ReopenOutput(FILE *pdfp[2], const c
1001		pdfp[0] = NULL;
1002		return RDTnone;
1003		}
1004	+	if (hinfo.gotview) {                    // header view overrides
1005	+	pvw = vw;
1006	+	vw = hinfo.vw;
1007	+	}
1008		if (!dfname)                            // no depth file?
1009		return dt;
1010
#	Line 1002 | Line 1024 | RpictSimulManager::ReopenOutput(FILE *pdfp[2], const c
1024		}
1025		SET_FILE_BINARY(pdfp[1]);
1026		int     n, len = strlen(HDRSTR);
1027	<	char    buf[32];                // sniff for 16-bit header
1028	<	if (read(fileno(pdfp[1]), buf, len+1) < len+1) {
1027	>	char    buf[32];                        // sniff for 16-bit header
1028	>	if (getbinary(buf, 1, len+1, pdfp[1]) < len+1) {
1029		sprintf(errmsg, "empty depth file '%s'", dfname);
1030		error(SYSTEM, errmsg);
1031		fclose(pdfp[0]); fclose(pdfp[1]);
#	Line 1012 | Line 1034 | RpictSimulManager::ReopenOutput(FILE *pdfp[2], const c
1034		}
1035		for (n = 0; n < len; n++)
1036		if (buf[n] != HDRSTR[n])
1037	<	break;          // not a Radiance header
1038	<	lseek(fileno(pdfp[1]), 0, SEEK_SET);
1037	>	break;                  // not a Radiance header
1038	>	rewind(pdfp[1]);
1039		if ((n < len) | !isprint(buf[len]))
1040		return RDTnewDT(dt, RDTdfloat);
1041
1042	<	HeaderInfo      dinfo;          // thinking it's 16-bit encoded
1042	>	HeaderInfo      dinfo;                  // thinking it's 16-bit encoded
1043		if (getheader(pdfp[1], head_check, &dinfo) < 0)
1044		sprintf(errmsg, "bad header in encoded depth file '%s'",
1045		dfname);
#	Line 1056 | Line 1078 | RpictSimulManager::ResumeFrame(const char *pfname, con
1078		case RDTxyze:
1079		break;
1080		case RDTscolr:
1081	<	bytesPer = hinfo.ncomp + 1;     // XXX assumes no compression
1081	>	bytesPer = NCSAMP + 1;  // XXX assumes no compression
1082		break;
1083		case RDTrgb:
1084		case RDTxyz:
1085		bytesPer = sizeof(float)*3;
1086		break;
1087		case RDTscolor:
1088	<	bytesPer = sizeof(float)*hinfo.ncomp;
1088	>	bytesPer = sizeof(float)*NCSAMP;
1089		break;
1090		default:
1091	<	sprintf(errmsg, "unknown format (%s) for '%s'", hinfo.fmt, pfname);
1091	>	sprintf(errmsg, "unknown format for '%s'", pfname);
1092		error(USER, errmsg);
1093		fclose(pdfp[0]);
1094		if (pdfp[1]) fclose(pdfp[1]);
#	Line 1080 | Line 1102 | RpictSimulManager::ResumeFrame(const char *pfname, con
1102		if (pdfp[1]) fclose(pdfp[1]);
1103		return RDTnone;
1104		}
1105	<	vw.type = 0;                            // set up new (unreferenced) frame
1084	<	frameNo = 0;
1105	>	frameNo = 0;                            // set up unreferenced frame
1106		int     hvdim[2] = {res.xr, res.yr};
1107		double  noAdj = 0;
1108	<	if (!NewFrame(hinfo.vw, hvdim, &noAdj) ||
1108	>	if (!NewFrame(vw, hvdim, &noAdj) ||
1109		(hvdim[0] != res.xr) | (hvdim[1] != res.yr)) {
1110		error(CONSISTENCY, "unexpected resolution change in ResumeFrame()");
1111		fclose(pdfp[0]);
#	Line 1130 | Line 1151 | RpictSimulManager::ResumeFrame(const char *pfname, con
1151		error(WARNING, errmsg);
1152		}
1153		long    toSkip = 0;
1154	<	switch (RDTdepthT(dt)) {                        // append depth file, too?
1154	>	switch (RDTdepthT(dt)) {                // append depth file, too?
1155		case RDTdfloat:
1156		toSkip = sizeof(float)*GetWidth()*doneScans;
1157		break;
#	Line 1145 | Line 1166 | RpictSimulManager::ResumeFrame(const char *pfname, con
1166		toSkip = 2L*GetWidth()*doneScans;
1167		break;
1168		default:;
1169	<	}
1170	<	if (toSkip && fseek(pdfp[1], toSkip, SEEK_CUR) < 0) {
1169	>	}                                       // fseek() needed for output
1170	>	if (pdfp[1] && fseek(pdfp[1], toSkip, SEEK_CUR) < 0) {
1171		sprintf(errmsg, "cannot seek on depth file '%s'", dfname);
1172		error(SYSTEM, errmsg);
1173		fclose(pdfp[0]); fclose(pdfp[1]);
1174		return RDTnone;
1175		}
1176	<	int     bheight = (psample > 1) ? int(2*psample+.99) : 4;
1176	>	int     bheight = (psample > 1) ? int(8*psample+.99) : 16;
1177		if (bheight > GetHeight()-doneScans)
1178		bheight = GetHeight()-doneScans;
1179		int     vstep =  bheight >> (psample > 1);
#	Line 1162 | Line 1183 | RpictSimulManager::ResumeFrame(const char *pfname, con
1183		if (!RenderBelow(GetHeight()-doneScans, vstep, pdfp[0], dt, pdfp[1])) {
1184		fclose(pdfp[0]);
1185		if (pdfp[1]) fclose(pdfp[1]);
1165	–	Cleanup();
1186		return RDTnone;
1187		}
1188		NewBar();                               // close up and return success

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)