diff --git a/app/actions/buffers-commands.c b/app/actions/buffers-commands.c index 454429ec52..8af896219d 100644 --- a/app/actions/buffers-commands.c +++ b/app/actions/buffers-commands.c @@ -43,7 +43,7 @@ #include "gimp-intl.h" -/* public functionss */ +/* public functions */ void buffers_paste_cmd_callback (GtkAction *action, diff --git a/app/actions/dashboard-commands.c b/app/actions/dashboard-commands.c index 2259490fee..d9611f79de 100644 --- a/app/actions/dashboard-commands.c +++ b/app/actions/dashboard-commands.c @@ -32,7 +32,7 @@ #include "gimp-intl.h" -/* public functionss */ +/* public functions */ void diff --git a/app/actions/data-editor-commands.c b/app/actions/data-editor-commands.c index 032084fa06..369626ba5a 100644 --- a/app/actions/data-editor-commands.c +++ b/app/actions/data-editor-commands.c @@ -27,7 +27,7 @@ #include "data-editor-commands.h" -/* public functionss */ +/* public functions */ void data_editor_edit_active_cmd_callback (GtkAction *action, diff --git a/app/actions/debug-actions.c b/app/actions/debug-actions.c index 79d5539c2a..c2fbff694b 100644 --- a/app/actions/debug-actions.c +++ b/app/actions/debug-actions.c @@ -44,7 +44,7 @@ static const GimpActionEntry debug_actions[] = { "debug-benchmark-projection", NULL, "Benchmark _Projection", NULL, "Invalidates the entire projection, measures the time it takes to " - "validate (render) the part that is visible in the active diaplay, " + "validate (render) the part that is visible in the active display, " "and print the result to stdout.", G_CALLBACK (debug_benchmark_projection_cmd_callback), NULL }, diff --git a/app/actions/fonts-commands.c b/app/actions/fonts-commands.c index 0178ff4fa6..149cfef7c1 100644 --- a/app/actions/fonts-commands.c +++ b/app/actions/fonts-commands.c @@ -30,7 +30,7 @@ #include "fonts-commands.h" -/* public functionss */ +/* public functions */ void fonts_refresh_cmd_callback (GtkAction *action, diff --git a/app/actions/gradient-editor-commands.c b/app/actions/gradient-editor-commands.c index 9ffc70e623..18a0c4702b 100644 --- a/app/actions/gradient-editor-commands.c +++ b/app/actions/gradient-editor-commands.c @@ -65,7 +65,7 @@ static void gradient_editor_replicate_response (GtkWidget *widge GimpGradientEditor *editor); -/* public functionss */ +/* public functions */ void gradient_editor_left_color_cmd_callback (GtkAction *action, diff --git a/app/actions/images-commands.c b/app/actions/images-commands.c index 0e62350f0a..f7260a305b 100644 --- a/app/actions/images-commands.c +++ b/app/actions/images-commands.c @@ -38,7 +38,7 @@ #include "images-commands.h" -/* public functionss */ +/* public functions */ void images_raise_views_cmd_callback (GtkAction *action, diff --git a/app/actions/palettes-commands.c b/app/actions/palettes-commands.c index d601c1a766..f3f1f5f8b3 100644 --- a/app/actions/palettes-commands.c +++ b/app/actions/palettes-commands.c @@ -51,7 +51,7 @@ static void palettes_merge_callback (GtkWidget *widget, gpointer data); -/* public functionss */ +/* public functions */ void palettes_import_cmd_callback (GtkAction *action, diff --git a/app/actions/quick-mask-commands.c b/app/actions/quick-mask-commands.c index 49373cfafd..ea699bc47e 100644 --- a/app/actions/quick-mask-commands.c +++ b/app/actions/quick-mask-commands.c @@ -59,7 +59,7 @@ static void quick_mask_configure_callback (GtkWidget *dialog, gpointer user_data); -/* public functionss */ +/* public functions */ void quick_mask_toggle_cmd_callback (GtkAction *action, diff --git a/app/core/gimpbrush-load.c b/app/core/gimpbrush-load.c index 30ec7b46b4..7f5117f010 100644 --- a/app/core/gimpbrush-load.c +++ b/app/core/gimpbrush-load.c @@ -584,7 +584,7 @@ gimp_brush_load_abr_brush_v12 (GDataInputStream *input, /* FIXME: support it! * * We can probabaly feed the info into the generated brush code - * and get a useable brush back. It seems to support the same + * and get a usable brush back. It seems to support the same * types -akl */ g_printerr ("WARNING: computed brush unsupported, skipping.\n"); diff --git a/app/core/gimpbrush-transform.cc b/app/core/gimpbrush-transform.cc index fc83488882..0c1d43ec83 100644 --- a/app/core/gimpbrush-transform.cc +++ b/app/core/gimpbrush-transform.cc @@ -92,7 +92,7 @@ gimp_brush_real_transform_size (GimpBrush *brush, * corner points of the destination image to work out the starting * position in the source image and the U and V deltas in the source * image space. It then uses a scan-line approach, looping through - * rows and colummns in the transformed (destination) image while + * rows and columns in the transformed (destination) image while * walking along the corresponding rows and columns (named U and V) in * the source image. * @@ -392,7 +392,7 @@ gimp_brush_real_transform_mask (GimpBrush *brush, * corner points of the destination image to work out the starting * position in the source image and the U and V deltas in the source * image space. It then uses a scan-line approach, looping through - * rows and colummns in the transformed (destination) image while + * rows and columns in the transformed (destination) image while * walking along the corresponding rows and columns (named U and V) in * the source image. * diff --git a/app/core/gimpcurve.c b/app/core/gimpcurve.c index 9365067979..6417bd57e7 100644 --- a/app/core/gimpcurve.c +++ b/app/core/gimpcurve.c @@ -1005,9 +1005,9 @@ gimp_curve_plot (GimpCurve *curve, /* * the x values of the inner control points are fixed at * x1 = 2/3*x0 + 1/3*x3 and x2 = 1/3*x0 + 2/3*x3 - * this ensures that the x values increase linearily with the + * this ensures that the x values increase linearly with the * parameter t and enables us to skip the calculation of the x - * values altogehter - just calculate y(t) evenly spaced. + * values altogether - just calculate y(t) evenly spaced. */ dx = x3 - x0; @@ -1061,7 +1061,7 @@ gimp_curve_plot (GimpCurve *curve, /* * finally calculate the y(t) values for the given bezier values. We can - * use homogenously distributed values for t, since x(t) increases linearily. + * use homogenously distributed values for t, since x(t) increases linearly. */ for (i = 0; i <= ROUND (dx * (gdouble) (curve->n_samples - 1)); i++) { diff --git a/app/core/gimpcurve.h b/app/core/gimpcurve.h index a069e6f89e..8e6455a14b 100644 --- a/app/core/gimpcurve.h +++ b/app/core/gimpcurve.h @@ -44,7 +44,7 @@ struct _GimpCurve gint n_samples; gdouble *samples; - gboolean identity; /* whether the curve is an identiy mapping */ + gboolean identity; /* whether the curve is an identity mapping */ }; struct _GimpCurveClass diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c index 8508419129..dc33618622 100644 --- a/app/core/gimpimage.c +++ b/app/core/gimpimage.c @@ -3552,7 +3552,7 @@ gimp_image_parasite_attach (GimpImage *image, C_("undo-type", "Attach Parasite to Image"), ©); - /* We used to push an cantundo on te stack here. This made the undo stack + /* We used to push a cantundo on the stack here. This made the undo stack * unusable (NULL on the stack) and prevented people from undoing after a * save (since most save plug-ins attach an undoable comment parasite). * Now we simply attach the parasite without pushing an undo. That way diff --git a/app/core/gimpitem.c b/app/core/gimpitem.c index a0ccaa61d8..84685e74f7 100644 --- a/app/core/gimpitem.c +++ b/app/core/gimpitem.c @@ -2006,7 +2006,7 @@ gimp_item_replace_item (GimpItem *item, gimp_item_get_ID (item), item); - /* Set image before tatoo so that the explicitly set tatoo overrides + /* Set image before tattoo so that the explicitly set tattoo overrides * the one implicitly set when setting the image */ gimp_item_set_image (item, gimp_item_get_image (replace)); diff --git a/app/core/gimppalette-import.h b/app/core/gimppalette-import.h index 69dcc1cc36..d1be6aa6cf 100644 --- a/app/core/gimppalette-import.h +++ b/app/core/gimppalette-import.h @@ -29,7 +29,7 @@ GimpPalette * gimp_palette_import_from_image (GimpImage *image, GimpContext *context, const gchar *palette_name, gint n_colors, - gint treshold, + gint threshold, gboolean selection_only); GimpPalette * gimp_palette_import_from_indexed_image (GimpImage *image, GimpContext *context, diff --git a/app/core/gimpscanconvert.c b/app/core/gimpscanconvert.c index d287532ff5..694f0d6154 100644 --- a/app/core/gimpscanconvert.c +++ b/app/core/gimpscanconvert.c @@ -375,7 +375,7 @@ gimp_scan_convert_stroke (GimpScanConvert *sc, /** * gimp_scan_convert_render: * @sc: a #GimpScanConvert context - * @bufferr: the #GeglBuffer to render to + * @buffer: the #GeglBuffer to render to * @off_x: horizontal offset into the @buffer * @off_y: vertical offset into the @buffer * @antialias: whether to apply antialiasiing diff --git a/app/core/gimpstrokeoptions.c b/app/core/gimpstrokeoptions.c index bac3d2a4bd..4433270abc 100644 --- a/app/core/gimpstrokeoptions.c +++ b/app/core/gimpstrokeoptions.c @@ -78,7 +78,7 @@ struct _GimpStrokeOptionsPrivate { GimpStrokeMethod method; - /* options for medhod == LIBART */ + /* options for method == LIBART */ gdouble width; GimpUnit unit; diff --git a/app/core/gimptag.c b/app/core/gimptag.c index 1d1ceff581..9d2a895db2 100644 --- a/app/core/gimptag.c +++ b/app/core/gimptag.c @@ -155,7 +155,7 @@ gimp_tag_get_internal (GimpTag *tag) /** * gimp_tag_set_internal: * @tag: a gimp tag. - * @inernal: desired tag internal status + * @internal: desired tag internal status * * Set internal status of the tag. Internal tags are usually automatically * generated and will not be saved into users tag cache. diff --git a/app/core/gimpviewable.c b/app/core/gimpviewable.c index 21187e7d00..800c93eedb 100644 --- a/app/core/gimpviewable.c +++ b/app/core/gimpviewable.c @@ -1173,7 +1173,7 @@ gimp_viewable_get_dummy_pixbuf (GimpViewable *viewable, /** * gimp_viewable_get_description: * @viewable: viewable object for which to retrieve a description. - * @tooltip: return loaction for an optional tooltip string. + * @tooltip: return location for an optional tooltip string. * * Retrieves a string containing a description of the viewable object, * By default, it simply returns the name of the object, but this can diff --git a/app/display/gimpcanvas.c b/app/display/gimpcanvas.c index 9c51194dbb..3cf2f8065a 100644 --- a/app/display/gimpcanvas.c +++ b/app/display/gimpcanvas.c @@ -191,7 +191,7 @@ gimp_canvas_focus (GtkWidget *widget, /* override GtkContainer's focus() implementation which would always * give focus to the canvas because it is focussable. Instead, try - * navigating in the focussed overlay child first, and use + * navigating in the focused overlay child first, and use * GtkContainer's default implementation only if that fails (which * happens when focus navigation leaves the overlay child). */ diff --git a/app/display/gimpdisplayshell-transform.c b/app/display/gimpdisplayshell-transform.c index 8155c04335..702dffc028 100644 --- a/app/display/gimpdisplayshell-transform.c +++ b/app/display/gimpdisplayshell-transform.c @@ -961,7 +961,7 @@ gimp_display_shell_untransform_bounds_with_scale (GimpDisplayShell *shell, * @width: returns width of display measured in image coordinates * @height: returns height of display measured in image coordinates * - * This function calculates the part of the image, im image coordinates, + * This function calculates the part of the image, in image coordinates, * that corresponds to the display viewport. **/ void diff --git a/app/display/gimptoolrectangle.c b/app/display/gimptoolrectangle.c index e726258551..3836ec2ef0 100644 --- a/app/display/gimptoolrectangle.c +++ b/app/display/gimptoolrectangle.c @@ -191,7 +191,7 @@ struct _GimpToolRectanglePrivate /* How to constrain the rectangle. */ GimpRectangleConstraint constraint; - /* What precision the rectangle will apear to have externally (it + /* What precision the rectangle will appear to have externally (it * will always be double internally) */ GimpRectanglePrecision precision; diff --git a/app/operations/gimpcurvesconfig.c b/app/operations/gimpcurvesconfig.c index ae9bc71358..013bc5b584 100644 --- a/app/operations/gimpcurvesconfig.c +++ b/app/operations/gimpcurvesconfig.c @@ -672,7 +672,7 @@ gimp_curves_config_save_cruft (GimpCurvesConfig *config, for (j = 0; j < curve->n_points; j++) { - /* don't use gimp_curve_get_point() becaue that doesn't + /* don't use gimp_curve_get_point() because that doesn't * work when the curve type is GIMP_CURVE_FREE */ gdouble x = curve->points[j].x; diff --git a/app/operations/gimpoperationflood.c b/app/operations/gimpoperationflood.c index f9de086a4c..386876cf54 100644 --- a/app/operations/gimpoperationflood.c +++ b/app/operations/gimpoperationflood.c @@ -781,7 +781,7 @@ gimp_operation_flood_process_propagate_horizontal (GimpOperationFloodContext GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE); } - /* The new water level is the maximum of the curernt ground level, + /* The new water level is the maximum of the current ground level, * and the minimum of the current and previous water levels. Recall * that `level` holds the previous water level, and that the current * water level is never less than the ground level. diff --git a/app/operations/gimpoperationgrow.c b/app/operations/gimpoperationgrow.c index 9b7f413239..1e3b79d8a6 100644 --- a/app/operations/gimpoperationgrow.c +++ b/app/operations/gimpoperationgrow.c @@ -372,7 +372,7 @@ gimp_operation_grow_process (GeglOperation *operation, GEGL_AUTO_ROWSTRIDE); } - /* undo the offsets to the pointers so we can free the malloced memmory */ + /* undo the offsets to the pointers so we can free the malloced memory */ circ -= self->radius_x; max -= self->radius_x; diff --git a/app/operations/gimpoperationshrink.c b/app/operations/gimpoperationshrink.c index 86a318d269..0339e7e7c4 100644 --- a/app/operations/gimpoperationshrink.c +++ b/app/operations/gimpoperationshrink.c @@ -423,11 +423,11 @@ gimp_operation_shrink_process (GeglOperation *operation, GEGL_AUTO_ROWSTRIDE); } - /* undo the offsets to the pointers so we can free the malloced memmory */ + /* undo the offsets to the pointers so we can free the malloced memory */ circ -= self->radius_x; max -= self->radius_x; - /* free the memmory */ + /* free the memory */ g_free (circ); g_free (buffer); g_free (max); diff --git a/app/paint/gimppaintcore-loops.cc b/app/paint/gimppaintcore-loops.cc index 9b1fdeee7d..92c8ab5eb7 100644 --- a/app/paint/gimppaintcore-loops.cc +++ b/app/paint/gimppaintcore-loops.cc @@ -336,7 +336,7 @@ struct AlgorithmBase /* BasicDispatch: * * A class template implementing a simple dispatch function object, which adds - * an algorithm to the heirarchy unconditionally. 'AlgorithmTemplate' is the + * an algorithm to the hierarchy unconditionally. 'AlgorithmTemplate' is the * alogithm class template (usually a helper class, rather than an actual * algorithm), and 'Mask' is the dispatch function mask, as described in * 'dispatch()'. @@ -369,7 +369,7 @@ struct BasicDispatch * is a list of (types of) dispatch functions the algorithm depends on, usd as * explained below. * - * 'AlgorithmDispatch' adds the algorithm to the heirarchy if it's included in + * 'AlgorithmDispatch' adds the algorithm to the hierarchy if it's included in * the set of requested algorithms; specifically, if the bitwise-AND of the * requested-algorithms bitset and of 'Mask' is equal to 'Mask'. * @@ -881,7 +881,7 @@ struct PaintMaskToPaintBuffer : Base PaintMaskToPaintBuffer (const GimpPaintCoreLoopsParams *params) : Base (params) { - /* Validate that the paint buffer is withing the bounds of the paint mask */ + /* Validate that the paint buffer is within the bounds of the paint mask */ g_return_if_fail (gimp_temp_buf_get_width (params->paint_buf) <= gimp_temp_buf_get_width (params->paint_mask) - params->paint_mask_offset_x); diff --git a/app/pdb/plug-in-compat-cmds.c b/app/pdb/plug-in-compat-cmds.c index 340ede4b3e..4931e76807 100644 --- a/app/pdb/plug-in-compat-cmds.c +++ b/app/pdb/plug-in-compat-cmds.c @@ -8036,13 +8036,13 @@ register_plug_in_compat_procs (GimpPDB *pdb) gimp_procedure_add_argument (procedure, g_param_spec_double ("alpha1", "alpha1", - "alpha for the first color (used if the drawable has an alpha chanel)", + "alpha for the first color (used if the drawable has an alpha channel)", 0, 1, 0, GIMP_PARAM_READWRITE)); gimp_procedure_add_argument (procedure, g_param_spec_double ("alpha2", "alpha2", - "alpha for the second color (used if the drawable has an alpha chanel)", + "alpha for the second color (used if the drawable has an alpha channel)", 0, 1, 0, GIMP_PARAM_READWRITE)); gimp_procedure_add_argument (procedure, diff --git a/app/tests/test-ui.c b/app/tests/test-ui.c index 39ca748118..6384d6f1dd 100644 --- a/app/tests/test-ui.c +++ b/app/tests/test-ui.c @@ -711,7 +711,7 @@ repeatedly_switch_window_mode (gconstpointer data) /* Switch to single-window mode */ gimp_ui_switch_window_mode (gimp); - /* Rememeber the single-window mode size */ + /* Remember the single-window mode size */ gtk_window_get_size (GTK_WINDOW (toplevel), &expected_second_width, &expected_second_height); diff --git a/app/tests/test-xcf.c b/app/tests/test-xcf.c index df0a9934ed..1c6054ecb9 100644 --- a/app/tests/test-xcf.c +++ b/app/tests/test-xcf.c @@ -446,7 +446,7 @@ gimp_create_mainimage (Gimp *gimp, GIMP_MAINIMAGE_SAMPLEPOINT2_Y, FALSE /*push_undo*/); - /* Tatto + /* Tattoo * We don't bother testing this, not yet at least */ diff --git a/app/text/gimptext-xlfd.c b/app/text/gimptext-xlfd.c index 2dc632fba8..65b92d8bef 100644 --- a/app/text/gimptext-xlfd.c +++ b/app/text/gimptext-xlfd.c @@ -224,7 +224,7 @@ gimp_text_set_font_from_xlfd (GimpText *text, * * Returns: a pointer to the filled buffer or %NULL if fontname is * %NULL, the field is longer than XFLD_MAX_FIELD_LEN or it contains - * just an asteriks. + * just an asterisk. **/ static gchar * gimp_text_get_xlfd_field (const gchar *fontname, diff --git a/app/text/gimptextlayout.h b/app/text/gimptextlayout.h index 510b039ccc..56882e9acb 100644 --- a/app/text/gimptextlayout.h +++ b/app/text/gimptextlayout.h @@ -43,7 +43,7 @@ GimpTextLayout * gimp_text_layout_new (GimpText *text, GError **error); gboolean gimp_text_layout_get_size (GimpTextLayout *layout, gint *width, - gint *heigth); + gint *height); void gimp_text_layout_get_offsets (GimpTextLayout *layout, gint *x, gint *y); diff --git a/app/tools/gimpcagetool.c b/app/tools/gimpcagetool.c index 033db1511a..1cfd4af355 100644 --- a/app/tools/gimpcagetool.c +++ b/app/tools/gimpcagetool.c @@ -300,7 +300,7 @@ gimp_cage_tool_button_press (GimpTool *tool, switch (ct->tool_state) { case CAGE_STATE_INIT: - /* No handle yet, we add the first one and swith the tool to + /* No handle yet, we add the first one and switch the tool to * moving handle state. */ gimp_cage_config_add_cage_point (ct->config, diff --git a/app/tools/gimprectangleselecttool.c b/app/tools/gimprectangleselecttool.c index 50c4584e36..7567df2bd8 100644 --- a/app/tools/gimprectangleselecttool.c +++ b/app/tools/gimprectangleselecttool.c @@ -832,7 +832,7 @@ gimp_rectangle_select_tool_commit (GimpRectangleSelectTool *rect_tool) gimp_tool_control_push_preserve (tool->control, TRUE); /* We can conceptually think of a click outside of the - * selection as adding a 0px selection. Behave intuitivly + * selection as adding a 0px selection. Behave intuitively * for the current selection mode */ operation = gimp_rectangle_select_tool_get_operation (rect_tool); diff --git a/app/widgets/gimpdialogfactory.c b/app/widgets/gimpdialogfactory.c index 695d8eae4e..c8f5fceaaf 100644 --- a/app/widgets/gimpdialogfactory.c +++ b/app/widgets/gimpdialogfactory.c @@ -822,7 +822,7 @@ gimp_dialog_factory_dialog_raise (GimpDialogFactory *factory, /** * gimp_dialog_factory_dockable_new: * @factory: a #GimpDialogFactory - * @dock: a #GimpDock crated by this %factory. + * @dock: a #GimpDock created by this %factory. * @identifier: the identifier of the dialog as registered with * gimp_dialog_factory_register_entry() * @view_size: diff --git a/app/widgets/gimpdockwindow.c b/app/widgets/gimpdockwindow.c index 4e191fd78d..7a6bd886e2 100644 --- a/app/widgets/gimpdockwindow.c +++ b/app/widgets/gimpdockwindow.c @@ -659,7 +659,7 @@ gimp_dock_window_delete_event (GtkWidget *widget, GimpDialogFactoryEntry *entry = NULL; gchar *name = NULL; - /* Don't add docks with just a singe dockable to the list of + /* Don't add docks with just a single dockable to the list of * recently closed dock since those can be brought back through the * normal Windows->Dockable Dialogs menu */ diff --git a/app/widgets/gimplayertreeview.c b/app/widgets/gimplayertreeview.c index 10fda92c1e..04d3f5ebfe 100644 --- a/app/widgets/gimplayertreeview.c +++ b/app/widgets/gimplayertreeview.c @@ -669,7 +669,7 @@ gimp_layer_tree_view_drop_possible (GimpContainerTreeView *tree_view, GtkTreeViewDropPosition *return_drop_pos, GdkDragAction *return_drag_action) { - /* If we are dropping a new layer, check if the destionation image + /* If we are dropping a new layer, check if the destination image * has a floating selection. */ if (src_type == GIMP_DND_TYPE_URI_LIST || diff --git a/app/xcf/xcf-load.c b/app/xcf/xcf-load.c index c964e2c771..110b0600c5 100644 --- a/app/xcf/xcf-load.c +++ b/app/xcf/xcf-load.c @@ -2451,7 +2451,7 @@ xcf_load_old_path (XcfInfo *info, { guint32 dummy; - /* Has extra tatto field */ + /* Has extra tattoo field */ xcf_read_int32 (info, (guint32 *) &dummy, 1); xcf_read_int32 (info, (guint32 *) &tattoo, 1); } diff --git a/devel-docs/commit-rules.txt b/devel-docs/commit-rules.txt index b01daeb3e4..b6569aa5fc 100644 --- a/devel-docs/commit-rules.txt +++ b/devel-docs/commit-rules.txt @@ -26,4 +26,4 @@ commits. Whenever you make a change that is worthy of being mentioned in the NEWS file, update the NEWS file too. The purpose of this rule is to - make it as easy as possble to make a GIMP release. + make it as easy as possible to make a GIMP release. diff --git a/devel-docs/includes.txt b/devel-docs/includes.txt index c97f114f7e..3fdd9a1c99 100644 --- a/devel-docs/includes.txt +++ b/devel-docs/includes.txt @@ -26,7 +26,7 @@ The include order of all .c files of a module is as follows: /* example of a .c file from app/core */ -#include "config.h" /* alyways and first */ +#include "config.h" /* always and first */ #include /* *only* needed if the file needs stuff */ /* like G_OS_WIN32 for conditional inclusion */ diff --git a/devel-docs/xcf.txt b/devel-docs/xcf.txt index c18f8a753c..cfaf1d9ce4 100644 --- a/devel-docs/xcf.txt +++ b/devel-docs/xcf.txt @@ -523,7 +523,7 @@ TODO: can this cause confusion and hard-to-find errors? If so, fix. Text ---- -GIMP stores text in plain layers with parasites for the text and formattting +GIMP stores text in plain layers with parasites for the text and formatting and PROP_TEXT_LAYER_FLAGS for flags. diff --git a/libgimpconfig/gimpconfigwriter.c b/libgimpconfig/gimpconfigwriter.c index 7da9a9a4cb..e2166000c5 100644 --- a/libgimpconfig/gimpconfigwriter.c +++ b/libgimpconfig/gimpconfigwriter.c @@ -357,7 +357,7 @@ gimp_config_writer_comment_mode (GimpConfigWriter *writer, * @writer: a #GimpConfigWriter * @name: name of the element to open * - * This function writes the opening parenthese followed by @name. + * This function writes the opening parentheses followed by @name. * It also increases the indentation level and sets a mark that * can be used by gimp_config_writer_revert(). * diff --git a/plug-ins/common/curve-bend.c b/plug-ins/common/curve-bend.c index 80964bfedc..1d067e40bc 100644 --- a/plug-ins/common/curve-bend.c +++ b/plug-ins/common/curve-bend.c @@ -2938,7 +2938,7 @@ p_vertical_bend (BenderDialog *cd, src_gdrw->drawable->height); l_diff = l_curvy = l_nb_curvy = l_nb2_curvy= l_miny = l_maxy = 0; - /* allocate array of last values (one element foreach x koordinate) */ + /* allocate array of last values (one element foreach x coordinate) */ last_arr = g_new (t_Last, src_gdrw->x2); first_arr = g_new (t_Last, src_gdrw->x2); diff --git a/plug-ins/common/decompose.c b/plug-ins/common/decompose.c index 5bf080909b..b034ffef70 100644 --- a/plug-ins/common/decompose.c +++ b/plug-ins/common/decompose.c @@ -451,7 +451,7 @@ decompose (gint32 image_ID, GeglBuffer *src_buffer; GeglBuffer *dst_buffer[MAX_EXTRACT_IMAGES]; GimpPrecision precision; - gboolean requirments = FALSE; + gboolean requirements = FALSE; gboolean decomp_has_alpha = FALSE; extract_idx = -1; /* Search extract type */ @@ -479,15 +479,15 @@ decompose (gint32 image_ID, decomp_has_alpha |= ! g_strcmp0 ("A", extract[extract_idx].component[j].babl_name); } - requirments |= (gimp_drawable_is_rgb (drawable_ID)); - requirments |= (gimp_drawable_is_indexed (drawable_ID)); - requirments |= (gimp_drawable_is_gray (drawable_ID) + requirements |= (gimp_drawable_is_rgb (drawable_ID)); + requirements |= (gimp_drawable_is_indexed (drawable_ID)); + requirements |= (gimp_drawable_is_gray (drawable_ID) && gimp_drawable_has_alpha (drawable_ID) && (num_layers <= 2) && decomp_has_alpha); - requirments &= (!decomp_has_alpha || gimp_drawable_has_alpha (drawable_ID)); + requirements &= (!decomp_has_alpha || gimp_drawable_has_alpha (drawable_ID)); - if (!requirments) + if (!requirements) { g_message (_("Image not suitable for this decomposition")); return -1; diff --git a/plug-ins/common/file-ps.c b/plug-ins/common/file-ps.c index 7eccc34059..f76e377a4d 100644 --- a/plug-ins/common/file-ps.c +++ b/plug-ins/common/file-ps.c @@ -604,7 +604,7 @@ query (void) static const GimpParamDef set_load_args[] = { - { GIMP_PDB_INT32, "resolution", "Resolution to interprete image (dpi)" }, + { GIMP_PDB_INT32, "resolution", "Resolution to interpret image (dpi)" }, { GIMP_PDB_INT32, "width", "Desired width" }, { GIMP_PDB_INT32, "height", "Desired height" }, { GIMP_PDB_INT32, "check-bbox", "0: Use width/height, 1: Use BoundingBox" }, diff --git a/plug-ins/common/mail.c b/plug-ins/common/mail.c index ad48a1584c..74dd91cc8e 100644 --- a/plug-ins/common/mail.c +++ b/plug-ins/common/mail.c @@ -647,7 +647,7 @@ find_extension (const gchar *filename) } else { - /* we found somehting, loop back, and look again */ + /* we found something, loop back, and look again */ *ext = 0; ext = strrchr (filename_copy, '.'); } diff --git a/plug-ins/common/newsprint.c b/plug-ins/common/newsprint.c index bdb6b50b8c..2518b02b03 100644 --- a/plug-ins/common/newsprint.c +++ b/plug-ins/common/newsprint.c @@ -1666,7 +1666,7 @@ order_cmp (const void *va, * should get the same color back again. The only way of getting a * correctly balanced function is by getting a formula for the spot's * area as a function of x and y - this can be fairly tough (ie - * possiblly an integral in two dimensions that must be solved + * possibly an integral in two dimensions that must be solved * analytically). * * The threshold matrix is used to compare against image values. If diff --git a/plug-ins/common/van-gogh-lic.c b/plug-ins/common/van-gogh-lic.c index 8d04ba227b..a26e7a9f26 100644 --- a/plug-ins/common/van-gogh-lic.c +++ b/plug-ins/common/van-gogh-lic.c @@ -151,7 +151,7 @@ peekmap (const guchar *image, /* |1 0 -1| | 1 2 1| */ /* DX: |2 0 -2| DY: | 0 0 0| */ /* |1 0 -1| | -1 -2 -1| */ -/* (It's a varation of the Sobel kernels, really) */ +/* (It's a variation of the Sobel kernels, really) */ /***************************************************/ static gint diff --git a/plug-ins/file-jpeg/jpeg-save.c b/plug-ins/file-jpeg/jpeg-save.c index 741adfe706..0c5127abd3 100644 --- a/plug-ins/file-jpeg/jpeg-save.c +++ b/plug-ins/file-jpeg/jpeg-save.c @@ -1364,7 +1364,7 @@ load_gui_defaults (JpegSaveGui *pg) gtk_adjustment_set_value (GTK_ADJUSTMENT (pg->smoothing), jsvals.smoothing); - /* Don't override quality and subsampling setting if we alredy set it from original */ + /* Don't override quality and subsampling setting if we already set it from original */ if (!jsvals.use_orig_quality) { gtk_adjustment_set_value (GTK_ADJUSTMENT (pg->quality), diff --git a/plug-ins/file-jpeg/jpeg.c b/plug-ins/file-jpeg/jpeg.c index 6756b6f27a..582b9be431 100644 --- a/plug-ins/file-jpeg/jpeg.c +++ b/plug-ins/file-jpeg/jpeg.c @@ -451,7 +451,7 @@ run (const gchar *name, jsvals.quality = orig_quality; } - /* Skip changing subsampling to original if we alredy have best + /* Skip changing subsampling to original if we already have best * setting or if original have worst setting */ if (!(jsvals.subsmp == JPEG_SUBSAMPLING_1x1_1x1_1x1 || orig_subsmp == JPEG_SUBSAMPLING_2x2_1x1_1x1)) diff --git a/plug-ins/file-psd/psd-save.c b/plug-ins/file-psd/psd-save.c index fa73523dcf..9f296a5e9a 100644 --- a/plug-ins/file-psd/psd-save.c +++ b/plug-ins/file-psd/psd-save.c @@ -42,7 +42,7 @@ * * 2005-2-11 Jay Cox * Rewrote all the code that deals with pixels to be stingy with - * memory and opperate on tile-size chunks. Create a flattened + * memory and operate on tile-size chunks. Create a flattened * copy of the image when necessary. Fixes file corruption bug * #167139 and memory bug #121871 * diff --git a/plug-ins/lighting/lighting-image.c b/plug-ins/lighting/lighting-image.c index 5b3c939eec..347605e41a 100644 --- a/plug-ins/lighting/lighting-image.c +++ b/plug-ins/lighting/lighting-image.c @@ -318,7 +318,7 @@ compute_maps (void) gint x; gdouble val, c, d; - /* Compute Sine, Log ans Spherical transfer function maps */ + /* Compute Sine, Log and Spherical transfer function maps */ /* ====================================================== */ c = 1.0 / 255.0; diff --git a/plug-ins/lighting/lighting-main.c b/plug-ins/lighting/lighting-main.c index 8bdaf6a085..012c4eb86d 100644 --- a/plug-ins/lighting/lighting-main.c +++ b/plug-ins/lighting/lighting-main.c @@ -94,7 +94,7 @@ set_default_settings (void) mapvals.material.highlight = 27.0; mapvals.material.metallic = FALSE; - mapvals.pixel_treshold = 0.25; + mapvals.pixel_threshold = 0.25; mapvals.max_depth = 3.0; mapvals.preview_zoom_factor = 1.0; diff --git a/plug-ins/lighting/lighting-main.h b/plug-ins/lighting/lighting-main.h index 9f022bde60..f547b2d7aa 100644 --- a/plug-ins/lighting/lighting-main.h +++ b/plug-ins/lighting/lighting-main.h @@ -72,7 +72,7 @@ typedef struct MaterialSettings material; MaterialSettings ref_material; - gdouble pixel_treshold; + gdouble pixel_threshold; gdouble bumpmax,bumpmin; gint max_depth; gint bumpmaptype; diff --git a/plug-ins/map-object/map-object-apply.c b/plug-ins/map-object/map-object-apply.c index c13616cba7..abe886e546 100644 --- a/plug-ins/map-object/map-object-apply.c +++ b/plug-ins/map-object/map-object-apply.c @@ -305,7 +305,7 @@ compute_image (void) gimp_adaptive_supersample_area (0, 0, width - 1, height - 1, max_depth, - mapvals.pixeltreshold, + mapvals.pixelthreshold, render, NULL, poke, diff --git a/plug-ins/map-object/map-object-image.c b/plug-ins/map-object/map-object-image.c index 7e0f4c7c04..e0d7edd056 100644 --- a/plug-ins/map-object/map-object-image.c +++ b/plug-ins/map-object/map-object-image.c @@ -39,7 +39,7 @@ cairo_surface_t *preview_surface = NULL; glong maxcounter,old_depth,max_depth; gint imgtype,width,height,in_channels,out_channels,image_id; GimpRGB background; -gdouble oldtreshold; +gdouble oldthreshold; gint border_x, border_y, border_w, border_h; diff --git a/plug-ins/map-object/map-object-image.h b/plug-ins/map-object/map-object-image.h index 93788d85e1..4ce524c99a 100644 --- a/plug-ins/map-object/map-object-image.h +++ b/plug-ins/map-object/map-object-image.h @@ -20,7 +20,7 @@ extern cairo_surface_t *preview_surface; extern glong maxcounter, old_depth, max_depth; extern gint imgtype, width,height, in_channels, out_channels, image_id; extern GimpRGB background; -extern gdouble oldtreshold; +extern gdouble oldthreshold; extern gint border_x1, border_y1, border_x2, border_y2; diff --git a/plug-ins/map-object/map-object-main.c b/plug-ins/map-object/map-object-main.c index cbf31f2522..0f3fb764fd 100644 --- a/plug-ins/map-object/map-object-main.c +++ b/plug-ins/map-object/map-object-main.c @@ -64,7 +64,7 @@ set_default_settings (void) mapvals.maptype = MAP_PLANE; - mapvals.pixeltreshold = 0.25; + mapvals.pixelthreshold = 0.25; mapvals.alpha = 0.0; mapvals.beta = 0.0; mapvals.gamma = 0.0; diff --git a/plug-ins/map-object/map-object-main.h b/plug-ins/map-object/map-object-main.h index d715434233..5958c7cd8e 100644 --- a/plug-ins/map-object/map-object-main.h +++ b/plug-ins/map-object/map-object-main.h @@ -72,7 +72,7 @@ typedef struct gdouble zoom; gdouble alpha,beta,gamma; gdouble maxdepth; - gdouble pixeltreshold; + gdouble pixelthreshold; gdouble radius; gdouble cylinder_radius; gdouble cylinder_length; diff --git a/plug-ins/map-object/map-object-ui.c b/plug-ins/map-object/map-object-ui.c index 8d586c3809..148720bea5 100644 --- a/plug-ins/map-object/map-object-ui.c +++ b/plug-ins/map-object/map-object-ui.c @@ -560,7 +560,7 @@ create_options_page (void) G_CALLBACK (gimp_double_adjustment_update), &mapvals.maxdepth); - spinbutton = spin_button_new (&adj, mapvals.pixeltreshold, + spinbutton = spin_button_new (&adj, mapvals.pixelthreshold, 0.001, 1000, 0.1, 1, 0, 0, 3); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("_Threshold:"), 0.0, 0.5, @@ -568,7 +568,7 @@ create_options_page (void) g_signal_connect (adj, "value-changed", G_CALLBACK (double_adjustment_update), - &mapvals.pixeltreshold); + &mapvals.pixelthreshold); gimp_help_set_help_data (spinbutton, _("Stop when pixel differences are smaller than " diff --git a/plug-ins/metadata/metadata-tags.h b/plug-ins/metadata/metadata-tags.h index db1cfa3060..6862c93511 100644 --- a/plug-ins/metadata/metadata-tags.h +++ b/plug-ins/metadata/metadata-tags.h @@ -335,19 +335,19 @@ static const combobox_str_tag dicom[] = { "other", N_("Other") }, }; -/* GPS Altitute Ref */ +/* GPS Altitude Ref */ static const gchar *gpsaltref[] = { N_("Unknown"), N_("Above Sea Level"), N_("Below Sea Level") }; -/* GPS Latitute Ref */ +/* GPS Latitude Ref */ static const gchar *gpslatref[] = { N_("Unknown"), N_("North"), N_("South") }; -/* GPS Longitute Ref */ +/* GPS Longitude Ref */ static const gchar *gpslngref[] = { N_("Unknown"), N_("East"), N_("West") diff --git a/plug-ins/pygimp/doc/pygimp.html b/plug-ins/pygimp/doc/pygimp.html index 40673f8186..b3960c5882 100644 --- a/plug-ins/pygimp/doc/pygimp.html +++ b/plug-ins/pygimp/doc/pygimp.html @@ -449,7 +449,7 @@ CLASS="FILENAME" CLASS="FILENAME" >plugin.py that sets out a structure for - plugins and implements some things that were either too dificult + plugins and implements some things that were either too difficult or impossible to do in C.

