[gnome-raw-thumbnailer] Re-indent
- From: Hubert FiguiÃre <hub src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-raw-thumbnailer] Re-indent
- Date: Sat, 17 Dec 2011 08:19:28 +0000 (UTC)
commit 2f3310827a8f1dec43c539715cce0a771bde5e4f
Author: Hub Figuiere <hub figuiere net>
Date: Fri Dec 16 23:43:43 2011 -0800
Re-indent
src/raw-thumbnailer.c | 208 +++++++++++++++++++++++++------------------------
1 files changed, 105 insertions(+), 103 deletions(-)
---
diff --git a/src/raw-thumbnailer.c b/src/raw-thumbnailer.c
index 19d5150..c39db5b 100644
--- a/src/raw-thumbnailer.c
+++ b/src/raw-thumbnailer.c
@@ -40,123 +40,125 @@ static char **filenames = NULL;
static void
save_pixbuf (GdkPixbuf *pixbuf, const char *path, int size)
{
- GdkPixbuf *small = NULL;
- GError *err = NULL;
- char *a_width, *a_height;
- int width, height;
- height = gdk_pixbuf_get_height (pixbuf);
- width = gdk_pixbuf_get_width (pixbuf);
-
- if (size <= 128) {
- int d_width, d_height;
-
- if (width > height) {
- d_width = size;
- d_height = size * height / width;
- } else {
- d_height = size;
- d_width = size * width / height;
- }
-
- small = gdk_pixbuf_scale_simple (pixbuf, d_width, d_height,
- GDK_INTERP_TILES);
- }
- else {
- small = pixbuf;
- gdk_pixbuf_ref (small);
- }
-
- a_width = g_strdup_printf ("%d", width);
- a_height = g_strdup_printf ("%d", height);
-
- if (gdk_pixbuf_save (small, path,
- jpeg_output ? "jpeg" : "png", &err,
- "tEXt::Thumb::Image::Width", a_width,
- "tEXt::Thumb::Image::Height", a_height,
- NULL) == FALSE) {
- if (err != NULL) {
- g_print ("raw-thumbnailer couldn't write the thumbnail '%s': %s\n", path, err->message);
- g_error_free (err);
- } else {
- g_print ("raw-thumbnailer couldn't write the thumbnail '%s'\n", path);
- }
- }
-
- g_free(a_width);
- g_free(a_height);
-
- if (small) {
- gdk_pixbuf_unref (small);
- }
- return;
+ GdkPixbuf *small = NULL;
+ GError *err = NULL;
+ char *a_width, *a_height;
+ int width, height;
+ height = gdk_pixbuf_get_height (pixbuf);
+ width = gdk_pixbuf_get_width (pixbuf);
+
+ if (size <= 128) {
+ int d_width, d_height;
+
+ if (width > height) {
+ d_width = size;
+ d_height = size * height / width;
+ }
+ else {
+ d_height = size;
+ d_width = size * width / height;
+ }
+
+ small = gdk_pixbuf_scale_simple (pixbuf, d_width, d_height,
+ GDK_INTERP_TILES);
+ }
+ else {
+ small = pixbuf;
+ gdk_pixbuf_ref (small);
+ }
+
+ a_width = g_strdup_printf ("%d", width);
+ a_height = g_strdup_printf ("%d", height);
+
+ if (gdk_pixbuf_save (small, path,
+ jpeg_output ? "jpeg" : "png", &err,
+ "tEXt::Thumb::Image::Width", a_width,
+ "tEXt::Thumb::Image::Height", a_height,
+ NULL) == FALSE) {
+ if (err != NULL) {
+ g_print ("raw-thumbnailer couldn't write the thumbnail '%s': %s\n", path, err->message);
+ g_error_free (err);
+ }
+ else {
+ g_print ("raw-thumbnailer couldn't write the thumbnail '%s'\n", path);
+ }
+ }
+
+ g_free(a_width);
+ g_free(a_height);
+
+ if (small) {
+ gdk_pixbuf_unref (small);
+ }
+ return;
}
static const GOptionEntry entries[] = {
- { "jpeg", 'j', 0, G_OPTION_ARG_NONE, &jpeg_output, "Output the thumbnail as a JPEG instead of PNG", NULL },
- { "size", 's', 0, G_OPTION_ARG_INT, &output_size, "Size of the thumbnail in pixels", NULL },
- { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Output debug information", NULL },
+ { "jpeg", 'j', 0, G_OPTION_ARG_NONE, &jpeg_output, "Output the thumbnail as a JPEG instead of PNG", NULL },
+ { "size", 's', 0, G_OPTION_ARG_INT, &output_size, "Size of the thumbnail in pixels", NULL },
+ { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Output debug information", NULL },
#ifndef THUMB_DEBUG
- {"g-fatal-warnings", 0, 0, G_OPTION_ARG_NONE, &g_fatal_warnings, "Make all warnings fatal", NULL},
+ {"g-fatal-warnings", 0, 0, G_OPTION_ARG_NONE, &g_fatal_warnings, "Make all warnings fatal", NULL},
#endif /* THUMB_DEBUG */
- { G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &filenames, NULL, "[FILE...]" },
- { NULL }
+ { G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &filenames, NULL, "[FILE...]" },
+ { NULL }
};
int main (int argc, char ** argv)
{
- const char *output_name;
- const char *input_name;
- GOptionContext *context;
- GError *err = NULL;
- gboolean success;
- int size;
- GdkPixbuf *pixbuf;
-
- context = g_option_context_new ("Thumbnail camera RAW files.");
- g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
- g_type_init ();
-
- if (g_option_context_parse (context, &argc, &argv, &err) == FALSE) {
- g_print ("couldn't parse command-line options: %s\n", err->message);
- g_error_free (err);
- return 1;
- }
- if (g_fatal_warnings) {
- GLogLevelFlags fatal_mask;
-
- fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK);
- fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL;
- g_log_set_always_fatal (fatal_mask);
- }
- if (filenames == NULL || g_strv_length (filenames) != 2) {
- g_print ("Expects an input and an output file\n");
- return 1;
- }
-
- input_name = filenames[0];
- output_name = filenames[1];
-
- GFile* file = g_file_new_for_commandline_arg(input_name);
- char* uri = g_file_get_uri(file);
- g_object_unref(file);
-
- char* inputfname = g_filename_from_uri (uri, NULL, NULL);
- g_free(uri);
-
- pixbuf = or_gdkpixbuf_extract_rotated_thumbnail(inputfname, output_size);
- g_free(inputfname);
-
- save_pixbuf(pixbuf, output_name, output_size);
-
- g_object_unref(pixbuf);
- g_option_context_free(context);
-
- return 0;
+ const char *output_name;
+ const char *input_name;
+ GOptionContext *context;
+ GError *err = NULL;
+ gboolean success;
+ int size;
+ GdkPixbuf *pixbuf;
+
+ context = g_option_context_new ("Thumbnail camera RAW files.");
+ g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
+ g_type_init ();
+
+ if (g_option_context_parse (context, &argc, &argv, &err) == FALSE) {
+ g_print ("couldn't parse command-line options: %s\n", err->message);
+ g_error_free (err);
+ return 1;
+ }
+ if (g_fatal_warnings) {
+ GLogLevelFlags fatal_mask;
+
+ fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK);
+ fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL;
+ g_log_set_always_fatal (fatal_mask);
+ }
+ if (filenames == NULL || g_strv_length (filenames) != 2) {
+ g_print ("Expects an input and an output file\n");
+ return 1;
+ }
+
+ input_name = filenames[0];
+ output_name = filenames[1];
+
+ GFile* file = g_file_new_for_commandline_arg(input_name);
+ char* uri = g_file_get_uri(file);
+ g_object_unref(file);
+
+ char* inputfname = g_filename_from_uri (uri, NULL, NULL);
+ g_free(uri);
+
+ pixbuf = or_gdkpixbuf_extract_rotated_thumbnail(inputfname, output_size);
+ g_free(inputfname);
+
+ save_pixbuf(pixbuf, output_name, output_size);
+
+ g_object_unref(pixbuf);
+ g_option_context_free(context);
+
+ return 0;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]