callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: move dissolve to layer-modes/

Browse Source
This commit is contained in:
Michael Natterer
2017-01-10 09:06:16 +01:00
parent 153796df9b
commit 99189d7a28
8 changed files with 102 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/gegl/gimp-gegl-nodes.c
View File

@ -155,7 +155,7 @@ gimp_gegl_mode_node_set_mode (GeglNode *node,
break;
case GIMP_LAYER_MODE_DISSOLVE:
operation = "gimp:dissolve-mode";
operation = "gimp:dissolve";
break;
case GIMP_LAYER_MODE_BEHIND:

2
app/operations/Makefile.am
View File

@ -97,8 +97,6 @@ libappoperations_a_SOURCES = \
\
gimpoperationpointlayermode.c \
gimpoperationpointlayermode.h \
gimpoperationdissolvemode.c \
gimpoperationdissolvemode.h \
gimpoperationbehindmode.c \
gimpoperationbehindmode.h \
gimpoperationdarkenonlymode.c \

4
app/operations/gimp-operations.c
View File

@ -67,7 +67,7 @@
#include "gimpoperationpointlayermode.h"
#include "layer-modes/gimpoperationnormal.h"
#include "gimpoperationdissolvemode.h"
#include "layer-modes/gimpoperationdissolve.h"
#include "gimpoperationbehindmode.h"
#include "layer-modes/gimpoperationmultiply.h"
#include "layer-modes-legacy/gimpoperationmultiplylegacy.h"
@ -137,7 +137,7 @@ gimp_operations_init (void)
g_type_class_ref (GIMP_TYPE_OPERATION_POINT_LAYER_MODE);
g_type_class_ref (GIMP_TYPE_OPERATION_NORMAL);
g_type_class_ref (GIMP_TYPE_OPERATION_DISSOLVE_MODE);
g_type_class_ref (GIMP_TYPE_OPERATION_DISSOLVE);
g_type_class_ref (GIMP_TYPE_OPERATION_BEHIND_MODE);
g_type_class_ref (GIMP_TYPE_OPERATION_MULTIPLY);
g_type_class_ref (GIMP_TYPE_OPERATION_MULTIPLY_LEGACY);

4
app/operations/gimplayermodefunctions.c
View File

@ -27,7 +27,7 @@
#include "gimplayermodefunctions.h"
#include "layer-modes/gimpoperationnormal.h"
#include "gimpoperationdissolvemode.h"
#include "layer-modes/gimpoperationdissolve.h"
#include "gimpoperationbehindmode.h"
#include "layer-modes/gimpoperationmultiply.h"
#include "layer-modes-legacy/gimpoperationmultiplylegacy.h"
@ -77,7 +77,7 @@ get_layer_mode_function (GimpLayerMode paint_mode,
break;
case GIMP_LAYER_MODE_DISSOLVE:
func = gimp_operation_dissolve_mode_process_pixels;
func = gimp_operation_dissolve_process_pixels;
break;
case GIMP_LAYER_MODE_BEHIND:

61
app/operations/gimpoperationdissolvemode.h
View File

@ -1,61 +0,0 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* gimpoperationdissolvemode.h
* Copyright (C) 2012 Ville Sokk <ville.sokk@gmail.com>
*
* 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/>.
*/
#ifndef __GIMP_OPERATION_DISSOLVE_MODE_H__
#define __GIMP_OPERATION_DISSOLVE_MODE_H__
#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_DISSOLVE_MODE (gimp_operation_dissolve_mode_get_type ())
#define GIMP_OPERATION_DISSOLVE_MODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_DISSOLVE_MODE, GimpOperationDissolveMode))
#define GIMP_OPERATION_DISSOLVE_MODE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_OPERATION_DISSOLVE_MODE, GimpOperationDissolveModeClass))
#define GIMP_IS_OPERATION_DISSOLVE_MODE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_DISSOLVE_MODE))
#define GIMP_IS_OPERATION_DISSOLVE_MODE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_OPERATION_DISSOLVE_MODE))
#define GIMP_OPERATION_DISSOLVE_MODE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_OPERATION_DISSOLVE_MODE, GimpOperationDissolveModeClass))
typedef struct _GimpOperationDissolveMode GimpOperationDissolveMode;
typedef struct _GimpOperationDissolveModeClass GimpOperationDissolveModeClass;
struct _GimpOperationDissolveModeClass
{
GimpOperationPointLayerModeClass parent_class;
};
struct _GimpOperationDissolveMode
{
GimpOperationPointLayerMode parent_instance;
};
GType gimp_operation_dissolve_mode_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_dissolve_mode_process_pixels (gfloat *in,
gfloat *layer,
gfloat *mask,
gfloat *out,
gfloat opacity,
glong samples,
const GeglRectangle *result,
gint level);
#endif /* __GIMP_OPERATION_DISSOLVE_MODE_H__ */

2
app/operations/layer-modes/Makefile.am
View File

@ -20,6 +20,8 @@ noinst_LIBRARIES = \
libapplayermodes_generic_a_sources = \
gimpoperationnormal.c \
gimpoperationnormal.h \
gimpoperationdissolve.c \
gimpoperationdissolve.h \
gimpoperationdodge.c \
gimpoperationdodge.h \
gimpoperationmultiply.c \

66
app/operations/gimpoperationdissolvemode.c → app/operations/layer-modes/gimpoperationdissolve.c
View File

@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* gimpoperationdissolvemode.c
* gimpoperationdissolve.c
* Copyright (C) 2012 Ville Sokk <ville.sokk@gmail.com>
* 2012 Øyvind Kolås <pippin@gimp.org>
* 2003 Helvetix Victorinox
@ -24,32 +24,32 @@
#include <gegl-plugin.h>
#include "operations-types.h"
#include "../operations-types.h"
#include "gimpoperationdissolvemode.h"
#include "gimpoperationdissolve.h"
#define RANDOM_TABLE_SIZE 4096
static gboolean gimp_operation_dissolve_mode_process (GeglOperation *operation,
void *in_buf,
void *aux_buf,
void *aux2_buf,
void *out_buf,
glong samples,
const GeglRectangle *result,
gint level);
static gboolean gimp_operation_dissolve_process (GeglOperation *operation,
void *in_buf,
void *aux_buf,
void *aux2_buf,
void *out_buf,
glong samples,
const GeglRectangle *result,
gint level);
G_DEFINE_TYPE (GimpOperationDissolveMode, gimp_operation_dissolve_mode,
G_DEFINE_TYPE (GimpOperationDissolve, gimp_operation_dissolve,
GIMP_TYPE_OPERATION_POINT_LAYER_MODE)
static gint32 random_table[RANDOM_TABLE_SIZE];
static void
gimp_operation_dissolve_mode_class_init (GimpOperationDissolveModeClass *klass)
gimp_operation_dissolve_class_init (GimpOperationDissolveClass *klass)
{
GeglOperationClass *operation_class;
GeglOperationPointComposer3Class *point_composer_class;
@ -60,12 +60,12 @@ gimp_operation_dissolve_mode_class_init (GimpOperationDissolveModeClass *klass)
point_composer_class = GEGL_OPERATION_POINT_COMPOSER3_CLASS (klass);
gegl_operation_class_set_keys (operation_class,
"name", "gimp:dissolve-mode",
"name", "gimp:dissolve",
"description", "GIMP dissolve mode operation",
"categories", "compositors",
NULL);
point_composer_class->process = gimp_operation_dissolve_mode_process;
point_composer_class->process = gimp_operation_dissolve_process;
/* generate a table of random seeds */
gr = g_rand_new_with_seed (314159265);
@ -76,34 +76,34 @@ gimp_operation_dissolve_mode_class_init (GimpOperationDissolveModeClass *klass)
}
static void
gimp_operation_dissolve_mode_init (GimpOperationDissolveMode *self)
gimp_operation_dissolve_init (GimpOperationDissolve *self)
{
}
static gboolean
gimp_operation_dissolve_mode_process (GeglOperation *operation,
void *in_buf,
void *aux_buf,
void *aux2_buf,
void *out_buf,
glong samples,
const GeglRectangle *result,
gint level)
gimp_operation_dissolve_process (GeglOperation *operation,
void *in_buf,
void *aux_buf,
void *aux2_buf,
void *out_buf,
glong samples,
const GeglRectangle *result,
gint level)
{
gfloat opacity = GIMP_OPERATION_POINT_LAYER_MODE (operation)->opacity;
return gimp_operation_dissolve_mode_process_pixels (in_buf, aux_buf, aux2_buf, out_buf, opacity, samples, result, level);
return gimp_operation_dissolve_process_pixels (in_buf, aux_buf, aux2_buf, out_buf, opacity, samples, result, level);
}
gboolean
gimp_operation_dissolve_mode_process_pixels (gfloat *in,
gfloat *aux,
gfloat *mask,
gfloat *out,
gfloat opacity,
glong samples,
const GeglRectangle *result,
gint level)
gimp_operation_dissolve_process_pixels (gfloat *in,
gfloat *aux,
gfloat *mask,
gfloat *out,
gfloat opacity,
glong samples,
const GeglRectangle *result,
gint level)
{
const gboolean has_mask = mask != NULL;
gint x, y;

62
app/operations/layer-modes/gimpoperationdissolve.h Normal file
View File

@ -0,0 +1,62 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* gimpoperationdissolve.h
* Copyright (C) 2012 Ville Sokk <ville.sokk@gmail.com>
*
* 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/>.
*/
#ifndef __GIMP_OPERATION_DISSOLVE_H__
#define __GIMP_OPERATION_DISSOLVE_H__
#include "../gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_DISSOLVE (gimp_operation_dissolve_get_type ())
#define GIMP_OPERATION_DISSOLVE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_DISSOLVE, GimpOperationDissolve))
#define GIMP_OPERATION_DISSOLVE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_OPERATION_DISSOLVE, GimpOperationDissolveClass))
#define GIMP_IS_OPERATION_DISSOLVE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_DISSOLVE))
#define GIMP_IS_OPERATION_DISSOLVE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_OPERATION_DISSOLVE))
#define GIMP_OPERATION_DISSOLVE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_OPERATION_DISSOLVE, GimpOperationDissolveClass))
typedef struct _GimpOperationDissolve GimpOperationDissolve;
typedef struct _GimpOperationDissolveClass GimpOperationDissolveClass;
struct _GimpOperationDissolveClass
{
GimpOperationPointLayerModeClass parent_class;
};
struct _GimpOperationDissolve
{
GimpOperationPointLayerMode parent_instance;
};
GType gimp_operation_dissolve_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_dissolve_process_pixels (gfloat *in,
gfloat *layer,
gfloat *mask,
gfloat *out,
gfloat opacity,
glong samples,
const GeglRectangle *result,
gint level);
#endif /* __GIMP_OPERATION_DISSOLVE_H__ */