Commit 17d20685 authored by luzpaz's avatar luzpaz Committed by Tobias Ellinghaus

Misc. typos

Followup to previous PRs

(cherry picked from commit d1316a17)
parent 1530d58b
......@@ -3,17 +3,17 @@
#
# LIBSOUP2_FOUND True if libsoup2 got found
# LIBSOUP2_INCLUDE_DIRS Location of libsoup2 headers
# LIBSOUP2_LIBRARIES List of libaries to use libsoup2
# LIBSOUP2_LIBRARIES List of libraries to use libsoup2
# LIBSOUP2_LIBRARY_DIRS Location of libsoup2 library
#
# LIBSOUP22_FOUND True if libsoup2.2 got found
# LIBSOUP22_INCLUDE_DIRS Location of libsoup2.2 headers
# LIBSOUP22_LIBRARIES List of libaries to use libsoup2.2
# LIBSOUP22_LIBRARIES List of libraries to use libsoup2.2
# LIBSOUP22_LIBRARY_DIRS Location of libsoup2.2 library
#
# LIBSOUP24_FOUND True if libsoup2.4 got found
# LIBSOUP24_INCLUDE_DIRS Location of libsoup2.4 headers
# LIBSOUP24_LIBRARIES List of libaries to use libsoup2.4
# LIBSOUP24_LIBRARIES List of libraries to use libsoup2.4
# LIBSOUP24_LIBRARY_DIRS Location of libsoup2.4 library
#
# Set LIBSOUP2_MIN_VERSION to find libsoup2.2 or libsoup2.4 if only
......
......@@ -133,7 +133,7 @@ var framework = {
* {
* raf : request animation frame function
* caf : cancel animation frame function
* transfrom : transform property key (with vendor), or null if not supported
* transform : transform property key (with vendor), or null if not supported
* oldIE : IE8 or below
* }
*
......
......@@ -1633,7 +1633,7 @@ static int main_gui(dt_lut_t *self, int argc, char *argv[])
gtk_window_set_default_size(GTK_WINDOW(window), 800, 600);
g_signal_connect(GTK_WINDOW(window), "destroy", G_CALLBACK(gtk_main_quit), NULL);
// resizeable container
// resizable container
GtkWidget *vpaned = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
gtk_container_add(GTK_CONTAINER(window), vpaned);
......
......@@ -123,7 +123,7 @@ typedef enum dt_camera_error_t
{
/** Locking camera failed. \remarks This means that camera control is busy and locking failed. */
CAMERA_LOCK_FAILED,
/** Camera conenction is broken and unusable.
/** Camera connection is broken and unusable.
\remarks Beyond this message references to dt_camera_t pointer is invalid, which means that the host
application should remove all references of camera pointer and disallow any operations onto it.
*/
......
......@@ -617,7 +617,7 @@ void dt_collection_split_operator_number(const gchar *input, char **number1, cha
g_match_info_free(match_info);
g_regex_unref(regex);
// and we test the classic comparaison operators
// and we test the classic comparison operators
regex = g_regex_new("^\\s*(=|<|>|<=|>=|<>)?\\s*([0-9]+\\.?[0-9]*)\\s*$", 0, 0, NULL);
g_regex_match_full(regex, input, -1, 0, 0, &match_info, NULL);
match_count = g_match_info_get_match_count(match_info);
......@@ -730,7 +730,7 @@ void dt_collection_split_operator_datetime(const gchar *input, char **number1, c
g_match_info_free(match_info);
g_regex_unref(regex);
// and we test the classic comparaison operators
// and we test the classic comparison operators
// 2 elements : operator and date-time
regex = g_regex_new("^\\s*(=|<|>|<=|>=|<>)?\\s*(\\d{4}[:\\d\\s]*)?\\s*%?\\s*$", 0, 0, NULL);
g_regex_match_full(regex, input, -1, 0, 0, &match_info, NULL);
......
......@@ -38,7 +38,7 @@ void dt_import_session_import(struct dt_import_session_t *self);
void dt_import_session_set_name(struct dt_import_session_t *self, const char *name);
/** \brief override the time for specific import session
\remark This will override NOW timestamp with specified one used when expanding ${YEAR} and alike.
\remark This will override NOW timestamp with a specified one used when expanding ${YEAR} and alike.
*/
void dt_import_session_set_time(struct dt_import_session_t *self, time_t time);
......@@ -55,11 +55,11 @@ int32_t dt_import_session_film_id(struct dt_import_session_t *self);
/** \brief get import session name */
const char *dt_import_session_name(struct dt_import_session_t *self);
/** \brief get import session filename.
\param[in] current If TRUE the current filename will be return without evaluting a new filename.
\param[in] current If TRUE the current filename will be returned without evaluating a new filename.
*/
const char *dt_import_session_filename(struct dt_import_session_t *self, gboolean current);
/** \brief get import session path
\param[in] current If TRUE the current filename will be return without evaluting a new filename.
\param[in] current If TRUE the current filename will be returned without evaluating a new filename.
*/
const char *dt_import_session_path(struct dt_import_session_t *self, gboolean current);
......
......@@ -749,7 +749,7 @@ finally:
{
// set scheduling profile to "multiple GPUs" if more than one device has been found
dt_conf_set_string("opencl_scheduling_profile", "multiple GPUs");
dt_print(DT_DEBUG_OPENCL, "[opencl_init] set scheduling profile for multipe GPUs.\n");
dt_print(DT_DEBUG_OPENCL, "[opencl_init] set scheduling profile for multiple GPUs.\n");
dt_control_log(_("multiple GPUs detected - opencl scheduling profile has been set accordingly."));
}
else if(tcpu >= 6.0f * tgpumin)
......@@ -2455,7 +2455,7 @@ static dt_opencl_scheduling_profile_t dt_opencl_get_scheduling_profile(void)
static void dt_opencl_set_synchronization_timeout(int value)
{
darktable.opencl->opencl_synchronization_timeout = value;
dt_print(DT_DEBUG_OPENCL, "[opencl_synchronization_timeout] synchronization timout set to %d\n", value);
dt_print(DT_DEBUG_OPENCL, "[opencl_synchronization_timeout] synchronization timeout set to %d\n", value);
}
/** adjust opencl subsystem according to scheduling profile */
......
......@@ -248,7 +248,7 @@ void dt_set_signal_handlers()
Set up exception handler for backtrace on Windows
Works when there is NO SIGSEGV handler installed
SetUnhandledExceptionFilter handler must be saved on the first invokation
SetUnhandledExceptionFilter handler must be saved on the first invocation
as GraphicsMagick is overwriting SetUnhandledExceptionFilter and all other signals in InitializeMagick()
Eventually InitializeMagick() should be fixed upstream not to ignore existing exception handlers
*/
......
......@@ -22,7 +22,7 @@
#include "common/utility.h"
#include "gui/gtk.h"
/* getpwnam_r availibility check */
/* getpwnam_r availability check */
#if defined __APPLE__ || defined _POSIX_C_SOURCE >= 1 || defined _XOPEN_SOURCE || defined _BSD_SOURCE \
|| defined _SVID_SOURCE || defined _POSIX_SOURCE || defined __DragonFly__ || defined __FreeBSD__ \
|| defined __NetBSD__ || defined __OpenBSD__
......
......@@ -2280,7 +2280,7 @@ void dt_masks_cleanup_unused(dt_develop_t *dev)
int dt_masks_point_in_form_exact(float x, float y, float *points, int points_start, int points_count)
{
// we use ray casting algorith
// we use ray casting algorithm
// to avoid most problems with horizontal segments, y should be rounded as int
// so that there's very little chance than y==points...
......@@ -2309,7 +2309,7 @@ int dt_masks_point_in_form_exact(float x, float y, float *points, int points_sta
int dt_masks_point_in_form_near(float x, float y, float *points, int points_start, int points_count, float distance, int *near)
{
// we use ray casting algorith
// we use ray casting algorithm
// to avoid most problems with horizontal segments, y should be rounded as int
// so that there's very little chance than y==points...
......
......@@ -2057,7 +2057,7 @@ static int dt_dev_pixelpipe_process_rec(dt_dev_pixelpipe_t *pipe, dt_develop_t *
// calculate the waveform histogram. since this is drawn pixel by pixel we have to do it in the correct
// size (thus the weird gui stuff :().
// this HAS to be done on the float input data, otherwise we get really ugly artefacts due to rounding
// this HAS to be done on the float input data, otherwise we get really ugly artifacts due to rounding
// issues when putting colors into the bins.
// dt_pthread_mutex_lock(&dev->histogram_waveform_mutex);
if(dev->histogram_waveform_width != 0 && input)
......
......@@ -93,7 +93,7 @@ int write_image(dt_imageio_module_data_t *d_tmp, const char *filename, const voi
// http://partners.adobe.com/public/developer/en/tiff/TIFFphotoshop.pdf (dated 2002)
// "A proprietary ZIP/Flate compression code (0x80b2) has been used by some"
// "software vendors. This code should be considered obsolete. We recommend"
// "that TIFF implentations recognize and read the obsolete code but only"
// "that TIFF implementations recognize and read the obsolete code but only"
// "write the official compression code (0x0008)."
// http://www.awaresystems.be/imaging/tiff/tifftags/compression.html
// http://www.awaresystems.be/imaging/tiff/tifftags/predictor.html
......
......@@ -588,7 +588,7 @@ static gboolean combobox_separator(GtkTreeModel *model, GtkTreeIter *iter, gpoin
/**
* @see https://developers.facebook.com/docs/authentication/
* @returs NULL if the user cancel the operation or a valid token
* @returns NULL if the user cancels the operation or a valid token
*/
static gboolean _open_browser(const char *callback_url)
{
......
......@@ -695,7 +695,7 @@ static gchar *picasa_get_user_refresh_token(PicasaContext *ctx)
/**
* @see https://developers.google.com/accounts/docs/OAuth2InstalledApp
* @returs NULL if the user cancel the operation or a valid token
* @returns NULL if the user cancels the operation or a valid token
*/
static int picasa_get_user_auth_token(dt_storage_picasa_gui_data_t *ui)
{
......
......@@ -390,7 +390,7 @@ void amaze_demosaic_RT(struct dt_iop_module_t *self, dt_dev_pixelpipe_iop_t *pie
nyqthresh * 0.03099732204057846f, nyqthresh * 0.018413194161458882f };
// gaussian on 5x5 alt quincunx, sigma=1.5
constexpr float gausseven[2] = { 0.13719494435797422f, 0.05640252782101291f };
// guassian on quincunx grid
// gaussian on quincunx grid
constexpr float gquinc[4] = { 0.169917f, 0.108947f, 0.069855f, 0.0287182f };
typedef struct
......
......@@ -2246,7 +2246,7 @@ static void model_probe(dt_iop_module_t *module, dt_iop_ashift_params_t *p, dt_i
}
#endif
// function to keep crop fitting parameters within contraints
// function to keep crop fitting parameters within constraints
static void crop_constraint(double *params, int pcount)
{
if(pcount > 0) params[0] = fabs(params[0]);
......@@ -2286,7 +2286,7 @@ static double crop_fitness(double *params, void *data)
P[1] /= P[2];
P[2] = 1.0f;
// two auxiliary points (some arbitrary distance away from P) to contruct the diagonals
// two auxiliary points (some arbitrary distance away from P) to construct the diagonals
const float Pa[2][3] = { { P[0] + 10.0f * cos(alpha), P[1] + 10.0f * sin(alpha), 1.0f },
{ P[0] + 10.0f * cos(alpha), P[1] - 10.0f * sin(alpha), 1.0f } };
......
......@@ -298,7 +298,7 @@ void process(struct dt_iop_module_t *module, dt_dev_pixelpipe_iop_t *piece, cons
if(MODE_LOCAL_AVERAGE == d->op_mode && out[(size_t)v * width * ch + t * ch + 3] > thresh)
{
float local_avg = 0.0;
// use some and not all values from the neigbourhood to speed things up:
// use some and not all values from the neighbourhood to speed things up:
const int *tmp = xy_avg;
for(int u = 0; u < samples_avg; u++)
{
......
......@@ -2220,7 +2220,7 @@ static void vng_interpolate(float *out, const float *const in,
+1, -1, +1, +1, 1, 0x88, +1, +0, +1, +2, 1, 0x08, +1, +0, +2, -1, 1, 0x40, +1, +0, +2, +1, 1, 0x10 },
chood[] = { -1, -1, -1, 0, -1, +1, 0, +1, +1, +1, +1, 0, +1, -1, 0, -1 };
int *ip, *code[16][16];
// ring buffer pointing to three most recent rows procesed (brow[3]
// ring buffer pointing to three most recent rows processed (brow[3]
// is only used for rotating the buffer
float(*brow[4])[4];
const int width = roi_out->width, height = roi_out->height;
......
......@@ -794,7 +794,7 @@ static float ambient_light(const const_rgb_image img, int w1, rgb_pixel *pA0)
(*pA0)[1] = A0_g;
(*pA0)[2] = A0_b;
free_gray_image(&dark_ch);
// for almsot haze free images it may happen that crit_haze_level=0, this means
// for almost haze free images it may happen that crit_haze_level=0, this means
// there is a very large image depth, in this case a large number is returned, that
// is small enough to avoid overflow in later processing
// the critical haze level is at dark_channel_quantil (not 100%) to be insensitive
......
......@@ -733,7 +733,7 @@ static const float complex point_at_arc_length (const float complex points[],
warp depending from its distance from a central point.
Boundary conditions: f(0) must be 1 and f(@a distance) must be 0.
f'(0) and f'(@a distance) must both be 0 or we'll get artefacts on
f'(0) and f'(@a distance) must both be 0 or we'll get artifacts on
the picture.
Implementation: a bezier curve with p0 = 0, 1 and p3 = 1, 0. p1 is
......
......@@ -104,7 +104,7 @@ void dt_lua_goto_subtable(lua_State *L, const char *sub_name)
/* LUA LOCKING
Lua can only be run from a single thread at a time (the base lua engine
is not protected against concurent access) so we need a mutex to cover us
is not protected against concurrent access) so we need a mutex to cover us
However there are cases in lua/call.c where we need to lock the lua access
from a thread and unlock it from another thread. This is done to guarantee
......
......@@ -67,7 +67,7 @@ typedef struct
{
lua_State *state; // main lua context
dt_pthread_mutex_t mutex; // mutex protecting the lua condition variabe
dt_pthread_mutex_t mutex; // mutex protecting the lua condition variable
pthread_cond_t cond; // condition variable to wait for the lua lock
bool exec_lock; // true if some lua code is running. this is logically a mutex
......
......@@ -332,7 +332,7 @@ static int full_pushfunc(lua_State *L, luaA_Type type_id, const void *cin)
if(luaL_getmetafield(L, -1, "__init"))
{
lua_pushvalue(L, -2); // the new alocated object
lua_pushvalue(L, -2); // the new allocated object
lua_pushlightuserdata(L, (void *)cin); // forced to cast..
lua_call(L, 2, 0);
}
......@@ -369,7 +369,7 @@ static int int_pushfunc(lua_State *L, luaA_Type type_id, const void *cin)
lua_settable(L, -4);
if(luaL_getmetafield(L, -1, "__init"))
{
lua_pushvalue(L, -2); // the new alocated object
lua_pushvalue(L, -2); // the new allocated object
lua_pushlightuserdata(L, (void *)cin); // forced to cast..
lua_call(L, 2, 0);
}
......@@ -413,7 +413,7 @@ static int gpointer_pushfunc(lua_State *L, luaA_Type type_id, const void *cin)
lua_settable(L, -4);
if(luaL_getmetafield(L, -1, "__init"))
{
lua_pushvalue(L, -2); // the new alocated object
lua_pushvalue(L, -2); // the new allocated object
lua_pushlightuserdata(L, (void *)cin); // forced to cast..
lua_call(L, 2, 0);
}
......@@ -701,7 +701,7 @@ luaA_Type dt_lua_init_singleton(lua_State *L, const char *unique_name, void *dat
lua_setfield(L, -3, "__singleton");
if(luaL_getmetafield(L, -1, "__init"))
{
lua_pushvalue(L, -2); // the new alocated object
lua_pushvalue(L, -2); // the new allocated object
lua_pushlightuserdata(L, (void *)data); // forced to cast..
lua_call(L, 2, 0);
}
......
......@@ -840,7 +840,7 @@ int dt_view_image_expose(dt_view_image_over_t *image_over, uint32_t imgid, cairo
/* clear and reset statements */
DT_DEBUG_SQLITE3_CLEAR_BINDINGS(darktable.view_manager->statements.is_selected);
DT_DEBUG_SQLITE3_RESET(darktable.view_manager->statements.is_selected);
/* bind imgid to prepared statments */
/* bind imgid to prepared statements */
DT_DEBUG_SQLITE3_BIND_INT(darktable.view_manager->statements.is_selected, 1, imgid);
/* lets check if imgid is selected */
if(sqlite3_step(darktable.view_manager->statements.is_selected) == SQLITE_ROW) selected = 1;
......
......@@ -163,7 +163,7 @@ secondly the resulting accuracy would not be improved significantly.
It is now time to analyse the data and output the curves.
### Analysing and outputing the curves
### Analysing and outputting the curves
So you gathered data in `$HOME/tmp/mycamera.dat`, that's perfect. Let's compute the
......
......@@ -126,7 +126,7 @@ def add_edges(gr):
gr.add_edge(('flip', 'ashift'))
# ashift wants a lens corrected image with straight lines.
# therefore lens shoucl come before and liquify should come after ashift
# therefore lens should come before and liquify should come after ashift
gr.add_edge(('ashift', 'lens'))
gr.add_edge(('liquify', 'ashift'))
......
This directory contains tools to automaticaly generate the lua API documentation.
This directory contains tools to automatically generate the lua API documentation.
The documentation is generated by introspecting the lua API from within DT then
adding the documentation from the file "content.lua" and making sure everything
......
......@@ -2425,7 +2425,7 @@ The snapshot file will be generated at the next redraw of the main window]],
},
},
["api_version_string"] = {
["__text"] = [[The version description of the lua API. This is a string compatible with the semantic versionning convention]],
["__text"] = [[The version description of the lua API. This is a string compatible with the semantic versioning convention]],
["__attributes"] = {
["reported_type"] = [[string]],
},
......@@ -3235,7 +3235,7 @@ defaults to darktable.debug.known if not set]],
},
},
["shortcut"] = {
["__text"] = [[This event registers a new keyboad shortcut. The shortcut isn't bound to any key until the users does so in the preference panel.
["__text"] = [[This event registers a new keyboard shortcut. The shortcut isn't bound to any key until the users does so in the preference panel.
The event is triggered whenever the shortcut is triggered.
......
......@@ -3368,7 +3368,7 @@ For more details of the member functions have a look at the cairo documentation
},
},
["api_version_string"] = {
["__text"] = [==[The version description of the lua API. This is a string compatible with the semantic versionning convention]==],
["__text"] = [==[The version description of the lua API. This is a string compatible with the semantic versioning convention]==],
["__attributes"] = {
["reported_type"] = [==[string]==],
},
......@@ -5057,7 +5057,7 @@ You can removes entries by setting them to nil]==],
},
},
["shortcut"] = {
["__text"] = [==[This event registers a new keyboad shortcut. The shortcut isn't bound to any key until the users does so in the preference panel.
["__text"] = [==[This event registers a new keyboard shortcut. The shortcut isn't bound to any key until the users does so in the preference panel.
The event is triggered whenever the shortcut is triggered.
......
......@@ -3345,7 +3345,7 @@ For more details of the member functions have a look at the cairo documentation
},
},
["api_version_string"] = {
["__text"] = [==[The version description of the lua API. This is a string compatible with the semantic versionning convention]==],
["__text"] = [==[The version description of the lua API. This is a string compatible with the semantic versioning convention]==],
["__attributes"] = {
["reported_type"] = [==[string]==],
},
......@@ -5053,7 +5053,7 @@ You can removes entries by setting them to nil]==],
},
},
["shortcut"] = {
["__text"] = [==[This event registers a new keyboad shortcut. The shortcut isn't bound to any key until the users does so in the preference panel.
["__text"] = [==[This event registers a new keyboard shortcut. The shortcut isn't bound to any key until the users does so in the preference panel.
The event is triggered whenever the shortcut is triggered.
......
......@@ -331,7 +331,7 @@ get_image_iso() {
# 1. "Exif.NikonIi.*" are bytes, not even
# shorts, so they're smaller than other
# keys.
# 2. That looks like versionned nodes:
# 2. That looks like versioned nodes:
# "Nikon2" vs. "Nikon3".
iso=$(get_exif_key "$file" Exif.Nikon3.ISOSpeed)
if [ -z "$iso" -o "$iso" = "0" ]; then
......
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