Commit 7be394c3 authored by Umang Jain's avatar Umang Jain Committed by Debarshi Ray

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
parent d53f33b8
......@@ -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
......
......@@ -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 \
......
......@@ -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);
......
This diff is collapsed.
/*
* Photos - access, organize and share your photos on GNOME
* Copyright © 2017 Red Hat, Inc.
* Copyright © 2017 Thomas Manni
* Copyright © 2012 – 2015 Ulrich Pegelow
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* Based on code from:
* + Darktable
* + GEGL
*/
#ifndef PHOTOS_OPERATION_SHADOWS_HIGHLIGHTS_CORRECTION_H
#define PHOTOS_OPERATION_SHADOWS_HIGHLIGHTS_CORRECTION_H
#include <gegl-plugin.h>
G_BEGIN_DECLS
#define PHOTOS_TYPE_OPERATION_SHADOWS_HIGHLIGHTS_CORRECTION (photos_operation_shadows_highlights_correction_get_type ())
G_DECLARE_FINAL_TYPE (PhotosOperationShadowsHighlightsCorrection,
photos_operation_shadows_highlights_correction,
PHOTOS,
OPERATION_SHADOWS_HIGHLIGHTS_CORRECTION,
GeglOperationPointComposer);
G_END_DECLS
#endif /* PHOTOS_OPERATION_SHADOWS_HIGHLIGHTS_CORRECTION_H */
This diff is collapsed.
/*
* Photos - access, organize and share your photos on GNOME
* Copyright © 2017 Red Hat, Inc.
* Copyright © 2017 Thomas Manni
* Copyright © 2012 – 2015 Ulrich Pegelow
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* Based on code from:
* + Darktable
* + GEGL
*/
#ifndef PHOTOS_OPERATION_SHADOWS_HIGHLIGHTS_H
#define PHOTOS_OPERATION_SHADOWS_HIGHLIGHTS_H
#include <gegl-plugin.h>
G_BEGIN_DECLS
#define PHOTOS_TYPE_OPERATION_SHADOWS_HIGHLIGHTS (photos_operation_shadows_highlights_get_type ())
G_DECLARE_FINAL_TYPE (PhotosOperationShadowsHighlights,
photos_operation_shadows_highlights,
PHOTOS,
OPERATION_SHADOWS_HIGHLIGHTS,
GeglOperationMeta);
G_END_DECLS
#endif /* PHOTOS_OPERATION_SHADOWS_HIGHLIGHTS_H */
......@@ -59,7 +59,7 @@ static const gchar *OPERATIONS[] =
{
"gegl:crop",
"gegl:noise-reduction",
"photos:shadows-highlights",
"gegl:shadows-highlights",
"photos:saturation",
"photos:insta-filter"
};
......
......@@ -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);
......
......@@ -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))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment