RFC/WIP: collected pull requests for 5.0

README.md

@@ -172,7 +172,7 @@ Required dependencies (minimum version):
 * CMake 3.18
 * GTK 3.24.15
 * GLib 2.56
-* SQLite 3.15 *(but 3.24 or newer strongly recommended)*
+* SQLite 3.24
 * libcurl 7.56
 * Exiv2 0.27.2 *(but at least 0.27.4 built with ISO BMFF support needed for Canon CR3 raw import)*
 * pugixml 1.5

RELEASE_NOTES.md

@@ -95,6 +95,7 @@ changes (where available).
 - Bump Exiv2 requirement to 0.27.2
 - Minimum pugixml version 1.5 is now required
 - Minimum libcurl version 7.56 is now required
+- Bump SQLite requirement to 3.24
 
 ### Optional
 

data/CMakeLists.txt

@@ -1,4 +1,5 @@
 add_subdirectory(pixmaps ${DARKTABLE_DATADIR}/pixmaps)
+add_subdirectory(styles ${DARKTABLE_DATADIR}/styles)
 
 if(USE_OPENCL)
 	add_subdirectory(kernels ${DARKTABLE_DATADIR}/kernels)

data/darktableconfig.xml.in

@@ -100,6 +100,13 @@
     <shortdescription>enable shortcut fallbacks</shortdescription>
     <longdescription>enables default meanings for additional buttons, modifiers or moves when used in combination with a base shortcut</longdescription>
   </dtconfig>
+  <dtconfig prefs="misc" section="interface">
+    <name>show_splash_screen</name>
+    <type>bool</type>
+    <default>true</default>
+    <shortdescription>show splash screen at startup</shortdescription>
+    <longdescription>display a small message dialog showing the progress of darktable's startup before the main window appears</longdescription>
+  </dtconfig>
   <dtconfig prefs="misc" section="interface">
     <name>accel/load_defaults</name>
     <type>bool</type>
@@ -956,7 +963,7 @@
   <dtconfig>
     <name>ui_last/preferences_dialog_height</name>
     <type>int</type>
-    <default>700</default>
+    <default>720</default>
     <shortdescription/>
     <longdescription/>
   </dtconfig>

data/kernels/gaussian.cl

@@ -24,8 +24,8 @@
    is needed to have read-write access to some buffers which openCL does not offer for image object. */
 
 
