eUgEntOptIc44/gimp
1
1
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-10-05 21:02:42 +02:00
Code Issues Releases Activity

libgimp*, pdb, plug-ins: remove deprecated GIMP_PRECISION_*_GAMMA.

Browse Source 
These were the last deprecated values in libgimp AFAICS.
This commit is contained in:
Jehan
2024-11-03 20:18:52 +01:00
parent 6ac920542e
commit 2559138931
6 changed files with 4 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libgimp/meson.build
View File

@@ -10,7 +10,6 @@ gimpenums_notail = custom_target('gimpenums.c.notail',
'--fhead','#include "config.h"\n'
+ '#include <gio/gio.h>\n'
+ '#include <gegl.h>\n'
+ '#undef GIMP_DISABLE_DEPRECATED\n'
+ '#include "libgimpbase/gimpbase.h"\n'
+ '#include "libgimpbase/gimpbase-private.h"\n'
+ '#include "libgimpconfig/gimpconfigenums.h"\n'

13
libgimpbase/gimpbaseenums.c
View File

@@ -4,7 +4,6 @@
#include "stamp-gimpbaseenums.h"
#include "config.h"
#include <glib-object.h>
#undef GIMP_DISABLE_DEPRECATED
#include "gimpbasetypes.h"
#include "libgimp/libgimp-intl.h"
#include "gimpbaseenums.h"
@@ -1332,12 +1331,6 @@ gimp_precision_get_type (void)
{ GIMP_PRECISION_DOUBLE_LINEAR, "GIMP_PRECISION_DOUBLE_LINEAR", "double-linear" },
{ GIMP_PRECISION_DOUBLE_NON_LINEAR, "GIMP_PRECISION_DOUBLE_NON_LINEAR", "double-non-linear" },
{ GIMP_PRECISION_DOUBLE_PERCEPTUAL, "GIMP_PRECISION_DOUBLE_PERCEPTUAL", "double-perceptual" },
{ GIMP_PRECISION_U8_GAMMA, "GIMP_PRECISION_U8_GAMMA", "u8-gamma" },
{ GIMP_PRECISION_U16_GAMMA, "GIMP_PRECISION_U16_GAMMA", "u16-gamma" },
{ GIMP_PRECISION_U32_GAMMA, "GIMP_PRECISION_U32_GAMMA", "u32-gamma" },
{ GIMP_PRECISION_HALF_GAMMA, "GIMP_PRECISION_HALF_GAMMA", "half-gamma" },
{ GIMP_PRECISION_FLOAT_GAMMA, "GIMP_PRECISION_FLOAT_GAMMA", "float-gamma" },
{ GIMP_PRECISION_DOUBLE_GAMMA, "GIMP_PRECISION_DOUBLE_GAMMA", "double-gamma" },
{ 0, NULL, NULL }
};
@@ -1361,12 +1354,6 @@ gimp_precision_get_type (void)
{ GIMP_PRECISION_DOUBLE_LINEAR, NC_("precision", "64-bit linear floating point"), NULL },
{ GIMP_PRECISION_DOUBLE_NON_LINEAR, NC_("precision", "64-bit non-linear floating point"), NULL },
{ GIMP_PRECISION_DOUBLE_PERCEPTUAL, NC_("precision", "64-bit perceptual floating point"), NULL },
{ GIMP_PRECISION_U8_GAMMA, "GIMP_PRECISION_U8_GAMMA", NULL },
{ GIMP_PRECISION_U16_GAMMA, "GIMP_PRECISION_U16_GAMMA", NULL },
{ GIMP_PRECISION_U32_GAMMA, "GIMP_PRECISION_U32_GAMMA", NULL },
{ GIMP_PRECISION_HALF_GAMMA, "GIMP_PRECISION_HALF_GAMMA", NULL },
{ GIMP_PRECISION_FLOAT_GAMMA, "GIMP_PRECISION_FLOAT_GAMMA", NULL },
{ GIMP_PRECISION_DOUBLE_GAMMA, "GIMP_PRECISION_DOUBLE_GAMMA", NULL },
{ 0, NULL, NULL }
};

21
libgimpbase/gimpbaseenums.h
View File