The main purpose of This module gives a nicer interface to the persistent storage interface for Gimp plugins. Due to the complicated nature of Python objects (there is often a lot of connections - between them), it can be dificult to work out what to store in + between them), it can be difficult to work out what to store in gimp's persistent storage. The python interface only allows storage of strings, so this module wraps pickle and unpickle to allow persistentstorage of any python object.

plugin.py that sets out a structure for - plugins and implements some things that were either too dificult + plugins and implements some things that were either too difficult or impossible to do in C. The main purpose of plugin.py was to @@ -2064,7 +2064,7 @@ class myplugin(gimpplugin.plugin): This module gives a nicer interface to the persistent storage interface for GIMP plugins. Due to the complicated nature of Python objects (there is often a lot of connections - between them), it can be dificult to work out what to store in + between them), it can be difficult to work out what to store in gimp's persistent storage. The python interface only allows storage of strings, so this module wraps pickle and unpickle to allow persistentstorage of any python object. diff --git a/plug-ins/pygimp/doc/structure-of-plugin.html b/plug-ins/pygimp/doc/structure-of-plugin.html index e968f2d206..054d091eb8 100644 --- a/plug-ins/pygimp/doc/structure-of-plugin.html +++ b/plug-ins/pygimp/doc/structure-of-plugin.html @@ -76,7 +76,7 @@ CLASS="FILENAME" CLASS="FILENAME" >plugin.py that sets out a structure for - plugins and implements some things that were either too dificult + plugins and implements some things that were either too difficult or impossible to do in C.

The main purpose of This module gives a nicer interface to the persistent storage interface for Gimp plugins. Due to the complicated nature of Python objects (there is often a lot of connections - between them), it can be dificult to work out what to store in + between them), it can be difficult to work out what to store in gimp's persistent storage. The python interface only allows storage of strings, so this module wraps pickle and unpickle to allow persistentstorage of any python object.