[gthumb] removed unused variables
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gthumb] removed unused variables
- Date: Wed, 17 Aug 2016 17:30:52 +0000 (UTC)
commit 0f3065cf1b0d175bcc160e181d1b5495146aea6d
Author: Paolo Bacchilega <paobac src gnome org>
Date: Wed Aug 17 19:15:38 2016 +0200
removed unused variables
extensions/file_tools/cairo-effects.c | 9 +--------
extensions/file_tools/callbacks.c | 12 ++++++------
extensions/file_tools/gth-curve.c | 3 ++-
.../file_tools/gth-file-tool-adjust-contrast.c | 1 -
extensions/file_tools/gth-file-tool-curves.c | 10 ++--------
extensions/file_tools/gth-file-tool-effects.c | 5 -----
extensions/image_viewer/gth-image-viewer-page.c | 1 -
extensions/jpeg_utils/jpeg-info.c | 1 -
gthumb/dlg-preferences-browser.c | 2 --
gthumb/dlg-preferences-general.c | 3 ---
gthumb/dlg-preferences.c | 13 ++++++-------
gthumb/dom.c | 1 -
gthumb/gth-browser.c | 6 ------
gthumb/gth-color-scale.c | 3 ---
gthumb/gth-file-data.c | 1 -
gthumb/gth-file-source-vfs.c | 1 -
gthumb/gth-filter-grid.c | 5 +----
gthumb/gth-main.c | 2 --
gthumb/gth-multipage.c | 6 ++----
gthumb/gth-request-dialog.c | 2 --
gthumb/gth-window-title.c | 15 ---------------
gthumb/main.c | 1 -
22 files changed, 20 insertions(+), 83 deletions(-)
---
diff --git a/extensions/file_tools/cairo-effects.c b/extensions/file_tools/cairo-effects.c
index 1367ddf..3d73fc3 100644
--- a/extensions/file_tools/cairo-effects.c
+++ b/extensions/file_tools/cairo-effects.c
@@ -225,8 +225,6 @@ cairo_image_surface_apply_bcs (cairo_surface_t *source,
GthAsyncTask *task)
{
PixbufCache *cache;
- int i;
- double midtone_distance[256];
int width;
int height;
int source_stride;
@@ -235,15 +233,11 @@ cairo_image_surface_apply_bcs (cairo_surface_t *source,
gboolean cancelled = FALSE;
double progress;
unsigned char *p_source;
- int image_red, image_green, image_blue, image_alpha;
unsigned char values[4];
- int red, green, blue, alpha;
- int temp, min, max, lightness, value;
+ int temp, value;
gimp_op_init ();
cache = pixbuf_cache_new ();
- for (i = 0; i < 256; i++)
- midtone_distance[i] = 0.667 * (1 - SQR (((double) i - 127.0) / 127.0));
if (saturation < 0)
saturation = tan (saturation * G_PI_2);
@@ -406,7 +400,6 @@ cairo_image_surface_add_color (cairo_surface_t *source,
guchar color_alpha,
GthAsyncTask *task)
{
- int i;
int width;
int height;
int source_stride;
diff --git a/extensions/file_tools/callbacks.c b/extensions/file_tools/callbacks.c
index 19c9e07..cbad8e9 100644
--- a/extensions/file_tools/callbacks.c
+++ b/extensions/file_tools/callbacks.c
@@ -40,12 +40,12 @@ gpointer
file_tools__gth_browser_file_list_key_press_cb (GthBrowser *browser,
GdkEventKey *event)
{
- gpointer result = NULL;
- GtkWidget *sidebar;
- GtkWidget *toolbox;
- GthFileTool *tool = NULL;
- guint modifiers;
- GtkWidget *page;
+ gpointer result = NULL;
+ GtkWidget *sidebar;
+ GtkWidget *toolbox;
+ GthFileTool *tool = NULL;
+ guint modifiers;
+ GthViewerPage *page;
sidebar = gth_browser_get_viewer_sidebar (browser);
toolbox = gth_sidebar_get_toolbox (GTH_SIDEBAR (sidebar));
diff --git a/extensions/file_tools/gth-curve.c b/extensions/file_tools/gth-curve.c
index ba15388..7099b55 100644
--- a/extensions/file_tools/gth-curve.c
+++ b/extensions/file_tools/gth-curve.c
@@ -50,7 +50,6 @@ gth_curve_new_for_points (GType curve_type,
{
GthCurve *curve;
va_list args;
- int i;
GthPoints points;
curve = g_object_new (curve_type, NULL);
@@ -375,9 +374,11 @@ gth_cspline_finalize (GObject *object)
}
+#if 0
static int number_sign (double x) {
return (x < 0) ? -1 : (x > 0) ? 1 : 0;
}
+#endif
static void
diff --git a/extensions/file_tools/gth-file-tool-adjust-contrast.c
b/extensions/file_tools/gth-file-tool-adjust-contrast.c
index 8f9fbe0..478bdcf 100644
--- a/extensions/file_tools/gth-file-tool-adjust-contrast.c
+++ b/extensions/file_tools/gth-file-tool-adjust-contrast.c
@@ -205,7 +205,6 @@ adjust_contrast_setup (EqualizeData *equalize_data,
cairo_surface_t *source)
{
GthHistogram *histogram;
- int c;
histogram = gth_histogram_new ();
gth_histogram_calculate_for_image (histogram, source);
diff --git a/extensions/file_tools/gth-file-tool-curves.c b/extensions/file_tools/gth-file-tool-curves.c
index 0982c43..f1827ab 100644
--- a/extensions/file_tools/gth-file-tool-curves.c
+++ b/extensions/file_tools/gth-file-tool-curves.c
@@ -77,8 +77,7 @@ static void
curves_setup (TaskData *task_data,
cairo_surface_t *source)
{
- long **value_map;
- int c, v;
+ int c, v;
for (c = GTH_HISTOGRAM_CHANNEL_VALUE; c <= GTH_HISTOGRAM_CHANNEL_BLUE; c++) {
task_data->value_map[c] = g_new (long, 256);
@@ -242,7 +241,7 @@ static TaskData *
task_data_new (GthPoints *points)
{
TaskData *task_data;
- int c, n;
+ int c;
task_data = g_new (TaskData, 1);
for (c = 0; c < GTH_HISTOGRAM_N_CHANNELS; c++) {
@@ -297,7 +296,6 @@ apply_cb (gpointer user_data)
GthFileToolCurves *self = user_data;
GtkWidget *window;
GthPoints points[GTH_HISTOGRAM_N_CHANNELS];
- int c;
if (self->priv->apply_event != 0) {
g_source_remove (self->priv->apply_event);
@@ -523,7 +521,6 @@ preset_changed_cb (GthCurvePreset *preset,
gpointer user_data)
{
GthFileToolCurves *self = user_data;
- gboolean saved;
const char *preset_name;
GthPoints *points;
GError *error = NULL;
@@ -715,7 +712,6 @@ gth_file_tool_curves_get_options (GthFileTool *base)
self->priv->filter_grid = gth_filter_grid_new ();
for (i = 0; i < gth_curve_preset_get_size (self->priv->preset); i++) {
GthPoints *points;
- int c;
const char *name;
int id;
@@ -881,8 +877,6 @@ gth_file_tool_sharpen_reset_image (GthImageViewerPageTool *base)
static void
gth_file_tool_curves_init (GthFileToolCurves *self)
{
- int c;
-
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_FILE_TOOL_CURVES, GthFileToolCurvesPrivate);
self->priv->preview = NULL;
self->priv->destination = NULL;
diff --git a/extensions/file_tools/gth-file-tool-effects.c b/extensions/file_tools/gth-file-tool-effects.c
index 5139b92..3652cb3 100644
--- a/extensions/file_tools/gth-file-tool-effects.c
+++ b/extensions/file_tools/gth-file-tool-effects.c
@@ -369,7 +369,6 @@ warmer_exec (GthAsyncTask *task,
cairo_surface_t *original;
cairo_surface_t *source;
GthCurve *curve[GTH_HISTOGRAM_N_CHANNELS];
- gboolean cancelled = FALSE;
original = gth_image_task_get_source_surface (GTH_IMAGE_TASK (task));
source = _cairo_image_surface_copy (original);
@@ -414,7 +413,6 @@ cooler_exec (GthAsyncTask *task,
cairo_surface_t *original;
cairo_surface_t *source;
GthCurve *curve[GTH_HISTOGRAM_N_CHANNELS];
- gboolean cancelled = FALSE;
original = gth_image_task_get_source_surface (GTH_IMAGE_TASK (task));
source = _cairo_image_surface_copy (original);
@@ -700,7 +698,6 @@ cherry_exec (GthAsyncTask *task,
cairo_surface_t *original;
cairo_surface_t *source;
GthCurve *curve[GTH_HISTOGRAM_N_CHANNELS];
- gboolean cancelled = FALSE;
original = gth_image_task_get_source_surface (GTH_IMAGE_TASK (task));
source = _cairo_image_surface_copy (original);
@@ -748,7 +745,6 @@ vintage_exec (GthAsyncTask *task,
cairo_surface_t *original;
cairo_surface_t *source;
GthCurve *curve[GTH_HISTOGRAM_N_CHANNELS];
- gboolean cancelled = FALSE;
original = gth_image_task_get_source_surface (GTH_IMAGE_TASK (task));
source = _cairo_image_surface_copy (original);
@@ -919,7 +915,6 @@ vignette_exec (GthAsyncTask *task,
{
cairo_surface_t *original;
cairo_surface_t *destination;
- gboolean cancelled = FALSE;
original = gth_image_task_get_source_surface (GTH_IMAGE_TASK (task));
destination = _cairo_image_surface_copy (original);
diff --git a/extensions/image_viewer/gth-image-viewer-page.c b/extensions/image_viewer/gth-image-viewer-page.c
index 3cd115b..a48c378 100644
--- a/extensions/image_viewer/gth-image-viewer-page.c
+++ b/extensions/image_viewer/gth-image-viewer-page.c
@@ -373,7 +373,6 @@ update_overview_visibility_now (gpointer user_data)
{
GthImageViewerPage *self;
gboolean overview_visible;
- gboolean revealed;
self = GTH_IMAGE_VIEWER_PAGE (user_data);
diff --git a/extensions/jpeg_utils/jpeg-info.c b/extensions/jpeg_utils/jpeg-info.c
index 5ca2ec3..1239044 100644
--- a/extensions/jpeg_utils/jpeg-info.c
+++ b/extensions/jpeg_utils/jpeg-info.c
@@ -255,7 +255,6 @@ _jpeg_exif_colorimetry_from_app1_segment (guchar *in_buffer,
gboolean big_endian;
guchar *exif_data;
guint offset, number_of_tags, tagnum;
- int orientation;
int remaining_tags;
/* Length includes itself, so must be at least 2 */
diff --git a/gthumb/dlg-preferences-browser.c b/gthumb/dlg-preferences-browser.c
index 2240708..bd0228f 100644
--- a/gthumb/dlg-preferences-browser.c
+++ b/gthumb/dlg-preferences-browser.c
@@ -120,8 +120,6 @@ browser__dlg_preferences_construct_cb (GtkWidget *dialog,
GtkBuilder *dialog_builder)
{
BrowserData *data;
- char *startup_location;
- GthFileSource *file_source;
char *current_caption;
GtkWidget *label;
GtkWidget *page;
diff --git a/gthumb/dlg-preferences-general.c b/gthumb/dlg-preferences-general.c
index c4dfebc..fd83500 100644
--- a/gthumb/dlg-preferences-general.c
+++ b/gthumb/dlg-preferences-general.c
@@ -135,9 +135,6 @@ general__dlg_preferences_construct_cb (GtkWidget *dialog,
BrowserData *data;
char *startup_location;
GthFileSource *file_source;
- char *current_caption;
- GtkWidget *label;
- GtkWidget *page;
data = g_new0 (BrowserData, 1);
data->builder = g_object_ref (dialog_builder);
diff --git a/gthumb/dlg-preferences.c b/gthumb/dlg-preferences.c
index ff2a297..86162ea 100644
--- a/gthumb/dlg-preferences.c
+++ b/gthumb/dlg-preferences.c
@@ -76,13 +76,12 @@ list_box_row_activated_cb (GtkListBox *box,
void
dlg_preferences (GthBrowser *browser)
{
- DialogData *data;
- GtkWidget *notebook;
- GList *children;
- GList *scan;
- int page_num;
- GtkWidget *list_box;
- GtkTreeSelection *selection;
+ DialogData *data;
+ GtkWidget *notebook;
+ GList *children;
+ GList *scan;
+ int page_num;
+ GtkWidget *list_box;
if (gth_browser_get_dialog (browser, "preferences") != NULL) {
gtk_window_present (GTK_WINDOW (gth_browser_get_dialog (browser, "preferences")));
diff --git a/gthumb/dom.c b/gthumb/dom.c
index 4adb11b..42329fb 100644
--- a/gthumb/dom.c
+++ b/gthumb/dom.c
@@ -722,7 +722,6 @@ dom_str_equal (const char *a,
const char *b)
{
const char *ai, *bi;
- gboolean a_valid, b_valid;
if ((a != NULL) && ! g_utf8_validate (a, -1, NULL))
a = NULL;
diff --git a/gthumb/gth-browser.c b/gthumb/gth-browser.c
index 9ab7409..d2bd61c 100644
--- a/gthumb/gth-browser.c
+++ b/gthumb/gth-browser.c
@@ -2275,7 +2275,6 @@ hide_mouse_pointer_cb (gpointer data)
{
HideMouseData *hmdata = data;
GthBrowser *browser = hmdata->browser;
- GList *scan;
browser->priv->hide_mouse_timeout = 0;
@@ -6421,14 +6420,10 @@ _gth_browser_load_file_keep_view (GthBrowser *browser,
gboolean view,
gboolean no_delay)
{
- gboolean fullscreen;
-
if (browser->priv->view_files_in_fullscreen && gth_browser_get_is_fullscreen (browser))
view = FALSE;
else if (gth_window_get_current_page (GTH_WINDOW (browser)) == GTH_BROWSER_PAGE_VIEWER)
view = FALSE;
- fullscreen = view && browser->priv->view_files_in_fullscreen;
-
_gth_browser_load_file_more_options (browser, file_data, view,
browser->priv->view_files_in_fullscreen, no_delay);
}
@@ -6969,7 +6964,6 @@ gth_browser_get_screen_profile (GthBrowser *browser)
GdkAtom type = GDK_NONE;
int format = 0;
int nitems = 0;
- int monitor = 0;
guchar *data = NULL;
screen = gtk_widget_get_screen (GTK_WIDGET (browser));
diff --git a/gthumb/gth-color-scale.c b/gthumb/gth-color-scale.c
index f7387ac..fd1699e 100644
--- a/gthumb/gth-color-scale.c
+++ b/gthumb/gth-color-scale.c
@@ -255,11 +255,8 @@ gth_color_scale_draw (GtkWidget *widget,
GtkStyleContext *context;
GtkOrientation orientation;
GdkRectangle range_rect;
- int slider_width;
- int slider_length;
int slider_start;
int slider_end;
- int slider_spacing;
GtkStateFlags widget_state;
GtkStateFlags slider_state;
gboolean gtk320 = ((gtk_major_version >= 3) && (gtk_minor_version >= 20));
diff --git a/gthumb/gth-file-data.c b/gthumb/gth-file-data.c
index de447ae..85de776 100644
--- a/gthumb/gth-file-data.c
+++ b/gthumb/gth-file-data.c
@@ -528,7 +528,6 @@ gth_file_data_get_attribute_as_string (GthFileData *file_data,
{
GObject *obj;
char *value = NULL;
- char *utf8_value;
switch (g_file_info_get_attribute_type (file_data->info, id)) {
case G_FILE_ATTRIBUTE_TYPE_OBJECT:
diff --git a/gthumb/gth-file-source-vfs.c b/gthumb/gth-file-source-vfs.c
index fc89bea..3dc05ce 100644
--- a/gthumb/gth-file-source-vfs.c
+++ b/gthumb/gth-file-source-vfs.c
@@ -769,7 +769,6 @@ gth_file_mananger_trash_files (GtkWindow *window,
GList *file_list /* GthFileData list */)
{
TrashData *tdata;
- GList *files;
GthTask *task;
tdata = g_new0 (TrashData, 1);
diff --git a/gthumb/gth-filter-grid.c b/gthumb/gth-filter-grid.c
index 980ed7d..413d760 100644
--- a/gthumb/gth-filter-grid.c
+++ b/gthumb/gth-filter-grid.c
@@ -390,8 +390,6 @@ void
gth_filter_grid_activate (GthFilterGrid *self,
int filter_id)
{
- GtkWidget *button;
-
if (filter_id == GTH_FILTER_GRID_NO_FILTER) {
if (self->priv->active_button != NULL)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->priv->active_button), FALSE);
@@ -555,8 +553,7 @@ generate_previews (GthFilterGrid *self,
cairo_surface_t *image,
GList *tasks)
{
- GeneratePreviewData *data;
- GList *scan;
+ GeneratePreviewData *data;
if (self->priv->gp_data != NULL)
generate_preview_data_cancel (self->priv->gp_data);
diff --git a/gthumb/gth-main.c b/gthumb/gth-main.c
index 9dddfa9..38a5f8f 100644
--- a/gthumb/gth-main.c
+++ b/gthumb/gth-main.c
@@ -1245,8 +1245,6 @@ gth_main_activate_extensions (void)
"slideshow",
"webalbums",
NULL };
- int i;
- GError *error = NULL;
GSettings *settings;
char **user_actived_extensions;
char **actived_extensions;
diff --git a/gthumb/gth-multipage.c b/gthumb/gth-multipage.c
index baf6f31..348c45a 100644
--- a/gthumb/gth-multipage.c
+++ b/gthumb/gth-multipage.c
@@ -130,8 +130,7 @@ visible_child_changed_cb (GObject *playbin,
static void
gth_multipage_init (GthMultipage *multipage)
{
- GtkWidget *switcher_box;
- GtkCellRenderer *renderer;
+ GtkWidget *switcher_box;
multipage->priv = GTH_MULTIPAGE_GET_PRIVATE (multipage);
multipage->priv->children = NULL;
@@ -180,8 +179,7 @@ void
gth_multipage_add_child (GthMultipage *multipage,
GthMultipageChild *child)
{
- GtkWidget *box;
- GtkTreeIter iter;
+ GtkWidget *box;
multipage->priv->children = g_list_append (multipage->priv->children, child);
diff --git a/gthumb/gth-request-dialog.c b/gthumb/gth-request-dialog.c
index d121c8c..4af7e74 100644
--- a/gthumb/gth-request-dialog.c
+++ b/gthumb/gth-request-dialog.c
@@ -59,8 +59,6 @@ _gth_request_dialog_construct (GthRequestDialog *self,
const char *cancel_button_text,
const char *ok_button_text)
{
- GtkWidget *title_label;
- PangoAttrList *attributes;
GtkWidget *prompt_label;
GtkWidget *hbox;
GtkWidget *vbox_entry;
diff --git a/gthumb/gth-window-title.c b/gthumb/gth-window-title.c
index 217053f..7ebcd25 100644
--- a/gthumb/gth-window-title.c
+++ b/gthumb/gth-window-title.c
@@ -40,24 +40,9 @@ G_DEFINE_TYPE (GthWindowTitle,
static void
-gth_window_title_finalize (GObject *object)
-{
- GthWindowTitle *self;
-
- self = GTH_WINDOW_TITLE (object);
-
- G_OBJECT_CLASS (gth_window_title_parent_class)->finalize (object);
-}
-
-static void
gth_window_title_class_init (GthWindowTitleClass *klass)
{
- GObjectClass *object_class;
-
g_type_class_add_private (klass, sizeof (GthWindowTitlePrivate));
-
- object_class = (GObjectClass*) klass;
- object_class->finalize = gth_window_title_finalize;
}
diff --git a/gthumb/main.c b/gthumb/main.c
index 121baa8..849ac4a 100644
--- a/gthumb/main.c
+++ b/gthumb/main.c
@@ -218,7 +218,6 @@ static const GActionEntry app_menu_entries[] = {
static void
_gth_application_initialize_app_menu (GApplication *application)
{
- gboolean show_app_menu;
GtkBuilder *builder;
g_action_map_add_action_entries (G_ACTION_MAP (application),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]