"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "f.select.cc" between
fotoxx-22.30.tar.gz and fotoxx-22.35.tar.gz

About: fotoxx is a program for photo editing and collection management.

f.select.cc  (fotoxx-22.30)	:	f.select.cc  (fotoxx-22.35)
skipping to change at line 281		skipping to change at line 281
}		}
return 1;		return 1;
}		}
if (CEF && CEF->Fpreview && CEF->zd) // use full-size image		if (CEF && CEF->Fpreview && CEF->zd) // use full-size image
zdialog_send_event(CEF->zd,"fullsize");		zdialog_send_event(CEF->zd,"fullsize");
sa_validate(); // validate area, remove if no good		sa_validate(); // validate area, remove if no good
if (CEF && CEF->Farea != 2) { // select area not supported		if (CEF && CEF->Farea != 2) { // select area not supported
Plog(1,"*** select area ignored for this edit function \n");		Plog(0,"*** select area ignored for this edit function \n");
return 1;		return 1;
}		}
if (! sa_stat) { // no area, create one		if (! sa_stat) { // no area, create one
sa_pixmap_create(); // allocate pixel maps		sa_pixmap_create(); // allocate pixel maps
sa_currseq = sa_Ncurrseq = 0; // reset selection sequence		sa_currseq = sa_Ncurrseq = 0; // reset selection sequence
sa_Npixel = sa_blendwidth = sa_edgecalc_done = 0;		sa_Npixel = sa_blendwidth = sa_edgecalc_done = 0;
sa_fww = Fpxb->ww; // valid image size for area		sa_fww = Fpxb->ww; // valid image size for area
sa_fhh = Fpxb->hh;		sa_fhh = Fpxb->hh;
sa_stat = 1; // status = edit		sa_stat = 1; // status = edit
skipping to change at line 1474		skipping to change at line 1474
int zstat, cc;		int zstat, cc;
Plog(1,"sa_finish() \n");		Plog(1,"sa_finish() \n");
if (! sa_stat) return; // no area?		if (! sa_stat) return; // no area?
if (! sa_validate()) return; // invalid for current image		if (! sa_validate()) return; // invalid for current image
sa_finish_auto(); // auto-finish mouse-selected areas 22.16		sa_finish_auto(); // auto-finish mouse-selected areas 22.16
if (sa_stat != 3) return;		if (sa_stat != 3) return;
sa_show(1,0); // show area		// sa_show(1,0); // zdialog_run() will Fpaint() 22.31
cc = Fpxb->ww * Fpxb->hh;		cc = Fpxb->ww * Fpxb->hh;
if (sa_stackdirec) zfree(sa_stackdirec);		if (sa_stackdirec) zfree(sa_stackdirec);
sa_stackdirec = (char *) zmalloc(cc,"select-area");		sa_stackdirec = (char *) zmalloc(cc,"select-area");
if (sa_stack) zfree(sa_stack);		if (sa_stack) zfree(sa_stack);
sa_stack = (int *) zmalloc(cc * sizeof(int),"select-area");		sa_stack = (int *) zmalloc(cc * sizeof(int),"select-area");
sa_maxstack = cc;		sa_maxstack = cc;
sa_fincancel = 0;		sa_fincancel = 0;
sa_Nstack = 0;		sa_Nstack = 0;
skipping to change at line 3400		skipping to change at line 3400
int ii, px1, py1, px2, py2, dist;		int ii, px1, py1, px2, py2, dist;
int ww, nc, pcc;		int ww, nc, pcc;
float *pix1, *pix2;		float *pix1, *pix2;
char *pp, *file;		char *pp, *file;
char filename[100];		char filename[100];
if (strmatch(menu,"copy"))		if (strmatch(menu,"copy"))
F1_help_topic = "copy/paste area";		F1_help_topic = "copy/paste area";
else if (strmatch(menu,"save"))		else if (strmatch(menu,"save"))
F1_help_topic = "load/save area";		F1_help_topic = "load/save area";
else Plog(1,"F1 topic error \n");		else Plog(0,"F1 topic error \n");
if (FGWM != 'F') return;		if (FGWM != 'F') return;
if (! sa_stat) return; // no selected area		if (! sa_stat) return; // no selected area
if (sa_stat < 3) {		if (sa_stat < 3) {
zmessageACK(Mwin,"area is not finished");		zmessageACK(Mwin,"area is not finished");
return;		return;
}		}
if (! E0pxm) { // get poss. 16-bit image		if (! E0pxm) { // get poss. 16-bit image
End of changes. 3 change blocks.
3 lines changed or deleted		3 lines changed or added

---