diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index cf82dafb8..5a5c3b8d0 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -15,8 +15,8 @@ on: workflow_dispatch: env: - publish_pre_dev_labels: '[]' - + publish_pre_dev_labels: '[]' + jobs: build: runs-on: ubuntu-20.04 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 6963df7c9..e5f4ce166 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -17,6 +17,7 @@ on: env: publish_pre_dev_labels: '[]' + jobs: build: runs-on: windows-latest diff --git a/rtengine/colortemp.cc b/rtengine/colortemp.cc index 1c98b3e8b..f8a4b60b2 100644 --- a/rtengine/colortemp.cc +++ b/rtengine/colortemp.cc @@ -32,7 +32,6 @@ namespace rtengine { - static const color_match_type cie_colour_match_jd2 = {//350nm to 830nm 5 nm J.Desmis 2° Standard Observer. {0.0000000, 0.000000, 0.000000}, {0.0000000, 0.000000, 0.000000}, {0.0001299, 0.0003917, 0.0006061}, {0.0002321, 0.000006965, 0.001086}, {0.0004149, 0.00001239, 0.001946}, {0.0007416, 0.00002202, 0.003846}, diff --git a/rtengine/colortemp.h b/rtengine/colortemp.h index db69abe2d..00b79ef85 100644 --- a/rtengine/colortemp.h +++ b/rtengine/colortemp.h @@ -31,9 +31,9 @@ using color_match_type = double [97][3]; constexpr double MINTEMP = 1500.0; constexpr double MAXTEMP = 60000.0; constexpr double MINGREEN = 0.02; -constexpr double MAXGREEN = 10.0; -constexpr double MINEQUAL = 0.8; -constexpr double MAXEQUAL = 1.5; +constexpr double MAXGREEN = 100.0; +constexpr double MINEQUAL = 0.5; +constexpr double MAXEQUAL = 2.; constexpr double INITIALBLACKBODY = 4000.0; enum class StandardObserver { diff --git a/rtgui/whitebalance.cc b/rtgui/whitebalance.cc index 63a1d2100..d207ef7a2 100644 --- a/rtgui/whitebalance.cc +++ b/rtgui/whitebalance.cc @@ -31,9 +31,9 @@ #define MAXTEMP 60000 //12000 #define CENTERTEMP 4750 #define MINGREEN 0.02 -#define MAXGREEN 10.0 -#define MINEQUAL 0.8 -#define MAXEQUAL 1.5 +#define MAXGREEN 100.0 +#define MINEQUAL 0.5 +#define MAXEQUAL 2. using namespace rtengine; using namespace rtengine::procparams; @@ -396,7 +396,7 @@ WhiteBalance::WhiteBalance () : FoldableToolPanel(this, TOOL_NAME, M("TP_WBALANC pack_start(*StudLabel); pack_start(*PatchLabel); pack_start(*PatchlevelLabel); - + green->setLogScale(MAXGREEN / MINGREEN, MINGREEN); pack_start (*temp); //pack_start (*boxgreen); pack_start (*green);