[gnome-photos/origin/wip/uajain/drop_shadhi] Drop built-in implementation of shadows-highlights and use GEGL's
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-photos/origin/wip/uajain/drop_shadhi] Drop built-in implementation of shadows-highlights and use GEGL's
- Date: Sat, 3 Feb 2018 13:13:24 +0000 (UTC)
commit 7be394c3cc0a76a83570a0b03eb10966f70c6176
Author: Umang Jain <mailumangjain gmail com>
Date: Sat Feb 3 00:48:12 2018 +0530
Drop built-in implementation of shadows-highlights and use GEGL's
Bump minimum GEGL version to 0.3.28.
https://gitlab.gnome.org/GNOME/gnome-photos/issues/85
configure.ac | 2 +-
src/Makefile.am | 8 -
src/photos-gegl.c | 7 +-
...hotos-operation-shadows-highlights-correction.c | 453 ---------------------
...hotos-operation-shadows-highlights-correction.h | 42 --
src/photos-operation-shadows-highlights.c | 380 -----------------
src/photos-operation-shadows-highlights.h | 42 --
src/photos-pipeline.c | 2 +-
src/photos-preview-view.c | 2 +-
src/photos-tool-colors.c | 2 +-
10 files changed, 5 insertions(+), 935 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e4fd24e7..344c3307 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,7 @@ GLIB_GSETTINGS
CAIRO_MIN_VERSION=1.14.0
GDATA_MIN_VERSION=0.15.2
GDK_PIXBUF_MIN_VERSION=2.32
-GEGL_MIN_VERSION=0.3.15
+GEGL_MIN_VERSION=0.3.28
GFBGRAPH_MIN_VERSION=0.2.1
GLIB_MIN_VERSION=2.44.0
GOA_MIN_VERSION=3.8.0
diff --git a/src/Makefile.am b/src/Makefile.am
index 7561e1bc..bab99056 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -167,10 +167,6 @@ gnome_photos_SOURCES = \
photos-operation-png-guess-sizes.h \
photos-operation-saturation.c \
photos-operation-saturation.h \
- photos-operation-shadows-highlights.c \
- photos-operation-shadows-highlights.h \
- photos-operation-shadows-highlights-correction.c \
- photos-operation-shadows-highlights-correction.h \
photos-operation-svg-multiply.c \
photos-operation-svg-multiply.h \
photos-organize-collection-dialog.c \
@@ -343,10 +339,6 @@ gnome_photos_thumbnailer_SOURCES = \
photos-operation-png-guess-sizes.h \
photos-operation-saturation.c \
photos-operation-saturation.h \
- photos-operation-shadows-highlights.c \
- photos-operation-shadows-highlights.h \
- photos-operation-shadows-highlights-correction.c \
- photos-operation-shadows-highlights-correction.h \
photos-operation-svg-multiply.c \
photos-operation-svg-multiply.h \
photos-pipeline.c \
diff --git a/src/photos-gegl.c b/src/photos-gegl.c
index 748172c1..8b3909a8 100644
--- a/src/photos-gegl.c
+++ b/src/photos-gegl.c
@@ -33,8 +33,6 @@
#include "photos-operation-jpg-guess-sizes.h"
#include "photos-operation-png-guess-sizes.h"
#include "photos-operation-saturation.h"
-#include "photos-operation-shadows-highlights.h"
-#include "photos-operation-shadows-highlights-correction.h"
#include "photos-operation-svg-multiply.h"
#include "photos-quarks.h"
@@ -53,16 +51,15 @@ static const gchar *REQUIRED_GEGL_OPS[] =
{
"gegl:buffer-sink",
"gegl:buffer-source",
- "gegl:convert-format",
"gegl:crop",
"gegl:exposure",
- "gegl:gaussian-blur",
"gegl:gray",
"gegl:load",
"gegl:noise-reduction",
"gegl:nop",
"gegl:save-pixbuf",
"gegl:scale-ratio",
+ "gegl:shadows-highlights",
"gegl:unsharp-mask",
/* Used by gegl:load */
@@ -566,8 +563,6 @@ photos_gegl_ensure_builtins (void)
g_type_ensure (PHOTOS_TYPE_OPERATION_JPG_GUESS_SIZES);
g_type_ensure (PHOTOS_TYPE_OPERATION_PNG_GUESS_SIZES);
g_type_ensure (PHOTOS_TYPE_OPERATION_SATURATION);
- g_type_ensure (PHOTOS_TYPE_OPERATION_SHADOWS_HIGHLIGHTS);
- g_type_ensure (PHOTOS_TYPE_OPERATION_SHADOWS_HIGHLIGHTS_CORRECTION);
g_type_ensure (PHOTOS_TYPE_OPERATION_SVG_MULTIPLY);
g_once_init_leave (&once_init_value, 1);
diff --git a/src/photos-pipeline.c b/src/photos-pipeline.c
index 5b4f3201..0e0a5088 100644
--- a/src/photos-pipeline.c
+++ b/src/photos-pipeline.c
@@ -59,7 +59,7 @@ static const gchar *OPERATIONS[] =
{
"gegl:crop",
"gegl:noise-reduction",
- "photos:shadows-highlights",
+ "gegl:shadows-highlights",
"photos:saturation",
"photos:insta-filter"
};
diff --git a/src/photos-preview-view.c b/src/photos-preview-view.c
index 7e078dcd..5dd4b971 100644
--- a/src/photos-preview-view.c
+++ b/src/photos-preview-view.c
@@ -645,7 +645,7 @@ photos_preview_view_shadows_highlights (PhotosPreviewView *self, GVariant *param
self->cancellable,
photos_preview_view_process,
self,
- "photos:shadows-highlights",
+ "gegl:shadows-highlights",
"shadows", shadows,
"highlights", highlights,
NULL);
diff --git a/src/photos-tool-colors.c b/src/photos-tool-colors.c
index a93ceebc..bb69c6f2 100644
--- a/src/photos-tool-colors.c
+++ b/src/photos-tool-colors.c
@@ -253,7 +253,7 @@ photos_tool_colors_activate (PhotosTool *tool, PhotosBaseItem *item, PhotosImage
saturation = SATURATION_DEFAULT;
if (photos_base_item_operation_get (item,
- "photos:shadows-highlights",
+ "gegl:shadows-highlights",
"highlights", &highlights_real,
"shadows", &shadows_real,
NULL))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]