@@ -890,18 +890,6 @@ typedef enum
* @GIMP_PRECISION_DOUBLE_LINEAR: 64-bit linear floating point
* @GIMP_PRECISION_DOUBLE_NON_LINEAR: 64-bit non-linear floating point
* @GIMP_PRECISION_DOUBLE_PERCEPTUAL: 64-bit perceptual floating point
* @GIMP_PRECISION_U8_GAMMA: deprecated alias for
* @GIMP_PRECISION_U8_NON_LINEAR
* @GIMP_PRECISION_U16_GAMMA: deprecated alias for
* @GIMP_PRECISION_U16_NON_LINEAR
* @GIMP_PRECISION_U32_GAMMA: deprecated alias for
* @GIMP_PRECISION_U32_NON_LINEAR
* @GIMP_PRECISION_HALF_GAMMA: deprecated alias for
* @GIMP_PRECISION_HALF_NON_LINEAR
* @GIMP_PRECISION_FLOAT_GAMMA: deprecated alias for
* @GIMP_PRECISION_FLOAT_NON_LINEAR
* @GIMP_PRECISION_DOUBLE_GAMMA: deprecated alias for
* @GIMP_PRECISION_DOUBLE_NON_LINEAR
*
* Precisions for pixel encoding.
*
@@ -931,15 +919,6 @@ typedef enum
GIMP_PRECISION_DOUBLE_LINEAR = 700, /*< desc="64-bit linear floating point" >*/
GIMP_PRECISION_DOUBLE_NON_LINEAR = 750, /*< desc="64-bit non-linear floating point" >*/
GIMP_PRECISION_DOUBLE_PERCEPTUAL = 775, /*< desc="64-bit perceptual floating point" >*/
#ifndef GIMP_DISABLE_DEPRECATED
GIMP_PRECISION_U8_GAMMA = GIMP_PRECISION_U8_NON_LINEAR,
GIMP_PRECISION_U16_GAMMA = GIMP_PRECISION_U16_NON_LINEAR,
GIMP_PRECISION_U32_GAMMA = GIMP_PRECISION_U32_NON_LINEAR,
GIMP_PRECISION_HALF_GAMMA = GIMP_PRECISION_HALF_NON_LINEAR,
GIMP_PRECISION_FLOAT_GAMMA = GIMP_PRECISION_FLOAT_NON_LINEAR,
GIMP_PRECISION_DOUBLE_GAMMA = GIMP_PRECISION_DOUBLE_NON_LINEAR
#endif
} GimpPrecision;

1
libgimpbase/meson.build
View File

@@ -21,7 +21,6 @@ stamp_base_enums = custom_target('stamp-gimpbaseenums.h',
meson.current_build_dir(),
'gimpbase',
'#include <glib-object.h>\n' +
'#undef GIMP_DISABLE_DEPRECATED\n' +
'#include "gimpbasetypes.h"\n' +
'#include "libgimp/libgimp-intl.h"\n',
'',

14
pdb/enums.pl
View File

@@ -430,11 +430,7 @@ package Gimp::CodeGen::enums;
GIMP_PRECISION_FLOAT_PERCEPTUAL
GIMP_PRECISION_DOUBLE_LINEAR
GIMP_PRECISION_DOUBLE_NON_LINEAR
GIMP_PRECISION_DOUBLE_PERCEPTUAL
GIMP_PRECISION_U8_GAMMA GIMP_PRECISION_U16_GAMMA
GIMP_PRECISION_U32_GAMMA GIMP_PRECISION_HALF_GAMMA
GIMP_PRECISION_FLOAT_GAMMA
GIMP_PRECISION_DOUBLE_GAMMA) ],
GIMP_PRECISION_DOUBLE_PERCEPTUAL) ],
mapping => { GIMP_PRECISION_U8_LINEAR => '100',
GIMP_PRECISION_U8_NON_LINEAR => '150',
GIMP_PRECISION_U8_PERCEPTUAL => '175',
@@ -452,13 +448,7 @@ package Gimp::CodeGen::enums;
GIMP_PRECISION_FLOAT_PERCEPTUAL => '675',
GIMP_PRECISION_DOUBLE_LINEAR => '700',
GIMP_PRECISION_DOUBLE_NON_LINEAR => '750',
GIMP_PRECISION_DOUBLE_PERCEPTUAL => '775',
GIMP_PRECISION_U8_GAMMA => 'GIMP_PRECISION_U8_NON_LINEAR',
GIMP_PRECISION_U16_GAMMA => 'GIMP_PRECISION_U16_NON_LINEAR',
GIMP_PRECISION_U32_GAMMA => 'GIMP_PRECISION_U32_NON_LINEAR',
GIMP_PRECISION_HALF_GAMMA => 'GIMP_PRECISION_HALF_NON_LINEAR',
GIMP_PRECISION_FLOAT_GAMMA => 'GIMP_PRECISION_FLOAT_NON_LINEAR',
GIMP_PRECISION_DOUBLE_GAMMA => 'GIMP_PRECISION_DOUBLE_NON_LINEAR' }
GIMP_PRECISION_DOUBLE_PERCEPTUAL => '775' }
},
GimpProgressCommand =>
{ contig => 1,

4
plug-ins/python/file-openraster.py
View File

@@ -332,8 +332,8 @@ def export_ora(procedure, run_mode, image, file, options, metadata, config, data
else:
w, h = max(w*256/h, 1), 256
thumb_layer.scale(w, h, False)
if thumb.get_precision() != Gimp.Precision.U8_GAMMA:
thumb.convert_precision (Gimp.Precision.U8_GAMMA)
if thumb.get_precision() != Gimp.Precision.U8_NON_LINEAR:
thumb.convert_precision (Gimp.Precision.U8_NON_LINEAR)
store_layer(thumb, thumb_layer, 'Thumbnails/thumbnail.png')
thumb.delete()