-kernel void 
-gaussian_transpose_4c(global float4 *in, global float4 *out, unsigned int width, unsigned int height, 
+kernel void
+gaussian_transpose_4c(global float4 *in, global float4 *out, unsigned int width, unsigned int height,
                       unsigned int blocksize, local float4 *buffer)
 {
   unsigned int x = get_global_id(0);
@@ -49,9 +49,34 @@ gaussian_transpose_4c(global float4 *in, global float4 *out, unsigned int width,
   }
 }
 
+kernel void
+gaussian_transpose_2c(global float2 *in, global float2 *out, unsigned int width, unsigned int height,
+                      unsigned int blocksize, local float2 *buffer)
+{
+  unsigned int x = get_global_id(0);
+  unsigned int y = get_global_id(1);
+
+  if((x < width) && (y < height))
+  {
+    const unsigned int iindex = mad24(y, width, x);
+    buffer[mad24(get_local_id(1), blocksize + 1, get_local_id(0))] = in[iindex];
+  }
 
-kernel void 
-gaussian_transpose_1c(global float *in, global float *out, unsigned int width, unsigned int height, 
+  barrier(CLK_LOCAL_MEM_FENCE);
+
+  x = mad24(get_group_id(1), blocksize, get_local_id(0));
+  y = mad24(get_group_id(0), blocksize, get_local_id(1));
+
+  if((x < height) && (y < width))
+  {
+    const unsigned int oindex = mad24(y, height, x);
+    out[oindex] = buffer[mad24(get_local_id(0), blocksize + 1, get_local_id(1))];
+  }
+}
+
+
+kernel void
+gaussian_transpose_1c(global float *in, global float *out, unsigned int width, unsigned int height,
                       unsigned int blocksize, local float *buffer)
 {
   unsigned int x = get_global_id(0);
@@ -76,7 +101,7 @@ gaussian_transpose_1c(global float *in, global float *out, unsigned int width, u
 }
 
 
-kernel void 
+kernel void
 gaussian_column_4c(global float4 *in, global float4 *out, unsigned int width, unsigned int height,
                   const float a0, const float a1, const float a2, const float a3, const float b1, const float b2,
                   const float coefp, const float coefn, const float4 Labmax, const float4 Labmin)
@@ -100,7 +125,6 @@ gaussian_column_4c(global float4 *in, global float4 *out, unsigned int width, un
   yb = xp * coefp;
   yp = yb;
 
-
   for(int y=0; y<height; y++)
   {
     const int idx = mad24((unsigned int)y, width, x);
@@ -113,7 +137,6 @@ gaussian_column_4c(global float4 *in, global float4 *out, unsigned int width, un
     yp = yc;
 
     out[idx] = yc;
-
   }
 
   // backward filter
@@ -122,25 +145,83 @@ gaussian_column_4c(global float4 *in, global float4 *out, unsigned int width, un
   yn = xn * coefn;
   ya = yn;
 
-
   for(int y=height-1; y>-1; y--)
   {
     const int idx = mad24((unsigned int)y, width, x);
 
     xc = clamp(in[idx], Labmin, Labmax);
     yc = (a2 * xn) + (a3 * xa) - (b1 * yn) - (b2 * ya);
 
-    xa = xn; 
-    xn = xc; 
-    ya = yn; 
+    xa = xn;
+    xn = xc;
+    ya = yn;
     yn = yc;
 
     out[idx] += yc;
+  }
+}
+
+kernel void
+gaussian_column_2c(global float2 *in, global float2 *out, unsigned int width, unsigned int height,
+                  const float a0, const float a1, const float a2, const float a3, const float b1, const float b2,
+                  const float coefp, const float coefn, const float2 Labmax, const float2 Labmin)
+{
+  const unsigned int x = get_global_id(0);
+
+  if(x >= width) return;
+
+  float2 xp = (float2)0.0f;
+  float2 yb = (float2)0.0f;
+  float2 yp = (float2)0.0f;
+  float2 xc = (float2)0.0f;
+  float2 yc = (float2)0.0f;
+  float2 xn = (float2)0.0f;
+  float2 xa = (float2)0.0f;
+  float2 yn = (float2)0.0f;
+  float2 ya = (float2)0.0f;
+
+  // forward filter
+  xp = clamp(in[x], Labmin, Labmax); // 0*width+x
+  yb = xp * coefp;
+  yp = yb;
+
+  for(int y=0; y<height; y++)
+  {
+    const int idx = mad24((unsigned int)y, width, x);
+
+    xc = clamp(in[idx], Labmin, Labmax);
+    yc = (a0 * xc) + (a1 * xp) - (b1 * yp) - (b2 * yb);
+
+    xp = xc;
+    yb = yp;
+    yp = yc;
 
+    out[idx] = yc;
+  }
+
+  // backward filter
+  xn = clamp(in[mad24(height - 1, width, x)], Labmin, Labmax);
+  xa = xn;
+  yn = xn * coefn;
+  ya = yn;
+
+  for(int y=height-1; y>-1; y--)
+  {
+    const int idx = mad24((unsigned int)y, width, x);
+
+    xc = clamp(in[idx], Labmin, Labmax);
+    yc = (a2 * xn) + (a3 * xa) - (b1 * yn) - (b2 * ya);
+
+    xa = xn;
+    xn = xc;
+    ya = yn;
+    yn = yc;
+
+    out[idx] += yc;
   }
 }
 
-kernel void 
+kernel void
 gaussian_column_1c(global float *in, global float *out, unsigned int width, unsigned int height,
                   const float a0, const float a1, const float a2, const float a3, const float b1, const float b2,
                   const float coefp, const float coefn, const float Labmax, const float Labmin)
@@ -164,7 +245,6 @@ gaussian_column_1c(global float *in, global float *out, unsigned int width, unsi
   yb = xp * coefp;
   yp = yb;
 
-
   for(int y=0; y<height; y++)
   {
     const int idx = mad24((unsigned int)y, width, x);
@@ -177,7 +257,6 @@ gaussian_column_1c(global float *in, global float *out, unsigned int width, unsi
     yp = yc;
 
     out[idx] = yc;
-
   }
 
   // backward filter
@@ -194,13 +273,12 @@ gaussian_column_1c(global float *in, global float *out, unsigned int width, unsi
     xc = clamp(in[idx], Labmin, Labmax);
     yc = (a2 * xn) + (a3 * xa) - (b1 * yn) - (b2 * ya);
 
-    xa = xn; 
-    xn = xc; 
-    ya = yn; 
+    xa = xn;
+    xn = xc;
+    ya = yn;
     yn = yc;
 
     out[idx] += yc;
-
   }
 }
 
@@ -225,8 +303,8 @@ lookup_unbounded(read_only image2d_t lut, const float x, global float *a)
 }
 
 
-kernel void 
-lowpass_mix(read_only image2d_t in, write_only image2d_t out, unsigned int width, unsigned int height, const float saturation, 
+kernel void
+lowpass_mix(read_only image2d_t in, write_only image2d_t out, unsigned int width, unsigned int height, const float saturation,
             read_only image2d_t ctable, global float *ca, read_only image2d_t ltable, global float *la, const int unbound)
 {
   const unsigned int x = get_global_id(0);
@@ -307,11 +385,11 @@ overlay(const float4 in_a, const float4 in_b, const float opacity, const float t
 #define UNBOUND_HIGHLIGHTS_A   (UNBOUND_A << 3)   /* 16 */
 #define UNBOUND_HIGHLIGHTS_B   (UNBOUND_B << 3)   /* 32 */
 
-kernel void 
-shadows_highlights_mix(read_only image2d_t in, read_only image2d_t mask, write_only image2d_t out, 
-                       unsigned int width, unsigned int height, 
+kernel void
+shadows_highlights_mix(read_only image2d_t in, read_only image2d_t mask, write_only image2d_t out,
+                       unsigned int width, unsigned int height,
                        const float shadows, const float highlights, const float compress,
-                       const float shadows_ccorrect, const float highlights_ccorrect, 
+                       const float shadows_ccorrect, const float highlights_ccorrect,
                        const unsigned int flags, const int unbound_mask, const float low_approximation,
                        const float whitepoint)
 {

data/styles/CMakeLists.txt

@@ -0,0 +1,8 @@
+#
+# Install default styles
+#
+FILE(GLOB STYLE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/darktable*.dtstyle)
+install(FILES ${STYLE_FILES} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/darktable/styles COMPONENT DTApplication)
+# Need to copy to have in build dir so we can run from there and have darktable find the
+# files like after installing
+file(COPY ${STYLE_FILES} DESTINATION ${DARKTABLE_DATADIR}/styles)

data/styles/darktable_Canon_EOS 10D.dtstyle

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<darktable_style version="1.0"><info><name>_l10n_darktable camera styles|Canon|EOS...|EOS 10D</name><description></description></info><style><plugin><num>13</num><module>3</module><operation>sigmoid</operation><op_params>0000c03f000000000000c8426c09793c000000000000c8420000000000000000000000000000000000000000000000000000000000000000</op_params><enabled>0</enabled><blendop_params>gz08eJxjYGBgYAFiCQYYOOHEgAZY0QWAgBGLGANDgz0Ej1Q+dlAx68oBEMbFxwX+AwGIBgCbGCeh</blendop_params><blendop_version>13</blendop_version><multi_priority>0</multi_priority><multi_name></multi_name><multi_name_hand_edited>0</multi_name_hand_edited></plugin><plugin><num>12</num><module>6</module><operation>basecurve</operation><op_params>gz09eJxjYIAAM6vnNnqyn22E9n235b6aa3cy6rVdRaK9/Y970fYf95bbMzA0QPEoGEqADYnNhCELiVNGIAsAAkoSGQ==</op_params><enabled>0</enabled><blendop_params>gz08eJxjYGBgYAFiCQYYOOHEgAZY0QWAgBGLGANDgz0Ej1Q+dlAx68oBEMbFxwX+AwGIBgCbGCeh</blendop_params><blendop_version>13</blendop_version><multi_priority>0</multi_priority><multi_name></multi_name><multi_name_hand_edited>0</multi_name_hand_edited></plugin><plugin><num>11</num><module>6</module><operation>exposure</operation><op_params>00000000000080b93333333f00004842000080c001000000</op_params><enabled>1</enabled><blendop_params>gz08eJxjYGBgYAFiCQYYOOHEgAZY0QWAgBGLGANDgz0Ej1Q+dlAx68oBEMbFxwX+AwGIBgCbGCeh</blendop_params><blendop_version>13</blendop_version><multi_priority>0</multi_priority><multi_name>scene-referred default</multi_name><multi_name_hand_edited>0</multi_name_hand_edited></plugin><plugin><num>10</num><module>3</module><operation>bilat</operation><op_params>010000000000003f0000003f0000803e0000003f</op_params><enabled>1</enabled><blendop_params>gz10eJxjYGBgYAJiCQYYOOHEgAZY0QWAgBGLGANDgz0Ej1Q+dcF/IADRAG2yHQc=</blendop_params><blendop_version>13</blendop_version><multi_priority>0</multi_priority><multi_name></multi_name><multi_name_hand_edited>0</multi_name_hand_edited></plugin><plugin><num>9</num><module>6</module><operation>filmicrgb</operation><op_params>gz02eJybNXOy4///9QeA2IEBDByA9AknCIaAWUA1+ssqbEBiVrwyDlzXlW1mzJxpD5M/e8bHjhlIswAxI1SMEYkNA0xQGgAU9xVL</op_params><enabled>1</enabled><blendop_params>gz08eJxjYGBgYAFiCQYYOOHEgAZY0QWAgBGLGANDgz0Ej1Q+dlAx68oBEMbFxwX+AwGIBgCbGCeh</blendop_params><blendop_version>13</blendop_version><multi_priority>0</multi_priority><multi_name></multi_name><multi_name_hand_edited>0</multi_name_hand_edited></plugin></style></darktable_style>

data/styles/darktable_Canon_EOS 1100D.dtstyle

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<darktable_style version="1.0"><info><name>_l10n_darktable camera styles|Canon|EOS...|EOS 1100D</name><description></description></info><style><plugin><num>14</num><module>6</module><operation>basecurve</operation><op_params>gz09eJxjYIAAM6vnNnqyn22E9n235b6aa3cy6rVdRaK9/Y970fYf95bbMzA0QPEoGEqADYnNhCELiVNGIAsAAkoSGQ==</op_params><enabled>0</enabled><blendop_params>gz08eJxjYGBgYAFiCQYYOOHEgAZY0QWAgBGLGANDgz0Ej1Q+dlAx68oBEMbFxwX+AwGIBgCbGCeh</blendop_params><blendop_version>13</blendop_version><multi_priority>0</multi_priority><multi_name></multi_name><multi_name_hand_edited>0</multi_name_hand_edited></plugin><plugin><num>13</num><module>3</module><operation>sigmoid</operation><op_params>0000c03f000000000000c8426c09793c000000000000c8420000000000000000000000000000000000000000000000000000000000000000</op_params><enabled>0</enabled><blendop_params>gz08eJxjYGBgYAFiCQYYOOHEgAZY0QWAgBGLGANDgz0Ej1Q+dlAx68oBEMbFxwX+AwGIBgCbGCeh</blendop_params><blendop_version>13</blendop_version><multi_priority>0</multi_priority><multi_name></multi_name><multi_name_hand_edited>0</multi_name_hand_edited></plugin><plugin><num>12</num><module>3</module><operation>bilat</operation><op_params>010000000000003f0000003f0000803e0000003f</op_params><enabled>1</enabled><blendop_params>gz10eJxjYGBgYAJiCQYYOOHEgAZY0QWAgBGLGANDgz0Ej1Q+dcF/IADRAG2yHQc=</blendop_params><blendop_version>13</blendop_version><multi_priority>0</multi_priority><multi_name></multi_name><multi_name_hand_edited>0</multi_name_hand_edited></plugin><plugin><num>11</num><module>5</module><operation>colorbalancergb</operation><op_params>gz04eJxjYCAVNNij0ghw4oyPHSHdE9/a2J04c8YWRIP4jEAMAEpmCis=</op_params><enabled>1</enabled><blendop_params>gz08eJxjYGBgYAFiCQYYOOHEgAZY0QWAgBGLGANDgz0Ej1Q+dlAx68oBEMbFxwX+AwGIBgCbGCeh</blendop_params><blendop_version>13</blendop_version><multi_priority>0</multi_priority><multi_name></multi_name><multi_name_hand_edited>0</multi_name_hand_edited></plugin><plugin><num>10</num><module>6</module><operation>filmicrgb</operation><op_params>gz02eJybNXOy4///9Qf+/7d3YAADByB9wgmCIWAWUI3+sgobkNh8T0cHruvKNqlpy+xh8mfP+NgxA2kWIGaEijEisWGACUoDABnGFXg=</op_params><enabled>1</enabled><blendop_params>gz08eJxjYGBgYAFiCQYYOOHEgAZY0QWAgBGLGANDgz0Ej1Q+dlAx68oBEMbFxwX+AwGIBgCbGCeh</blendop_params><blendop_version>13</blendop_version><multi_priority>0</multi_priority><multi_name></multi_name><multi_name_hand_edited>0</multi_name_hand_edited></plugin><plugin><num>9</num><module>6</module><operation>exposure</operation><op_params>00000000000080b90200803f00004842000080c001000000</op_params><enabled>1</enabled><blendop_params>gz08eJxjYGBgYAFiCQYYOOHEgAZY0QWAgBGLGANDgz0Ej1Q+dlAx68oBEMbFxwX+AwGIBgCbGCeh</blendop_params><blendop_version>13</blendop_version><multi_priority>0</multi_priority><multi_name></multi_name><multi_name_hand_edited>0</multi_name_hand_edited></plugin></style></darktable_style>

data/styles/darktable_Canon_EOS 2000D.dtstyle

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<darktable_style version="1.0"><info><name>_l10n_darktable camera styles|Canon|EOS...|EOS 2000D</name><description></description></info><style><plugin><num>14</num><module>6</module><operation>filmicrgb</operation><op_params>gz02eJybNXOyIwPDggP//9c7MICBA5A+4QTBEDALqEZ/WYUNSEyWzcKB67qyTWraMnuY/NkzPnbMQJoFiBmhYoxIbBhggtIALeETDQ==</op_params><enabled>1</enabled><blendop_params>gz08eJxjYGBgYAFiCQYYOOHEgAZY0QWAgBGLGANDgz0Ej1Q+dlAx68oBEMbFxwX+AwGIBgCbGCeh</blendop_params><blendop_version>13</blendop_version><multi_priority>0</multi_priority><multi_name></multi_name><multi_name_hand_edited>0</multi_name_hand_edited></plugin><plugin><num>13</num><module>6</module><operation>basecurve</operation><op_params>gz09eJxjYIAAM6vnNnqyn22E9n235b6aa3cy6rVdRaK9/Y970fYf95bbMzA0QPEoGEqADYnNhCELiVNGIAsAAkoSGQ==</op_params><enabled>0</enabled><blendop_params>gz08eJxjYGBgYAFiCQYYOOHEgAZY0QWAgBGLGANDgz0Ej1Q+dlAx68oBEMbFxwX+AwGIBgCbGCeh</blendop_params><blendop_version>13</blendop_version><multi_priority>0</multi_priority><multi_name></multi_name><multi_name_hand_edited>0</multi_name_hand_edited></plugin><plugin><num>12</num><module>3</module><operation>sigmoid</operation><op_params>0000c03f000000000000c8426c09793c000000000000c8420000000000000000000000000000000000000000000000000000000000000000</op_params><enabled>0</enabled><blendop_params>gz08eJxjYGBgYAFiCQYYOOHEgAZY0QWAgBGLGANDgz0Ej1Q+dlAx68oBEMbFxwX+AwGIBgCbGCeh</blendop_params><blendop_version>13</blendop_version><multi_priority>0</multi_priority><multi_name></multi_name><multi_name_hand_edited>0</multi_name_hand_edited></plugin><plugin><num>11</num><module>3</module><operation>bilat</operation><op_params>010000000000003f0000003f0000803e0000003f</op_params><enabled>1</enabled><blendop_params>gz10eJxjYGBgYAJiCQYYOOHEgAZY0QWAgBGLGANDgz0Ej1Q+dcF/IADRAG2yHQc=</blendop_params><blendop_version>13</blendop_version><multi_priority>0</multi_priority><multi_name></multi_name><multi_name_hand_edited>0</multi_name_hand_edited></plugin><plugin><num>10</num><module>6</module><operation>exposure</operation><op_params>00000000000080b90200803f00004842000080c001000000</op_params><enabled>1</enabled><blendop_params>gz08eJxjYGBgYAFiCQYYOOHEgAZY0QWAgBGLGANDgz0Ej1Q+dlAx68oBEMbFxwX+AwGIBgCbGCeh</blendop_params><blendop_version>13</blendop_version><multi_priority>0</multi_priority><multi_name></multi_name><multi_name_hand_edited>0</multi_name_hand_edited></plugin><plugin><num>9</num><module>5</module><operation>colorbalancergb</operation><op_params>gz04eJxjYCAVNNij0ghw4oyPHSHdE9/a2J0BqgPRID4jEAMAQ7MJsA==</op_params><enabled>1</enabled><blendop_params>gz08eJxjYGBgYAFiCQYYOOHEgAZY0QWAgBGLGANDgz0Ej1Q+dlAx68oBEMbFxwX+AwGIBgCbGCeh</blendop_params><blendop_version>13</blendop_version><multi_priority>0</multi_priority><multi_name></multi_name><multi_name_hand_edited>0</multi_name_hand_edited></plugin></style></darktable_style>