diff --git a/cmake/modules/sse_test.c b/cmake/modules/sse_test.c index 12169dadb09d..ca38a76762ff 100644 --- a/cmake/modules/sse_test.c +++ b/cmake/modules/sse_test.c @@ -28,4 +28,4 @@ int main (int argc, char **argv) fprintf(stdout,"%s", (ecx>>19)&1?"SSE4.1 ":""); fprintf(stdout,"%s", (ecx>>20)&1?"SSE4.2 ":""); fprintf(stdout,"\n"); -} +} diff --git a/src/common/collection.c b/src/common/collection.c index cb61f91eed2f..23a4a122f2cc 100644 --- a/src/common/collection.c +++ b/src/common/collection.c @@ -1540,16 +1540,16 @@ static gchar *get_query_string(const dt_collection_properties_t property, const const gboolean no_location = strcmp(escaped_text, _("tagged")) == 0; const gboolean all_tagged = strcmp(escaped_text, _("tagged*")) == 0; char *escaped_text2 = g_strstr_len(escaped_text, -1, "|"); - char *name_clause = g_strdup_printf("t.name LIKE \'%s\' || \'%s\'", + char *name_clause = g_strdup_printf("t.name LIKE \'%s\' || \'%s\'", dt_map_location_data_tag_root(), escaped_text2 ? escaped_text2 : "%"); if (escaped_text2 && (escaped_text2[strlen(escaped_text2)-1] == '*')) { escaped_text2[strlen(escaped_text2)-1] = '\0'; - name_clause = g_strdup_printf("(t.name LIKE \'%s\' || \'%s\' OR t.name LIKE \'%s\' || \'%s|%%\')", + name_clause = g_strdup_printf("(t.name LIKE \'%s\' || \'%s\' OR t.name LIKE \'%s\' || \'%s|%%\')", dt_map_location_data_tag_root(), escaped_text2 , dt_map_location_data_tag_root(), escaped_text2); } - + if(not_tagged || all_tagged) query = g_strdup_printf("(id %s IN (SELECT id AS imgid FROM main.images " "WHERE (longitude IS NOT NULL AND latitude IS NOT NULL))) ", diff --git a/src/common/distance_transform.h b/src/common/distance_transform.h index 0d59f0d0129a..86e783c56343 100644 --- a/src/common/distance_transform.h +++ b/src/common/distance_transform.h @@ -17,12 +17,12 @@ */ /* - eucledian distance transform for darktable Hanno Schwalm (hanno@schwalm-bremen.de) 2021/09 + eucledian distance transform for darktable Hanno Schwalm (hanno@schwalm-bremen.de) 2021/09 - adopted to C - omp support - - reduced alloc/free using dt_alloc_align variants for better debug support + - reduced alloc/free using dt_alloc_align variants for better debug support - tuned for performance in collaboration with Ingo Weyrich (heckflosse67@gmx.de) from rawtherapee - + The original code is from: *** Original copyright note *** @@ -30,7 +30,7 @@ Distance Transforms of Sampled Functions Pedro F. Felzenszwalb and Daniel P. Huttenlocher - Cornell Computing and Information Science TR2004-1963 + Cornell Computing and Information Science TR2004-1963 Copyright (C) 2006 Pedro Felzenszwalb This program is free software; you can redistribute it and/or modify @@ -129,7 +129,7 @@ float dt_image_distance_transform(float *const restrict src, float *const restri #endif { float *f = dt_alloc_align_float(maxdim); - float *z = dt_alloc_align_float(maxdim + 1); + float *z = dt_alloc_align_float(maxdim + 1); float *d = dt_alloc_align_float(maxdim); int *v = dt_alloc_align(64, maxdim * sizeof (int)); diff --git a/src/common/file_location.c b/src/common/file_location.c index 696d49f0c5d1..00b1d3257928 100644 --- a/src/common/file_location.c +++ b/src/common/file_location.c @@ -118,7 +118,7 @@ gchar *dt_loc_init_generic(const char *absolute_value, const char *application_d { gchar *result = NULL; gchar *path = NULL; - + if(absolute_value) { // the only adjustment the absolute path needs is transforming the possible tilde '~' to an absolute path @@ -128,7 +128,7 @@ gchar *dt_loc_init_generic(const char *absolute_value, const char *application_d { // the default_value could be absolute or relative. we decide upon presence of the application_directory. if(application_directory) - { + { // default_value is relative. // combine basename (application_directory) and relative path (default_value). gchar complete_path[PATH_MAX] = { 0 }; @@ -144,9 +144,9 @@ gchar *dt_loc_init_generic(const char *absolute_value, const char *application_d // /Contents/Resources/lib // /Contents/Resources/share // so the relative path from the binary directory to the other directories differs to the non-bundle version by - // ../etc -> ../Resources/etc, - // ../lib -> ../Resources/lib, - // ../share -> ../Resources/share, + // ../etc -> ../Resources/etc, + // ../lib -> ../Resources/lib, + // ../share -> ../Resources/share, // So we have to modify the relative default value // +2: removes the two dots '..' @@ -171,7 +171,7 @@ gchar *dt_loc_init_generic(const char *absolute_value, const char *application_d // create file if it does not exist if(g_file_test(path, G_FILE_TEST_EXISTS) == FALSE) g_mkdir_with_parents(path, 0700); - + // removes '.', '..', and extra '/' characters. result = g_realpath(path); @@ -213,7 +213,7 @@ void dt_check_opendir(const char* context, const char* directory) { fprintf(stderr, "directory for %s has not been set.\n", context); exit(EXIT_FAILURE); - } + } #if _WIN32 wchar_t *wdirectory = g_utf8_to_utf16 (directory, -1, NULL, NULL, NULL); @@ -235,8 +235,8 @@ void dt_check_opendir(const char* context, const char* directory) { dt_print(DT_DEBUG_DEV, "%s: %s\n", context, directory); closedir(dir); - } - else + } + else { fprintf(stderr, "opendir '%s' fails with: '%s'\n", directory, strerror(errno)); exit(EXIT_FAILURE); diff --git a/src/common/grealpath.h b/src/common/grealpath.h index 3b24083ea9d8..3a2f4e3e90e0 100644 --- a/src/common/grealpath.h +++ b/src/common/grealpath.h @@ -31,12 +31,12 @@ static inline gchar *g_realpath(const char *path) char* res = realpath(path, buffer); - if(res) + if(res) { return g_strdup(buffer); } - else - { + else + { fprintf(stderr, "path lookup '%s' fails with: '%s'\n", path, strerror(errno)); exit(EXIT_FAILURE); } diff --git a/src/common/imagebuf.c b/src/common/imagebuf.c index e810f9d6028b..847b91637091 100644 --- a/src/common/imagebuf.c +++ b/src/common/imagebuf.c @@ -39,7 +39,7 @@ gboolean dt_iop_alloc_image_buffers(struct dt_iop_module_t *const module, if (size & DT_IMGSZ_PERTHREAD) (void)va_arg(args,size_t*); // skip the extra pointer for per-thread allocations if (size == 0 || !bufptr) // end of arg list? - break; + break; *bufptr = NULL; } va_end(args); diff --git a/src/common/imagebuf.h b/src/common/imagebuf.h index 66a7c505c541..6dec69976a34 100644 --- a/src/common/imagebuf.h +++ b/src/common/imagebuf.h @@ -114,7 +114,7 @@ void dt_iop_image_add_image(float *const buf, const float *const other_buf, cons void dt_iop_image_sub_image(float *const buf, const float *const other_buf, const size_t width, const size_t height, const size_t ch); -// Subtract each element of the image buffer from the given constant value +// Subtract each element of the image buffer from the given constant value void dt_iop_image_invert(float *const buf, const float max_value, const size_t width, const size_t height, const size_t ch); diff --git a/src/common/math.h b/src/common/math.h index 7c86410cdea4..ab2cb65fe474 100644 --- a/src/common/math.h +++ b/src/common/math.h @@ -240,7 +240,7 @@ union float_int { // a faster, vectorizable version of hypotf() when we know that there won't be overflow, NaNs, or infinities #ifdef _OPENMP -#pragma omp declare simd +#pragma omp declare simd #endif static inline float dt_fast_hypotf(const float x, const float y) { @@ -250,7 +250,7 @@ static inline float dt_fast_hypotf(const float x, const float y) // fast approximation of expf() /****** if you change this function, you need to make the same change in data/kernels/{basecurve,basic}.cl ***/ #ifdef _OPENMP -#pragma omp declare simd +#pragma omp declare simd #endif static inline float dt_fast_expf(const float x) { diff --git a/src/develop/blend.c b/src/develop/blend.c index f432d2a4d842..a79ad6ebecf1 100644 --- a/src/develop/blend.c +++ b/src/develop/blend.c @@ -244,7 +244,7 @@ static void _refine_with_detail_mask(struct dt_iop_module_t *self, struct dt_dev const gboolean detail = (level > 0.0f); const float threshold = _detail_mask_threshold(level, detail); - + float *tmp = NULL; float *lum = NULL; float *warp_mask = NULL; @@ -259,7 +259,7 @@ static void _refine_with_detail_mask(struct dt_iop_module_t *self, struct dt_dev if(info) fprintf(stderr, "[_refine_with_detail_mask] in module %s %ix%i --> %ix%i\n", self->op, iwidth, iheight, owidth, oheight); const int bufsize = MAX(iwidth * iheight, owidth * oheight); - + tmp = dt_alloc_align_float(bufsize); lum = dt_alloc_align_float(bufsize); if((tmp == NULL) || (lum == NULL)) goto error; @@ -279,7 +279,7 @@ static void _refine_with_detail_mask(struct dt_iop_module_t *self, struct dt_dev #ifdef _OPENMP #pragma omp parallel for simd default(none) \ dt_omp_firstprivate(mask, warp_mask, msize) \ - schedule(simd:static) aligned(mask, warp_mask : 64) + schedule(simd:static) aligned(mask, warp_mask : 64) #endif for(int idx =0; idx < msize; idx++) { @@ -678,7 +678,7 @@ static void _refine_with_detail_mask_cl(struct dt_iop_module_t *self, struct dt_ const gboolean info = ((darktable.unmuted & DT_DEBUG_MASKS) && (piece->pipe->type == DT_DEV_PIXELPIPE_FULL)); const int detail = (level > 0.0f); - const float threshold = _detail_mask_threshold(level, detail); + const float threshold = _detail_mask_threshold(level, detail); float *lum = NULL; cl_mem tmp = NULL; cl_mem blur = NULL; @@ -716,7 +716,7 @@ static void _refine_with_detail_mask_cl(struct dt_iop_module_t *self, struct dt_ dt_opencl_set_kernel_arg(devid, kernel, 3, sizeof(int), &iheight); const int err = dt_opencl_enqueue_kernel_2d(devid, kernel, sizes); if(err != CL_SUCCESS) goto error; - } + } { size_t sizes[3] = { ROUNDUPWD(iwidth), ROUNDUPHT(iheight), 1 }; @@ -729,7 +729,7 @@ static void _refine_with_detail_mask_cl(struct dt_iop_module_t *self, struct dt_ dt_opencl_set_kernel_arg(devid, kernel, 5, sizeof(int), &detail); const int err = dt_opencl_enqueue_kernel_2d(devid, kernel, sizes); if(err != CL_SUCCESS) goto error; - } + } { float blurmat[13]; @@ -765,7 +765,7 @@ static void _refine_with_detail_mask_cl(struct dt_iop_module_t *self, struct dt_ dt_opencl_set_kernel_arg(devid, kernel, 3, sizeof(int), &iheight); const int err = dt_opencl_enqueue_kernel_2d(devid, kernel, sizes); if(err != CL_SUCCESS) goto error; - } + } { const int err = dt_opencl_read_host_from_device(devid, lum, tmp, iwidth, iheight, sizeof(float)); @@ -787,7 +787,7 @@ static void _refine_with_detail_mask_cl(struct dt_iop_module_t *self, struct dt_ #ifdef _OPENMP #pragma omp parallel for simd default(none) \ dt_omp_firstprivate(mask, warp_mask, msize) \ - schedule(simd:static) aligned(mask, warp_mask : 64) + schedule(simd:static) aligned(mask, warp_mask : 64) #endif for(int idx = 0; idx < msize; idx++) { @@ -795,7 +795,7 @@ static void _refine_with_detail_mask_cl(struct dt_iop_module_t *self, struct dt_ } dt_free_align(warp_mask); return; - + error: dt_control_log(_("detail mask CL blending problem")); dt_free_align(lum); diff --git a/src/develop/masks/detail.c b/src/develop/masks/detail.c index 4bbd0db58f8d..ef7503326a91 100644 --- a/src/develop/masks/detail.c +++ b/src/develop/masks/detail.c @@ -21,8 +21,8 @@ The detail masks (DM) are used by the dual demosaicer and as a further refinement step for shape / parametric masks. They contain threshold weighed values of pixel-wise local signal changes so they can be - understood as "areas with or without local detail". - + understood as "areas with or without local detail". + As the DM using algorithms (like dual demosaicing, sharpening ...) are all pixel peeping we want the "original data" from the sensor to calculate it. (Calculating the mask from the modules roi might not detect such regions at all because of @@ -33,7 +33,7 @@ Positive values will select regions with lots of local detail, negatives select for flat areas. (The dual demosaicer only wants positives as we always look for high frequency content.) A threshold value of 0.0 means bypassing. - + So the first important point is: We make sure taking the input data for the DM right from the demosaicer for normal raws or from rawprepare in case of monochromes. This means some additional housekeeping for the @@ -41,7 +41,7 @@ If any mask in any module selects a threshold of != 0.0 we leave a flag in the pipe struct telling a) we want a DM and b) we want it from either demosaic or from rawprepare. If such a flag has not been previously set we will force a pipeline reprocessing. - + gboolean dt_dev_write_rawdetail_mask(dt_dev_pixelpipe_iop_t *piece, float *const rgb, const dt_iop_roi_t *const roi_in, const int mode, const dt_aligned_pixel_t wb); or it's _cl equivalent write a preliminary mask holding signal-change values for every pixel. These mask values are calculated as @@ -53,11 +53,11 @@ The pipe gets roi copy of the writing module so we can later scale/distort the LM. Calculating the RM is done for performance and lower mem pressure reasons, so we don't have to - pass full data to the module. Also the RM can be used by other modules. - + pass full data to the module. Also the RM can be used by other modules. + If a mask uses the details refinement step it takes the raw details mask RM and calculates an intermediate mask (IM) which is still not scaled but has the roi of the writing module. - + For every pixel we calculate the IM value via a sigmoid function with the threshold and RM as parameters. At last the IM is slightly blurred to avoid hard transitions, as there still is no scaling we can use @@ -337,7 +337,7 @@ int dt_masks_blur_fast(float *const restrict src, float *const restrict out, con #endif for(int i = 0; i < width * height; i++) out[i] = fmaxf(0.0f, fminf(clip, gain * src[i])); - return 0; + return 0; } else if(sigma <= 0.8f) { @@ -397,11 +397,11 @@ void dt_masks_blur_approx_weighed(float *const restrict src, float *const restri float coeffs[maxmat][20]; for(int i = 1; i < 9; i++) - _masks_blur_5x5_coeff(coeffs[i-1], 0.1f * (float) (i)); + _masks_blur_5x5_coeff(coeffs[i-1], 0.1f * (float) (i)); for(int i = 9; i < 16; i++) - dt_masks_blur_9x9_coeff(coeffs[i-1], 0.1f * (float) (i)); + dt_masks_blur_9x9_coeff(coeffs[i-1], 0.1f * (float) (i)); for(int i = 16; i <= maxmat; i++) - _masks_blur_13x13_coeff(coeffs[i-1], 0.1f * (float) (i)); + _masks_blur_13x13_coeff(coeffs[i-1], 0.1f * (float) (i)); const int w1 = width; const int w2 = 2*width; @@ -421,12 +421,12 @@ void dt_masks_blur_approx_weighed(float *const restrict src, float *const restri for(int col = 6; col < width - 6; col++) { const int i = row * width + col; - const int d = MIN(maxmat, MAX(0, ((int) (10.0f * weight[i])))) ; + const int d = MIN(maxmat, MAX(0, ((int) (10.0f * weight[i])))) ; float *blurmat = coeffs[d-1]; if(d == 0) out[i] = src[i]; else if(d < 9) out[i] = FAST_BLUR_5; else if(d < 16) out[i] = FAST_BLUR_9; - else out[i] = FAST_BLUR_13; + else out[i] = FAST_BLUR_13; } } } diff --git a/src/develop/pixelpipe_hb.c b/src/develop/pixelpipe_hb.c index e2c32c30263c..4979c4f26438 100644 --- a/src/develop/pixelpipe_hb.c +++ b/src/develop/pixelpipe_hb.c @@ -2445,14 +2445,14 @@ gboolean dt_dev_write_rawdetail_mask(dt_dev_pixelpipe_iop_t *piece, float *const { if(p->rawdetail_mask_data) { - fprintf(stderr, "[dt_dev_write_rawdetail_mask] detail mask not required but found old data %p\n", p->rawdetail_mask_data); + fprintf(stderr, "[dt_dev_write_rawdetail_mask] detail mask not required but found old data %p\n", p->rawdetail_mask_data); dt_dev_clear_rawdetail_mask(p); } return FALSE; } if((p->want_detail_mask & ~DT_DEV_DETAIL_MASK_REQUIRED) != mode) return FALSE; - if(info) fprintf(stderr, "[dt_dev_write_rawdetail_mask] %i (%ix%i), olddata %p", mode, roi_in->width, roi_in->height, p->rawdetail_mask_data); + if(info) fprintf(stderr, "[dt_dev_write_rawdetail_mask] %i (%ix%i), olddata %p", mode, roi_in->width, roi_in->height, p->rawdetail_mask_data); dt_dev_clear_rawdetail_mask(p); const int width = roi_in->width; @@ -2473,11 +2473,11 @@ gboolean dt_dev_write_rawdetail_mask(dt_dev_pixelpipe_iop_t *piece, float *const } dt_masks_calc_rawdetail_mask(rgb, mask, tmp, width, height, wb); dt_free_align(tmp); - if(info) fprintf(stderr, " done\n"); + if(info) fprintf(stderr, " done\n"); return FALSE; error: - if(info) fprintf(stderr, " ERROR\n"); + if(info) fprintf(stderr, " ERROR\n"); dt_free_align(mask); dt_free_align(tmp); return TRUE; @@ -2493,7 +2493,7 @@ gboolean dt_dev_write_rawdetail_mask_cl(dt_dev_pixelpipe_iop_t *piece, cl_mem in { if(p->rawdetail_mask_data) { - if(info) fprintf(stderr, "[dt_dev_write_rawdetail_mask_cl] detail mask not required but found old data %p\n", p->rawdetail_mask_data); + if(info) fprintf(stderr, "[dt_dev_write_rawdetail_mask_cl] detail mask not required but found old data %p\n", p->rawdetail_mask_data); dt_dev_clear_rawdetail_mask(p); } return FALSE; @@ -2501,7 +2501,7 @@ gboolean dt_dev_write_rawdetail_mask_cl(dt_dev_pixelpipe_iop_t *piece, cl_mem in if((p->want_detail_mask & ~DT_DEV_DETAIL_MASK_REQUIRED) != mode) return FALSE; - if(info) fprintf(stderr, "[dt_dev_write_rawdetail_mask_cl] mode %i (%ix%i), olddata %p", mode, roi_in->width, roi_in->height, p->rawdetail_mask_data); + if(info) fprintf(stderr, "[dt_dev_write_rawdetail_mask_cl] mode %i (%ix%i), olddata %p", mode, roi_in->width, roi_in->height, p->rawdetail_mask_data); dt_dev_clear_rawdetail_mask(p); const int width = roi_in->width; @@ -2559,11 +2559,11 @@ gboolean dt_dev_write_rawdetail_mask_cl(dt_dev_pixelpipe_iop_t *piece, cl_mem in dt_opencl_release_mem_object(out); dt_opencl_release_mem_object(tmp); - if(info) fprintf(stderr, " done\n"); + if(info) fprintf(stderr, " done\n"); return FALSE; error: - if(info) fprintf(stderr, " ERROR\n"); + if(info) fprintf(stderr, " ERROR\n"); dt_dev_clear_rawdetail_mask(p); dt_opencl_release_mem_object(out); dt_opencl_release_mem_object(tmp); @@ -2599,7 +2599,7 @@ float *dt_dev_distort_detail_mask(const dt_dev_pixelpipe_t *pipe, float *src, co } if(!valid) return NULL; - if(info) fprintf(stderr, "[dt_dev_distort_detail_mask] (%ix%i) for module %s: ", pipe->rawdetail_mask_roi.width, pipe->rawdetail_mask_roi.height, target_module->op); + if(info) fprintf(stderr, "[dt_dev_distort_detail_mask] (%ix%i) for module %s: ", pipe->rawdetail_mask_roi.width, pipe->rawdetail_mask_roi.height, target_module->op); float *resmask = src; float *inmask = src; @@ -2639,7 +2639,7 @@ float *dt_dev_distort_detail_mask(const dt_dev_pixelpipe_t *pipe, float *src, co } } } - if(info) fprintf(stderr, " done\n"); + if(info) fprintf(stderr, " done\n"); return resmask; } diff --git a/src/imageio/storage/gallery.c b/src/imageio/storage/gallery.c index dedc7f5df479..8ab4224435a4 100644 --- a/src/imageio/storage/gallery.c +++ b/src/imageio/storage/gallery.c @@ -105,7 +105,7 @@ static void button_clicked(GtkWidget *widget, dt_imageio_module_storage_t *self) gallery_t *d = (gallery_t *)self->gui_data; GtkWidget *win = dt_ui_main_window(darktable.gui->ui); GtkFileChooserNative *filechooser = gtk_file_chooser_native_new( - _("select directory"), GTK_WINDOW(win), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, + _("select directory"), GTK_WINDOW(win), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, _("_select as output destination"), _("_cancel")); gchar *old = g_strdup(gtk_entry_get_text(d->entry)); diff --git a/src/imageio/storage/latex.c b/src/imageio/storage/latex.c index b1cbc28cb3d0..11911e030aa4 100644 --- a/src/imageio/storage/latex.c +++ b/src/imageio/storage/latex.c @@ -104,7 +104,7 @@ static void button_clicked(GtkWidget *widget, dt_imageio_module_storage_t *self) latex_t *d = (latex_t *)self->gui_data; GtkWidget *win = dt_ui_main_window(darktable.gui->ui); GtkFileChooserNative *filechooser = gtk_file_chooser_native_new( - _("select directory"), GTK_WINDOW(win), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, + _("select directory"), GTK_WINDOW(win), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, _("_select as output destination"), _("_cancel")); gchar *old = g_strdup(gtk_entry_get_text(d->entry)); diff --git a/src/iop/colorin.c b/src/iop/colorin.c index 17df8a58816f..9cdb58fcc838 100644 --- a/src/iop/colorin.c +++ b/src/iop/colorin.c @@ -678,7 +678,7 @@ static void process_cmatrix_bm(struct dt_iop_module_t *self, dt_dev_pixelpipe_io transpose_3xSSE(d->nmatrix, nmatrix); dt_colormatrix_t lmatrix; transpose_3xSSE(d->lmatrix, lmatrix); - + // fprintf(stderr, "Using cmatrix codepath\n"); // only color matrix. use our optimized fast path! #ifdef _OPENMP @@ -740,7 +740,7 @@ static void process_cmatrix_fastpath_simple(struct dt_iop_module_t *self, dt_dev dt_colormatrix_t cmatrix; transpose_3xSSE(d->cmatrix, cmatrix); - + // fprintf(stderr, "Using cmatrix codepath\n"); // only color matrix. use our optimized fast path! #ifdef _OPENMP @@ -771,7 +771,7 @@ static void process_cmatrix_fastpath_clipping(struct dt_iop_module_t *self, dt_d dt_colormatrix_t lmatrix; transpose_3xSSE(d->nmatrix, nmatrix); transpose_3xSSE(d->lmatrix, lmatrix); - + // fprintf(stderr, "Using cmatrix codepath\n"); // only color matrix. use our optimized fast path! #ifdef _OPENMP @@ -830,7 +830,7 @@ static void process_cmatrix_proper(struct dt_iop_module_t *self, dt_dev_pixelpip transpose_3xSSE(d->nmatrix, nmatrix); dt_colormatrix_t lmatrix; transpose_3xSSE(d->lmatrix, lmatrix); - + // fprintf(stderr, "Using cmatrix codepath\n"); // only color matrix. use our optimized fast path! #ifdef _OPENMP diff --git a/src/iop/demosaic.c b/src/iop/demosaic.c index 3aa0f3860e1d..3cfe7eb9cccb 100644 --- a/src/iop/demosaic.c +++ b/src/iop/demosaic.c @@ -61,7 +61,7 @@ typedef enum dt_iop_demosaic_method_t DT_IOP_DEMOSAIC_AMAZE = 1, // $DESCRIPTION: "AMaZE" DT_IOP_DEMOSAIC_VNG4 = 2, // $DESCRIPTION: "VNG4" DT_IOP_DEMOSAIC_RCD = 5, // $DESCRIPTION: "RCD" - DT_IOP_DEMOSAIC_LMMSE = 6, // $DESCRIPTION: "LMMSE" + DT_IOP_DEMOSAIC_LMMSE = 6, // $DESCRIPTION: "LMMSE" DT_IOP_DEMOSAIC_RCD_VNG = DEMOSAIC_DUAL | DT_IOP_DEMOSAIC_RCD, // $DESCRIPTION: "RCD + VNG4" DT_IOP_DEMOSAIC_AMAZE_VNG = DEMOSAIC_DUAL | DT_IOP_DEMOSAIC_AMAZE, // $DESCRIPTION: "AMaZE + VNG4" DT_IOP_DEMOSAIC_PASSTHROUGH_MONOCHROME = 3, // $DESCRIPTION: "passthrough (monochrome)" @@ -2964,7 +2964,7 @@ void process(struct dt_iop_module_t *self, dt_dev_pixelpipe_iop_t *piece, const const int qual_flags = demosaic_qual_flags(piece, img, roi_out); int demosaicing_method = data->demosaicing_method; // There might be a module in the pipeline that wants the output displayed as a mask (highlights reconstruction in recovery mode) - // for that case we pass as monochrome + // for that case we pass as monochrome if(piece->pipe->mask_display == DT_DEV_PIXELPIPE_DISPLAY_PASSTHRU) demosaicing_method = DT_IOP_DEMOSAIC_PASSTHROUGH_MONOCHROME; @@ -2972,7 +2972,7 @@ void process(struct dt_iop_module_t *self, dt_dev_pixelpipe_iop_t *piece, const // only overwrite setting if quality << requested and in dr mode and not a special method && (demosaicing_method != DT_IOP_DEMOSAIC_PASSTHROUGH_MONOCHROME) && (demosaicing_method != DT_IOP_DEMOSAIC_PASSTHROUGH_COLOR) - // dual demosaicing with the show mask option on is also a special method for ui + // dual demosaicing with the show mask option on is also a special method for ui && !((demosaicing_method & DEMOSAIC_DUAL) && showmask)) demosaicing_method = (piece->pipe->dsc.filters != 9u) ? DT_IOP_DEMOSAIC_RCD : DT_IOP_DEMOSAIC_MARKESTEIJN; @@ -3513,7 +3513,7 @@ static int process_rcd_cl(struct dt_iop_module_t *self, dt_dev_pixelpipe_iop_t * dt_opencl_set_kernel_arg(devid, gd->kernel_rcd_populate, 5, sizeof(int), &width); dt_opencl_set_kernel_arg(devid, gd->kernel_rcd_populate, 6, sizeof(int), &height); dt_opencl_set_kernel_arg(devid, gd->kernel_rcd_populate, 7, sizeof(uint32_t), (void *)&piece->pipe->dsc.filters); - dt_opencl_set_kernel_arg(devid, gd->kernel_rcd_populate, 8, sizeof(float), &scaler); + dt_opencl_set_kernel_arg(devid, gd->kernel_rcd_populate, 8, sizeof(float), &scaler); err = dt_opencl_enqueue_kernel_2d(devid, gd->kernel_rcd_populate, sizes); if(err != CL_SUCCESS) goto error; } @@ -3580,7 +3580,7 @@ static int process_rcd_cl(struct dt_iop_module_t *self, dt_dev_pixelpipe_iop_t * err = dt_opencl_enqueue_kernel_2d(devid, gd->kernel_rcd_step_4_1, sizes); if(err != CL_SUCCESS) goto error; } - + { // Step 4.2: Calculate P/Q diagonal local discrimination size_t sizes[3] = { ROUNDUPWD(width / 2), ROUNDUPHT(height), 1 }; @@ -3619,7 +3619,7 @@ static int process_rcd_cl(struct dt_iop_module_t *self, dt_dev_pixelpipe_iop_t * dt_opencl_set_kernel_arg(devid, gd->kernel_rcd_step_5_2, 5, sizeof(int), &height); dt_opencl_set_kernel_arg(devid, gd->kernel_rcd_step_5_2, 6, sizeof(uint32_t), (void *)&piece->pipe->dsc.filters); err = dt_opencl_enqueue_kernel_2d(devid, gd->kernel_rcd_step_5_2, sizes); - if(err != CL_SUCCESS) goto error; + if(err != CL_SUCCESS) goto error; } const float scaler = fmaxf(piece->pipe->dsc.processed_maximum[0], fmaxf(piece->pipe->dsc.processed_maximum[1], piece->pipe->dsc.processed_maximum[2])); @@ -5127,7 +5127,7 @@ int process_cl(struct dt_iop_module_t *self, dt_dev_pixelpipe_iop_t *piece, cl_m int demosaicing_method = data->demosaicing_method; // There might be a module in the pipeline that wants the output displayed as a mask (highlights reconstruction in recovery mode) - // for that case we pass as monochrome + // for that case we pass as monochrome if(piece->pipe->mask_display == DT_DEV_PIXELPIPE_DISPLAY_PASSTHRU) demosaicing_method = DT_IOP_DEMOSAIC_PASSTHROUGH_MONOCHROME; @@ -5241,8 +5241,8 @@ int process_cl(struct dt_iop_module_t *self, dt_dev_pixelpipe_iop_t *piece, cl_m retval = FALSE; goto finish; } - retval = dual_demosaic_cl(self, piece, details, blend, high_image, low_image, dev_aux, width, height, showmask); - } + retval = dual_demosaic_cl(self, piece, details, blend, high_image, low_image, dev_aux, width, height, showmask); + } if(info) { @@ -5257,7 +5257,7 @@ int process_cl(struct dt_iop_module_t *self, dt_dev_pixelpipe_iop_t *piece, cl_m if(err != CL_SUCCESS) retval = FALSE; } - + finish: dt_opencl_release_mem_object(high_image); dt_opencl_release_mem_object(low_image); @@ -5460,7 +5460,7 @@ void init_global(dt_iop_module_so_t *module) gd->kernel_rcd_step_5_2 = dt_opencl_create_kernel(rcd, "rcd_step_5_2"); gd->kernel_rcd_border_redblue = dt_opencl_create_kernel(rcd, "rcd_border_redblue"); gd->kernel_rcd_border_green = dt_opencl_create_kernel(rcd, "rcd_border_green"); - gd->kernel_write_blended_dual = dt_opencl_create_kernel(rcd, "write_blended_dual"); + gd->kernel_write_blended_dual = dt_opencl_create_kernel(rcd, "write_blended_dual"); gd->lmmse_gamma_in = NULL; gd->lmmse_gamma_out = NULL; } @@ -5516,7 +5516,7 @@ void cleanup_global(dt_iop_module_so_t *module) dt_opencl_free_kernel(gd->kernel_rcd_step_5_2); dt_opencl_free_kernel(gd->kernel_rcd_border_redblue); dt_opencl_free_kernel(gd->kernel_rcd_border_green); - dt_opencl_free_kernel(gd->kernel_write_blended_dual); + dt_opencl_free_kernel(gd->kernel_write_blended_dual); dt_free_align(gd->lmmse_gamma_in); dt_free_align(gd->lmmse_gamma_out); free(module->data); @@ -5620,7 +5620,7 @@ void commit_params(struct dt_iop_module_t *self, dt_iop_params_t *params, dt_dev { piece->process_tiling_ready = 0; } - + if (self->dev->image_storage.flags & DT_IMAGE_4BAYER) { // 4Bayer images not implemented in OpenCL yet @@ -5751,7 +5751,7 @@ void gui_focus(struct dt_iop_module_t *self, gboolean in) if(!in) { const gboolean was_mask = g->show_mask; - g->show_mask = FALSE; + g->show_mask = FALSE; dt_bauhaus_widget_set_quad_active(GTK_WIDGET(g->dual_mask), FALSE); if(was_mask) dt_dev_reprocess_center(self->dev); } diff --git a/src/iop/dither.c b/src/iop/dither.c index d294791fc990..782401d0f4d0 100644 --- a/src/iop/dither.c +++ b/src/iop/dither.c @@ -405,7 +405,7 @@ static void process_floyd_steinberg(struct dt_iop_module_t *self, dt_dev_pixelpi _diffuse_error(pixel_ + down, err, DOWN_WT); \ _diffuse_error(pixel_ + downright, err, DOWNRIGHT_WT); \ } - + #define PROCESS_PIXEL_LEFT(_pixel, inpix) \ { \ float *const pixel_ = (_pixel); \ @@ -416,12 +416,12 @@ static void process_floyd_steinberg(struct dt_iop_module_t *self, dt_dev_pixelpi _diffuse_error(pixel_ + down, err, DOWN_WT); \ _diffuse_error(pixel_ + downright, err, DOWNRIGHT_WT); \ } - + #define PROCESS_PIXEL_RIGHT(pixel) \ nearest_color(pixel, err, graymode, f, rf); /* quantize pixel */ \ _diffuse_error(pixel + downleft, err, DOWNLEFT_WT); /* diffuse quantization error to neighbors */ \ _diffuse_error(pixel + down, err, DOWN_WT); - + // once the FS dithering gets started, we can copy&clip the downright pixel, as that will be the first time // it will be accessed. But to get the process started, we need to prepare the top row of pixels #ifdef _OPENMP @@ -588,7 +588,7 @@ static void process_floyd_steinberg_sse2(struct dt_iop_module_t *self, dt_dev_pi _diffuse_error_sse(pixel_ + down, err, DOWN_WT); \ _diffuse_error_sse(pixel_ + downright, err, DOWNRIGHT_WT); \ } - + #define PROCESS_PIXEL_LEFT_SSE(_pixel, inpix) \ { \ float *const pixel_ = (_pixel); \ @@ -599,12 +599,12 @@ static void process_floyd_steinberg_sse2(struct dt_iop_module_t *self, dt_dev_pi _diffuse_error_sse(pixel_ + down, err, DOWN_WT); \ _diffuse_error_sse(pixel_ + downright, err, DOWNRIGHT_WT); \ } - + #define PROCESS_PIXEL_RIGHT_SSE(pixel) \ err = nearest_color_sse(pixel, graymode, f, rf); /* quantize pixel */ \ _diffuse_error_sse(pixel + downleft, err, DOWNLEFT_WT); /* diffuse quantization error to neighbors */ \ _diffuse_error_sse(pixel + down, err, DOWN_WT); - + // once the FS dithering gets started, we can copy&clip the downright pixel, as that will be the first time // it will be accessed. But to get the process started, we need to prepare the top row of pixels for (int j = 0; j < width; j++) diff --git a/src/iop/dual_demosaic.c b/src/iop/dual_demosaic.c index 0fd02123599c..e1ff91c155f4 100644 --- a/src/iop/dual_demosaic.c +++ b/src/iop/dual_demosaic.c @@ -61,7 +61,7 @@ static void dual_demosaic(dt_dev_pixelpipe_iop_t *piece, float *const restrict r const float contrastf = slider2contrast(dual_threshold); dt_masks_calc_rawdetail_mask(rgb_data, blend, tmp, width, height, piece->pipe->dsc.temperature.coeffs); - dt_masks_calc_detail_mask(blend, blend, tmp, width, height, contrastf, TRUE); + dt_masks_calc_detail_mask(blend, blend, tmp, width, height, contrastf, TRUE); if(dual_mask) { @@ -69,7 +69,7 @@ static void dual_demosaic(dt_dev_pixelpipe_iop_t *piece, float *const restrict r #ifdef _OPENMP #pragma omp parallel for simd default(none) \ dt_omp_firstprivate(blend, rgb_data, vng_image, width, height) \ - schedule(simd:static) aligned(blend, vng_image, rgb_data : 64) + schedule(simd:static) aligned(blend, vng_image, rgb_data : 64) #endif for(int idx = 0; idx < width * height; idx++) { @@ -82,7 +82,7 @@ static void dual_demosaic(dt_dev_pixelpipe_iop_t *piece, float *const restrict r #ifdef _OPENMP #pragma omp parallel for simd default(none) \ dt_omp_firstprivate(blend, rgb_data, vng_image, width, height) \ - schedule(simd:static) aligned(blend, vng_image, rgb_data : 64) + schedule(simd:static) aligned(blend, vng_image, rgb_data : 64) #endif for(int idx = 0; idx < width * height; idx++) { @@ -126,7 +126,7 @@ gboolean dual_demosaic_cl(struct dt_iop_module_t *self, dt_dev_pixelpipe_iop_t * dt_opencl_set_kernel_arg(devid, kernel, 6, sizeof(float), &wb[2]); const int err = dt_opencl_enqueue_kernel_2d(devid, kernel, sizes); if(err != CL_SUCCESS) return FALSE; - } + } { size_t sizes[3] = { ROUNDUPWD(width), ROUNDUPHT(height), 1 }; @@ -137,14 +137,14 @@ gboolean dual_demosaic_cl(struct dt_iop_module_t *self, dt_dev_pixelpipe_iop_t * dt_opencl_set_kernel_arg(devid, kernel, 3, sizeof(int), &height); const int err = dt_opencl_enqueue_kernel_2d(devid, kernel, sizes); if(err != CL_SUCCESS) return FALSE; - } + } { const int flag = 1; size_t sizes[3] = { ROUNDUPWD(width), ROUNDUPHT(height), 1 }; const int kernel = darktable.opencl->blendop->kernel_calc_blend; - dt_opencl_set_kernel_arg(devid, kernel, 0, sizeof(cl_mem), &blend); - dt_opencl_set_kernel_arg(devid, kernel, 1, sizeof(cl_mem), &detail); + dt_opencl_set_kernel_arg(devid, kernel, 0, sizeof(cl_mem), &blend); + dt_opencl_set_kernel_arg(devid, kernel, 1, sizeof(cl_mem), &detail); dt_opencl_set_kernel_arg(devid, kernel, 2, sizeof(int), &width); dt_opencl_set_kernel_arg(devid, kernel, 3, sizeof(int), &height); dt_opencl_set_kernel_arg(devid, kernel, 4, sizeof(float), &contrastf); diff --git a/src/iop/filmicrgb.c b/src/iop/filmicrgb.c index 1737868ca37d..a437d4a168e9 100644 --- a/src/iop/filmicrgb.c +++ b/src/iop/filmicrgb.c @@ -383,7 +383,7 @@ static inline void convert_to_spline_v3(dt_iop_filmicrgb_params_t* n) dt_iop_filmic_rgb_spline_t spline; dt_iop_filmic_rgb_compute_spline(n, &spline); - + // from the spline, compute new values for contrast, balance, and latitude to update spline_version to v3 float grey_log = spline.x[2]; float toe_log = fminf(spline.x[1], grey_log); @@ -677,7 +677,7 @@ int legacy_params(dt_iop_module_t *self, const void *const old_params, const int gboolean compensate_icc_black; // $DEFAULT: FALSE $DESCRIPTION: "compensate output ICC profile black point" gint internal_version; // $DEFAULT: 2020 $DESCRIPTION: "version of the spline generator" } dt_iop_filmicrgb_params_v4_t; - + dt_iop_filmicrgb_params_v4_t *o = (dt_iop_filmicrgb_params_v4_t *)old_params; dt_iop_filmicrgb_params_t *n = (dt_iop_filmicrgb_params_t *)new_params; *n = *(dt_iop_filmicrgb_params_t*)o; // structure didn't change except the enum instead of gint for internal_version @@ -3151,7 +3151,7 @@ static gboolean dt_iop_tonecurve_draw(GtkWidget *widget, cairo_t *crf, gpointer const float ymax = g->spline.y[4]; // we multiply SAFETY_MARGIN by 1.1f to avoid possible false negatives due to float errors const float y_margin = SAFETY_MARGIN * 1.1f * (ymax - ymin); - gboolean red = (((k == 1) && (y - ymin <= y_margin)) + gboolean red = (((k == 1) && (y - ymin <= y_margin)) || ((k == 3) && (ymax - y <= y_margin))); float start_angle = 0.0f; float end_angle = 2.f * M_PI; diff --git a/src/iop/levels.c b/src/iop/levels.c index 38dda210c706..95e339334337 100644 --- a/src/iop/levels.c +++ b/src/iop/levels.c @@ -371,7 +371,7 @@ void process(dt_iop_module_t *self, dt_dev_pixelpipe_iop_t *piece, const void *c const float *const restrict in = (float*)ivoid; float *const restrict out = (float*)ovoid; const size_t npixels = (size_t)roi_out->width * roi_out->height; - + #ifdef _OPENMP #pragma omp parallel for default(none) \ dt_omp_firstprivate(ch, d) \ diff --git a/src/iop/rawprepare.c b/src/iop/rawprepare.c index ea855da6d083..16ad0f7c6ffe 100644 --- a/src/iop/rawprepare.c +++ b/src/iop/rawprepare.c @@ -609,7 +609,7 @@ void gui_update(dt_iop_module_t *self) // don't show upper three black levels for monochromes for(int i = 1; i < 4; i++) - gtk_widget_set_visible(g->black_level_separate[i], !is_monochrome); + gtk_widget_set_visible(g->black_level_separate[i], !is_monochrome); dt_bauhaus_slider_set_soft(g->white_point, p->raw_white_point); diff --git a/src/iop/toneequal.c b/src/iop/toneequal.c index 10049043658b..c9ea992befa4 100644 --- a/src/iop/toneequal.c +++ b/src/iop/toneequal.c @@ -644,7 +644,7 @@ static float get_luminance_from_buffer(const float *const buffer, } return luminance; } - + const size_t x_abs[4] DT_ALIGNED_PIXEL = { MAX(x, 1) - 1, // previous column x, // center column @@ -2311,9 +2311,9 @@ void gui_post_expose(struct dt_iop_module_t *self, cairo_t *cr, int32_t width, i } dt_iop_gui_leave_critical_section(self); - + if(isnan(correction) || isnan(exposure_in)) return; // something went wrong - + // Rescale and shift Cairo drawing coordinates const float wd = dev->preview_pipe->backbuf_width; const float ht = dev->preview_pipe->backbuf_height; diff --git a/src/iop/useless.c b/src/iop/useless.c index 8095c892a602..a8d010364271 100644 --- a/src/iop/useless.c +++ b/src/iop/useless.c @@ -628,10 +628,10 @@ GSList *mouse_actions(dt_iop_module_t *self) { GSList *lm = NULL; // add the first action - lm = dt_mouse_action_create_format(lm, DT_MOUSE_ACTION_SCROLL, GDK_SHIFT_MASK, + lm = dt_mouse_action_create_format(lm, DT_MOUSE_ACTION_SCROLL, GDK_SHIFT_MASK, _("[%s] some action"), self->name()); // append a second action to the list we will return - lm = dt_mouse_action_create_format(lm, DT_MOUSE_ACTION_LEFT_DRAG, GDK_CONTROL_MASK | GDK_SHIFT_MASK, + lm = dt_mouse_action_create_format(lm, DT_MOUSE_ACTION_LEFT_DRAG, GDK_CONTROL_MASK | GDK_SHIFT_MASK, _("[%s] other action"), self->name()); return lm; } diff --git a/src/iop/vignette.c b/src/iop/vignette.c index 55f6e3163a00..742e0fadc276 100644 --- a/src/iop/vignette.c +++ b/src/iop/vignette.c @@ -1021,11 +1021,11 @@ void gui_init(struct dt_iop_module_t *self) GSList *mouse_actions(struct dt_iop_module_t *self) { GSList *lm = NULL; - lm = dt_mouse_action_create_format(lm, DT_MOUSE_ACTION_LEFT_DRAG, 0, + lm = dt_mouse_action_create_format(lm, DT_MOUSE_ACTION_LEFT_DRAG, 0, _("[%s on node] change vignette/feather size"), self->name()); - lm = dt_mouse_action_create_format(lm, DT_MOUSE_ACTION_LEFT_DRAG, GDK_CONTROL_MASK, + lm = dt_mouse_action_create_format(lm, DT_MOUSE_ACTION_LEFT_DRAG, GDK_CONTROL_MASK, _("[%s on node] change vignette/feather size keeping ratio"), self->name()); - lm = dt_mouse_action_create_format(lm, DT_MOUSE_ACTION_LEFT_DRAG, GDK_CONTROL_MASK, + lm = dt_mouse_action_create_format(lm, DT_MOUSE_ACTION_LEFT_DRAG, GDK_CONTROL_MASK, _("[%s on center] move vignette"), self->name()); return lm; } diff --git a/src/lua/image.c b/src/lua/image.c index 4db16ac861f7..8f9fbda8e171 100644 --- a/src/lua/image.c +++ b/src/lua/image.c @@ -106,7 +106,7 @@ static int generate_cache(lua_State *L) const gboolean create_dirs = lua_toboolean(L, 2); const int min = luaL_checkinteger(L, 3); const int max = luaL_checkinteger(L, 4); - + if(create_dirs) { for(dt_mipmap_size_t k = min; k <= max; k++) diff --git a/src/lua/lib.c b/src/lua/lib.c index 243ae9c1ecde..f19862e9db3d 100644 --- a/src/lua/lib.c +++ b/src/lua/lib.c @@ -86,14 +86,14 @@ static int on_screen_member(lua_State *L) return 1; } -static int position_member(lua_State*L) +static int position_member(lua_State*L) { dt_lib_module_t * module = *(dt_lib_module_t**)lua_touserdata(L, 1); lua_pushinteger(L, module->position(module)); return 1; } -static int container_member(lua_State*L) +static int container_member(lua_State*L) { dt_lib_module_t * module = *(dt_lib_module_t**)lua_touserdata(L, 1); dt_ui_container_t container; @@ -103,7 +103,7 @@ static int container_member(lua_State*L) } -static int views_member(lua_State*L) +static int views_member(lua_State*L) { dt_lib_module_t * module = *(dt_lib_module_t**)lua_touserdata(L, 1); lua_newtable(L); diff --git a/src/lua/password.c b/src/lua/password.c index ac462708c83e..593b00dcf1c0 100644 --- a/src/lua/password.c +++ b/src/lua/password.c @@ -44,7 +44,7 @@ static int save_password(lua_State *L) gboolean result = TRUE; GHashTable *table = g_hash_table_new(g_str_hash, g_str_equal); - + g_hash_table_insert(table, (gchar *)username, (gchar *)password); if(!dt_pwstorage_set(application, table)) diff --git a/src/lua/preferences.c b/src/lua/preferences.c index da91c0f33021..a53eb2b20ef3 100644 --- a/src/lua/preferences.c +++ b/src/lua/preferences.c @@ -167,7 +167,7 @@ static int get_keys(lua_State *L) g_list_free(keys); return 1; } - + static void get_pref_name(char *tgt, size_t size, const char *script, const char *name) { snprintf(tgt, size, "lua/%s/%s", script, name); @@ -184,7 +184,7 @@ static int read_pref(lua_State *L) char pref_name[1024]; if(strcmp(script, "darktable") != 0) get_pref_name(pref_name, sizeof(pref_name), script, name); - else + else snprintf(pref_name, sizeof(pref_name), "%s", name); switch(i) { diff --git a/src/lua/print.c b/src/lua/print.c index 2d738244e791..b1e928d420a6 100644 --- a/src/lua/print.c +++ b/src/lua/print.c @@ -33,7 +33,7 @@ static int lua_print(lua_State *L) static int lua_print_toast(lua_State *L) { - + const int init_gui = (darktable.gui != NULL); if(init_gui) dt_toast_log("%s", luaL_checkstring(L, -1)); @@ -45,7 +45,7 @@ static int lua_print_toast(lua_State *L) static int lua_print_hinter(lua_State *L) { - + const int init_gui = (darktable.gui != NULL); if(init_gui) { diff --git a/src/lua/widget/container.c b/src/lua/widget/container.c index 019c8e886cbe..0c86bff597bf 100644 --- a/src/lua/widget/container.c +++ b/src/lua/widget/container.c @@ -37,7 +37,7 @@ static int container_reset(lua_State* L) lua_getiuservalue(L, 1, 1); GList *children = gtk_container_get_children(GTK_CONTAINER(container->widget)); for(const GList *curelt = children; curelt; curelt = g_list_next(curelt)) - { + { lua_pushcfunction(L,dt_lua_widget_trigger_callback); GtkWidget* cur_widget = curelt->data; luaA_push(L,lua_widget,&cur_widget); diff --git a/src/lua/widget/widget.c b/src/lua/widget/widget.c index 99eafd454240..b34bb8c31953 100644 --- a/src/lua/widget/widget.c +++ b/src/lua/widget/widget.c @@ -242,7 +242,7 @@ static int visible_member(lua_State *L) if(value) { gtk_widget_show(widget->widget); - // enable gtk_widget_show_all() in case it was disabled by + // enable gtk_widget_show_all() in case it was disabled by // setting a widget to hidden gtk_widget_set_no_show_all(widget->widget, FALSE); } diff --git a/tools/noise/noiseprofile.c b/tools/noise/noiseprofile.c index 58fdd107746d..5d456022b47b 100644 --- a/tools/noise/noiseprofile.c +++ b/tools/noise/noiseprofile.c @@ -13,15 +13,15 @@ Function : kth_smallest() In : array of elements, # of elements in the array, rank k Out : one element Job : find the kth smallest element in the array -Notice : use the median() macro defined below to get the median. +Notice : use the median() macro defined below to get the median. Reference: -Author: Wirth, Niklaus -Title: Algorithms + data structures = programs -Publisher: Englewood Cliffs: Prentice-Hall, 1976 -Physical description: 366 p. -Series: Prentice-Hall Series in Automatic Computation +Author: Wirth, Niklaus +Title: Algorithms + data structures = programs +Publisher: Englewood Cliffs: Prentice-Hall, 1976 +Physical description: 366 p. +Series: Prentice-Hall Series in Automatic Computation ---------------------------------------------------------------------------*/ diff --git a/tools/regression_tests/src/progs/imgcmp.c b/tools/regression_tests/src/progs/imgcmp.c index 2fb4cd73f0f3..db2d4a7c99fc 100644 --- a/tools/regression_tests/src/progs/imgcmp.c +++ b/tools/regression_tests/src/progs/imgcmp.c @@ -87,7 +87,7 @@ int main ( int argc, char **argv ) } if (image1->columns != image2->columns || image1->rows != image2->rows) { - fprintf(stderr, "Images are not same size %ldx%ld vs %ldx%ld\n", + fprintf(stderr, "Images are not same size %ldx%ld vs %ldx%ld\n", image1->rows, image1->columns, image2->rows, image2->columns); exit(2);