Add the Nohalo sampler (previously called Lohalo, which now does something different

This commit is contained in:
Nicolas Robidoux 2012-12-31 15:27:07 -05:00
parent ed4a818679
commit dc19ead94f
4 changed files with 8 additions and 2 deletions

View File

@ -37,6 +37,7 @@ gimp_interpolation_to_gegl_filter (GimpInterpolationType interpolation)
case GIMP_INTERPOLATION_NONE: return "nearest"; case GIMP_INTERPOLATION_NONE: return "nearest";
case GIMP_INTERPOLATION_LINEAR: return "linear"; case GIMP_INTERPOLATION_LINEAR: return "linear";
case GIMP_INTERPOLATION_CUBIC: return "cubic"; case GIMP_INTERPOLATION_CUBIC: return "cubic";
case GIMP_INTERPOLATION_NOHALO: return "nohalo";
case GIMP_INTERPOLATION_LOHALO: return "lohalo"; case GIMP_INTERPOLATION_LOHALO: return "lohalo";
default: default:
break; break;

View File

@ -570,6 +570,7 @@ gimp_interpolation_type_get_type (void)
{ GIMP_INTERPOLATION_NONE, "GIMP_INTERPOLATION_NONE", "none" }, { GIMP_INTERPOLATION_NONE, "GIMP_INTERPOLATION_NONE", "none" },
{ GIMP_INTERPOLATION_LINEAR, "GIMP_INTERPOLATION_LINEAR", "linear" }, { GIMP_INTERPOLATION_LINEAR, "GIMP_INTERPOLATION_LINEAR", "linear" },
{ GIMP_INTERPOLATION_CUBIC, "GIMP_INTERPOLATION_CUBIC", "cubic" }, { GIMP_INTERPOLATION_CUBIC, "GIMP_INTERPOLATION_CUBIC", "cubic" },
{ GIMP_INTERPOLATION_NOHALO, "GIMP_INTERPOLATION_NOHALO", "nohalo" },
{ GIMP_INTERPOLATION_LOHALO, "GIMP_INTERPOLATION_LOHALO", "lohalo" }, { GIMP_INTERPOLATION_LOHALO, "GIMP_INTERPOLATION_LOHALO", "lohalo" },
{ 0, NULL, NULL } { 0, NULL, NULL }
}; };
@ -579,6 +580,7 @@ gimp_interpolation_type_get_type (void)
{ GIMP_INTERPOLATION_NONE, NC_("interpolation-type", "None"), NULL }, { GIMP_INTERPOLATION_NONE, NC_("interpolation-type", "None"), NULL },
{ GIMP_INTERPOLATION_LINEAR, NC_("interpolation-type", "Linear"), NULL }, { GIMP_INTERPOLATION_LINEAR, NC_("interpolation-type", "Linear"), NULL },
{ GIMP_INTERPOLATION_CUBIC, NC_("interpolation-type", "Cubic"), NULL }, { GIMP_INTERPOLATION_CUBIC, NC_("interpolation-type", "Cubic"), NULL },
{ GIMP_INTERPOLATION_NOHALO, NC_("interpolation-type", "NoHalo"), NULL },
{ GIMP_INTERPOLATION_LOHALO, NC_("interpolation-type", "LoHalo"), NULL }, { GIMP_INTERPOLATION_LOHALO, NC_("interpolation-type", "LoHalo"), NULL },
{ 0, NULL, NULL } { 0, NULL, NULL }
}; };

View File

@ -256,6 +256,7 @@ typedef enum
GIMP_INTERPOLATION_NONE, /*< desc="None" >*/ GIMP_INTERPOLATION_NONE, /*< desc="None" >*/
GIMP_INTERPOLATION_LINEAR, /*< desc="Linear" >*/ GIMP_INTERPOLATION_LINEAR, /*< desc="Linear" >*/
GIMP_INTERPOLATION_CUBIC, /*< desc="Cubic" >*/ GIMP_INTERPOLATION_CUBIC, /*< desc="Cubic" >*/
GIMP_INTERPOLATION_NOHALO, /*< desc="NoHalo" >*/
GIMP_INTERPOLATION_LOHALO, /*< desc="LoHalo" >*/ GIMP_INTERPOLATION_LOHALO, /*< desc="LoHalo" >*/
GIMP_INTERPOLATION_LANCZOS = GIMP_INTERPOLATION_LOHALO /*< skip */ GIMP_INTERPOLATION_LANCZOS = GIMP_INTERPOLATION_LOHALO /*< skip */
} GimpInterpolationType; } GimpInterpolationType;

View File

@ -176,11 +176,13 @@ package Gimp::CodeGen::enums;
{ contig => 1, { contig => 1,
header => 'libgimpbase/gimpbaseenums.h', header => 'libgimpbase/gimpbaseenums.h',
symbols => [ qw(GIMP_INTERPOLATION_NONE GIMP_INTERPOLATION_LINEAR symbols => [ qw(GIMP_INTERPOLATION_NONE GIMP_INTERPOLATION_LINEAR
GIMP_INTERPOLATION_CUBIC GIMP_INTERPOLATION_LOHALO) ], GIMP_INTERPOLATION_CUBIC GIMP_INTERPOLATION_NOHALO
GIMP_INTERPOLATION_LOHALO) ],
mapping => { GIMP_INTERPOLATION_NONE => '0', mapping => { GIMP_INTERPOLATION_NONE => '0',
GIMP_INTERPOLATION_LINEAR => '1', GIMP_INTERPOLATION_LINEAR => '1',
GIMP_INTERPOLATION_CUBIC => '2', GIMP_INTERPOLATION_CUBIC => '2',
GIMP_INTERPOLATION_LOHALO => '3' } GIMP_INTERPOLATION_NOHALO => '3',
GIMP_INTERPOLATION_LOHALO => '4' }
}, },
GimpPaintApplicationMode => GimpPaintApplicationMode =>
{ contig => 1, { contig => 1,