diff --git a/rtengine/improcfun.h b/rtengine/improcfun.h index 9de16db00..3f9fec910 100644 --- a/rtengine/improcfun.h +++ b/rtengine/improcfun.h @@ -26,6 +26,9 @@ #include "pipettebuffer.h" #include "shmap.h" #include "array2D.h" + +#include + template class LUT; @@ -92,6 +95,7 @@ class ImProcFunctions { cmsHTRANSFORM monitorTransform; std::unique_ptr gamutWarning; + Cairo::RefPtr locImage; const procparams::ProcParams* params; double scale; diff --git a/rtengine/iplocallab.cc b/rtengine/iplocallab.cc index c54196ad6..f2b60b2f5 100644 --- a/rtengine/iplocallab.cc +++ b/rtengine/iplocallab.cc @@ -12529,7 +12529,18 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o } } } - + //test for write text , now it compile... but does nothing + // why ?? is arial found (I tried others) or I missed something + /* + locImage = Cairo::ImageSurface::create(Cairo::FORMAT_RGB24, bfw, bfh); + Cairo::RefPtr cr = Cairo::Context::create(locImage); + cr->set_source_rgb(0.1, 0.1, 0.1); + cr->select_font_face ("Arial", Cairo::FontSlant::FONT_SLANT_NORMAL, Cairo::FontWeight::FONT_WEIGHT_BOLD); + cr->set_font_size (20); + cr->move_to (20, 20); + cr->show_text ("Coucou"); + printf("OK \n"); + */ JaggedArray blend(bfw, bfh); buildBlendMask(lumreserv, blend, bfw, bfh, conthr, 1.f); float rm = 20.f / sk; @@ -12588,8 +12599,8 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o } - // if (conthr > 0.f && lp.mergemet != 4) { - if (conthr > 0.f) { + if (conthr > 0.f && lp.mergemet != 4) { + // if (conthr > 0.f) { #ifdef _OPENMP #pragma omp parallel for schedule(dynamic,16) @@ -12695,8 +12706,8 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o } } - if (conthr > 0.f) { - // if (conthr > 0.f && lp.mergemet != 4) { + // if (conthr > 0.f) { + if (conthr > 0.f && lp.mergemet != 4) { #ifdef _OPENMP #pragma omp parallel for schedule(dynamic,16) #endif @@ -13063,7 +13074,7 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o delete tmpImageorig; delete tmpImagereserv; - if (conthr > 0.f) { + if (conthr > 0.f && lp.mergemet != 4) { #ifdef _OPENMP #pragma omp parallel for schedule(dynamic,16) #endif diff --git a/rtgui/locallab.cc b/rtgui/locallab.cc index 939288c39..ea087b10e 100644 --- a/rtgui/locallab.cc +++ b/rtgui/locallab.cc @@ -5534,7 +5534,7 @@ void Locallab::merMethodChanged() { if (merMethod->get_active_row_number() == 0) { mask7->hide(); -// conthrcol->hide(); + conthrcol->hide(); sensi->set_sensitive(true); structcol->set_sensitive(true); blurcolde->set_sensitive(true); @@ -5552,7 +5552,7 @@ void Locallab::merMethodChanged() rgbCurveEditorG->set_sensitive(true); special->set_sensitive(true); invers->set_sensitive(true); -// conthrcol->hide(); + conthrcol->hide(); gridmerFrame->hide(); } else if (merMethod->get_active_row_number() == 2) { mask7->show(); @@ -5563,7 +5563,7 @@ void Locallab::merMethodChanged() rgbCurveEditorG->set_sensitive(false); special->set_sensitive(false); invers->set_sensitive(false); - // conthrcol->show(); + conthrcol->show(); gridmerFrame->hide(); } else if (merMethod->get_active_row_number() == 3) { sensi->set_sensitive(false); @@ -5574,11 +5574,11 @@ void Locallab::merMethodChanged() special->set_sensitive(false); invers->set_sensitive(false); mask7->show(); -// conthrcol->show(); + conthrcol->show(); gridmerFrame->hide(); } else if (merMethod->get_active_row_number() == 4) { mask7->show(); -// conthrcol->hide(); + conthrcol->hide(); blurcolde->set_sensitive(false); sensi->set_sensitive(false); structcol->set_sensitive(false); @@ -10317,7 +10317,7 @@ void Locallab::updateSpecificGUIState() if (merMethod->get_active_row_number() == 0) { mask7->hide(); -// conthrcol->hide(); + conthrcol->hide(); structcol->set_sensitive(true); sensi->set_sensitive(true); blurcolde->set_sensitive(true); @@ -10335,7 +10335,7 @@ void Locallab::updateSpecificGUIState() rgbCurveEditorG->set_sensitive(true); special->set_sensitive(true); invers->set_sensitive(true); -// conthrcol->hide(); + conthrcol->hide(); gridmerFrame->hide(); } else if (merMethod->get_active_row_number() == 2) { mask7->show(); @@ -10346,10 +10346,10 @@ void Locallab::updateSpecificGUIState() rgbCurveEditorG->set_sensitive(false); special->set_sensitive(false); invers->set_sensitive(false); -// conthrcol->show(); + conthrcol->show(); gridmerFrame->hide(); } else if (merMethod->get_active_row_number() == 3) { -// conthrcol->show(); + conthrcol->show(); structcol->set_sensitive(false); sensi->set_sensitive(false); blurcolde->set_sensitive(false); @@ -10368,7 +10368,7 @@ void Locallab::updateSpecificGUIState() rgbCurveEditorG->set_sensitive(false); special->set_sensitive(false); invers->set_sensitive(false); -// conthrcol->hide(); + conthrcol->hide(); gridmerFrame->show(); }