f.effects.cc (fotoxx-22.30) | : | f.effects.cc (fotoxx-22.35) | ||
---|---|---|---|---|
skipping to change at line 4655 | skipping to change at line 4655 | |||
float fred4, fgreen4, fblue4; | float fred4, fgreen4, fblue4; | |||
float coeff; | float coeff; | |||
for (ii = index; ii < Ntiles; ii += NWT) // loop tile image files | for (ii = index; ii < Ntiles; ii += NWT) // loop tile image files | |||
{ | { | |||
if (tileimage[ii]) zfree(tileimage[ii]); | if (tileimage[ii]) zfree(tileimage[ii]); | |||
tileimage[ii] = 0; | tileimage[ii] = 0; | |||
pxb1 = gdk_pixbuf_new_from_file_at_size(tilefile[ii],64,64,&gerror); // create pixbuf within 64x64 | pxb1 = gdk_pixbuf_new_from_file_at_size(tilefile[ii],64,64,&gerror); // create pixbuf within 64x64 | |||
if (! pxb1) { | if (! pxb1) { | |||
Plog(1,"file: %s \n %s",tilefile[ii],gerror->message); | Plog(0,"file: %s \n %s",tilefile[ii],gerror->message); | |||
gerror = 0; | gerror = 0; | |||
continue; | continue; | |||
} | } | |||
tww1 = gdk_pixbuf_get_width(pxb1); // actual width, height (max. 64) | tww1 = gdk_pixbuf_get_width(pxb1); // actual width, height (max. 64) | |||
thh1 = gdk_pixbuf_get_height(pxb1); | thh1 = gdk_pixbuf_get_height(pxb1); | |||
g_object_unref(pxb1); | g_object_unref(pxb1); | |||
if (tww1 < tww || thh1 < thh) continue; // unusable | if (tww1 < tww || thh1 < thh) continue; // unusable | |||
skipping to change at line 5607 | skipping to change at line 5607 | |||
int alien_colors_dialog_event(zdialog* zd, const char *event); | int alien_colors_dialog_event(zdialog* zd, const char *event); | |||
void * alien_colors_thread(void *); | void * alien_colors_thread(void *); | |||
F1_help_topic = "alien colors"; | F1_help_topic = "alien colors"; | |||
Plog(1,"m_alien_colors \n"); | Plog(1,"m_alien_colors \n"); | |||
EFaliencolors.menuname = "Alien Colors"; | EFaliencolors.menuname = "Alien Colors"; | |||
EFaliencolors.menufunc = m_alien_colors; | EFaliencolors.menufunc = m_alien_colors; | |||
EFaliencolors.Farea = 2; // select area usable | EFaliencolors.Farea = 2; // select area usable | |||
EFaliencolors.FprevReq = 1; // use preview mode | ||||
EFaliencolors.Fscript = 1; // scripting supported | EFaliencolors.Fscript = 1; // scripting supported | |||
EFaliencolors.threadfunc = alien_colors_thread; | EFaliencolors.threadfunc = alien_colors_thread; | |||
// preview mode not used - do not replace pattern when [OK] pressed 22.35 | ||||
if (! edit_setup(EFaliencolors)) return; | if (! edit_setup(EFaliencolors)) return; | |||
/*** | /*** | |||
__________________________ | __________________________ | |||
| Alien Colors | | | Alien Colors | | |||
| | | | | | |||
| blocksize [___] | | | blocksize [___] | | |||
| amplitude [___] | | | amplitude [___] | | |||
| | | | | | |||
skipping to change at line 5659 | skipping to change at line 5659 | |||
if (strmatch(event,"done")) zd->zstat = 1; // from edit_setup() or f_save() | if (strmatch(event,"done")) zd->zstat = 1; // from edit_setup() or f_save() | |||
if (strmatch(event,"cancel")) zd->zstat = 2; // from f_open() | if (strmatch(event,"cancel")) zd->zstat = 2; // from f_open() | |||
if (zstrstr("BLsz Ampl Apply",event)) | if (zstrstr("BLsz Ampl Apply",event)) | |||
{ | { | |||
zdialog_fetch(zd,"BLsz",BLsz); // get user inputs | zdialog_fetch(zd,"BLsz",BLsz); // get user inputs | |||
zdialog_fetch(zd,"Ampl",Ampl); | zdialog_fetch(zd,"Ampl",Ampl); | |||
thread_signal(); // calculate | thread_signal(); // calculate | |||
} | } | |||
if (zd->zstat) | if (zd->zstat) // no preview mode 22.35 | |||
{ | { | |||
if (zd->zstat == 1) | if (zd->zstat == 1) edit_done(0); | |||
// [ OK ] | // [ OK ] | |||
{ | ||||
int ww = E3pxm->ww; | ||||
// preview size | ||||
edit_fullsize(); | ||||
if (E3pxm->ww > ww) { | ||||
BLsz *= 1.0 * E3pxm->ww / ww; | ||||
// scale up for full size | ||||
thread_signal(); | ||||
} | ||||
edit_done(0); | ||||
} | ||||
else edit_cancel(0); // discard edit | else edit_cancel(0); // discard edit | |||
} | } | |||
return 1; | return 1; | |||
} | } | |||
// thread function - multiple working threads to update image | // thread function - multiple working threads to update image | |||
void * alien_colors_thread(void *) | void * alien_colors_thread(void *) | |||
{ | { | |||
End of changes. 5 change blocks. | ||||
16 lines changed or deleted | 5 lines changed or added |