vtorri
/
ephoto
forked from enlightenment/ephoto
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ephoto: Ecrustify Formatting

This commit is contained in:
Stephen 'Okra' Houston 2017-08-30 09:01:07 -05:00
parent ab43168f90
commit a705f9a626
20 changed files with 3270 additions and 3180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/bin/ephoto.h
View File

@ -427,7 +427,6 @@ extern int EPHOTO_EVENT_EDITOR_APPLY;
extern int EPHOTO_EVENT_EDITOR_CANCEL;
extern int EPHOTO_EVENT_EDITOR_BACK;
#define CRIT(...) EINA_LOG_CRIT(__VA_ARGS__)
#define ERR(...) EINA_LOG_ERR(__VA_ARGS__)
#define WRN(...) EINA_LOG_WARN(__VA_ARGS__)

1
src/bin/ephoto_bcg.c
View File

@ -390,3 +390,4 @@ ephoto_bcg_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent, Evas_Obje
error:
return;
}

4
src/bin/ephoto_color.c
View File

@ -62,16 +62,19 @@ _ephoto_apply_color_adjustment(Ephoto_Color *eco, unsigned int *image_data, int
cc = (int)r + eco->red;
r = cc;
break;
case EPHOTO_COLOR_ADJUST_BLUE:
eco->blue = adjust;
cc = (int)b + eco->blue;
b = cc;
break;
case EPHOTO_COLOR_ADJUST_GREEN:
eco->green = adjust;
cc = (int)g + eco->green;
g = cc;
break;
default:
break;
}
@ -303,3 +306,4 @@ ephoto_color_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent, Evas_Ob
error:
return;
}

5
src/bin/ephoto_config.c
View File

@ -286,7 +286,8 @@ _config_slideshow(Ephoto *ephoto, Evas_Object *parent)
hoversel = elm_hoversel_add(table);
elm_hoversel_hover_parent_set(hoversel, ephoto->win);
EINA_LIST_FOREACH(transitions, l,
transition) elm_hoversel_item_add(hoversel, transition, NULL, 0,
transition)
elm_hoversel_item_add(hoversel, transition, NULL, 0,
_hv_select, transition);
elm_hoversel_item_add(hoversel, "none", NULL, 0, _hv_select, NULL);
elm_object_text_set(hoversel, ephoto->config->slideshow_transition);
@ -297,8 +298,6 @@ _config_slideshow(Ephoto *ephoto, Evas_Object *parent)
ephoto->config->slide_trans = hoversel;
}
static Evas_Object *
_config_settings(Ephoto *ephoto, Evas_Object *parent, Eina_Bool slideshow)
{

1
src/bin/ephoto_cropper.c
View File

@ -746,3 +746,4 @@ ephoto_cropper_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent,
error:
return;
}

5
src/bin/ephoto_directory_browser.c
View File

@ -652,7 +652,6 @@ _fsel_mouse_up_cb(void *data, Evas *e EINA_UNUSED,
if (info->button != 3)
return;
if (item)
elm_genlist_item_selected_set(item, EINA_TRUE);
@ -1145,7 +1144,8 @@ _ephoto_main_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
_todo_items_free(db);
elm_drop_item_container_del(db->fsel);
EINA_LIST_FREE(db->handlers, handler) ecore_event_handler_del(handler);
EINA_LIST_FREE(db->handlers, handler)
ecore_event_handler_del(handler);
if (db->animator.todo_items)
{
ecore_animator_del(db->animator.todo_items);
@ -1403,3 +1403,4 @@ ephoto_directory_browser_add(Ephoto *ephoto, Evas_Object *parent)
evas_object_del(db->main);
return NULL;
}

6
src/bin/ephoto_file.c
View File

@ -16,7 +16,6 @@ _complete(Ephoto *ephoto, const char *title, const char *text)
{
Evas_Object *popup, *box, *label, *ic, *button;
popup = elm_popup_add(ephoto->win);
elm_object_part_text_set(popup, "title,text", title);
elm_popup_orient_set(popup, ELM_POPUP_ORIENT_CENTER);
@ -254,7 +253,8 @@ _upload_image_complete_cb(void *data, int ev_type EINA_UNUSED, void *event)
evas_object_show(popup);
EINA_LIST_FREE(ephoto->upload_handlers,
handler) ecore_event_handler_del(handler);
handler)
ecore_event_handler_del(handler);
if (!ephoto->url_ret || ev->status != 200)
{
@ -481,7 +481,6 @@ _rename_file(Ephoto *ephoto, const char *file)
Evas_Object *popup, *box, *entry, *button, *ic;
char buf[PATH_MAX], *bn, *string;
popup = elm_popup_add(ephoto->win);
if (ecore_file_is_dir(file))
elm_object_part_text_set(popup, "title, text", _("Rename Directory"));
@ -1043,7 +1042,6 @@ _prompt_save_image_as_apply(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *popup, *ic, *button;
popup = _prompt(ephoto, _("Overwrite Image"),
_("Are you sure you want to overwrite this image?"));

17
src/bin/ephoto_filters.c
View File

@ -25,7 +25,7 @@ struct _Ephoto_Filter
Ephoto *ephoto;
Evas_Object *image;
Evas_Object *popup;
Ecore_Thread *thread;;
Ecore_Thread *thread;
Eina_List *queue;
Evas_Coord w;
Evas_Coord h;
@ -418,7 +418,7 @@ _blur_horizontal(Ephoto_Filter *ef, double rad)
valb += bs[rr] - bs[l];
valg += gs[rr] - gs[l];
valr += rs[rr] - rs[l];
vala += as[rr] - as[l];;
vala += as[rr] - as[l];
bt = (int)round(valb * iarr);
gt = (int)round(valg * iarr);
@ -1132,7 +1132,8 @@ ephoto_filter_painting(Ephoto *ephoto, Evas_Object *image)
NULL, ef);
}
void ephoto_filter_invert(Ephoto *ephoto, Evas_Object *image)
void
ephoto_filter_invert(Ephoto *ephoto, Evas_Object *image)
{
Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_INVERT,
ephoto, image);
@ -1142,7 +1143,8 @@ void ephoto_filter_invert(Ephoto *ephoto, Evas_Object *image)
NULL, ef);
}
void ephoto_filter_sketch(Ephoto *ephoto, Evas_Object *image)
void
ephoto_filter_sketch(Ephoto *ephoto, Evas_Object *image)
{
Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_SKETCH,
ephoto, image);
@ -1158,7 +1160,8 @@ void ephoto_filter_sketch(Ephoto *ephoto, Evas_Object *image)
NULL, ef);
}
void ephoto_filter_edge(Ephoto *ephoto, Evas_Object *image)
void
ephoto_filter_edge(Ephoto *ephoto, Evas_Object *image)
{
Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_SOBEL,
ephoto, image);
@ -1173,7 +1176,8 @@ void ephoto_filter_edge(Ephoto *ephoto, Evas_Object *image)
NULL, ef);
}
void ephoto_filter_emboss(Ephoto *ephoto, Evas_Object *image)
void
ephoto_filter_emboss(Ephoto *ephoto, Evas_Object *image)
{
Ephoto_Filter *ef = _initialize_filter(EPHOTO_IMAGE_FILTER_EMBOSS,
ephoto, image);
@ -1196,3 +1200,4 @@ ephoto_filter_histogram_eq(Ephoto *ephoto, Evas_Object *image)
ef->thread = ecore_thread_run(_histogram_eq, _thread_finished_cb,
NULL, ef);
}

1
src/bin/ephoto_hsv.c
View File

@ -396,3 +396,4 @@ ephoto_hsv_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent, Evas_Obje
error:
return;
}

7
src/bin/ephoto_main.c
View File

@ -302,7 +302,6 @@ _slideshow_icon_clicked(void *data, Evas_Object *obj EINA_UNUSED,
ephoto_single_browser_slideshow(ephoto->single_browser);
}
static void
_settings_icon_clicked(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
@ -669,8 +668,10 @@ ephoto_entries_cmp(const void *pa, const void *pb)
{
case EPHOTO_SORT_ALPHABETICAL_ASCENDING:
return i;
case EPHOTO_SORT_ALPHABETICAL_DESCENDING:
return i * -1;
case EPHOTO_SORT_MODTIME_ASCENDING:
if (moda < modb)
return -1;
@ -678,6 +679,7 @@ ephoto_entries_cmp(const void *pa, const void *pb)
return 1;
else
return i;
case EPHOTO_SORT_MODTIME_DESCENDING:
if (moda < modb)
return 1;
@ -685,11 +687,13 @@ ephoto_entries_cmp(const void *pa, const void *pb)
return -1;
else
return i * -1;
case EPHOTO_SORT_SIMILARITY:
if (!a->sort_id || !b->sort_id)
return 0;
else
return strcmp(a->sort_id, b->sort_id);
default:
return i;
}
@ -1248,3 +1252,4 @@ ephoto_entries_free(Ephoto *ephoto)
ephoto_entry_free(ephoto, entry);
ephoto->entries = NULL;
}

1
src/bin/ephoto_red_eye.c
View File

@ -244,3 +244,4 @@ ephoto_red_eye_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent, Evas_
error:
return;
}

73
src/bin/ephoto_slideshow.c
View File

@ -79,52 +79,76 @@ _slideshow_move_end_get(Ephoto_Slideshow *ss)
{
case EPHOTO_SLIDESHOW_MOVE_LEFT_TO_RIGHT:
return "ephoto,slideshow,move,left,to,right";
case EPHOTO_SLIDESHOW_MOVE_RIGHT_TO_LEFT:
return "ephoto,slideshow,move,right,to,left";
case EPHOTO_SLIDESHOW_MOVE_TOP_TO_BOTTOM:
return "ephoto,slideshow,move,top,to,bottom";
case EPHOTO_SLIDESHOW_MOVE_BOTTOM_TO_TOP:
return "ephoto,slideshow,move,bottom,to,top";
case EPHOTO_SLIDESHOW_MOVE_LEFT_IN:
return "ephoto,slideshow,move,left,in";
case EPHOTO_SLIDESHOW_MOVE_RIGHT_IN:
return "ephoto,slideshow,move,right,in";
case EPHOTO_SLIDESHOW_MOVE_TOP_IN:
return "ephoto,slideshow,move,top,in";
case EPHOTO_SLIDESHOW_MOVE_BOTTOM_IN:
return "ephoto,slideshow,move,bottom,in";
case EPHOTO_SLIDESHOW_MOVE_LEFT_OUT:
return "ephoto,slideshow,move,left,out";
case EPHOTO_SLIDESHOW_MOVE_RIGHT_OUT:
return "ephoto,slideshow,move,right,out";
case EPHOTO_SLIDESHOW_MOVE_TOP_OUT:
return "ephoto,slideshow,move,top,out";
case EPHOTO_SLIDESHOW_MOVE_BOTTOM_OUT:
return "ephoto,slideshow,move,bottom,out";
case EPHOTO_SLIDESHOW_MOVE_LEFT_TOP_CORNER:
return "ephoto,slideshow,move,left,top,corner";
case EPHOTO_SLIDESHOW_MOVE_RIGHT_TOP_CORNER:
return "ephoto,slideshow,move,right,top,corner";
case EPHOTO_SLIDESHOW_MOVE_RIGHT_BOTTOM_CORNER:
return "ephoto,slideshow,move,right,bottom,corner";
case EPHOTO_SLIDESHOW_MOVE_LEFT_BOTTOM_CORNER:
return "ephoto,slideshow,move,left,bottom,corner";
case EPHOTO_SLIDESHOW_MOVE_LEFT_TOP_CORNER_IN:
return "ephoto,slideshow,move,left,top,corner,in";
case EPHOTO_SLIDESHOW_MOVE_RIGHT_TOP_CORNER_IN:
return "ephoto,slideshow,move,right,top,corner,in";
case EPHOTO_SLIDESHOW_MOVE_RIGHT_BOTTOM_CORNER_IN:
return "ephoto,slideshow,move,right,bottom,corner,in";
case EPHOTO_SLIDESHOW_MOVE_LEFT_BOTTOM_CORNER_IN:
return "ephoto,slideshow,move,left,bottom,corner,in";
case EPHOTO_SLIDESHOW_MOVE_LEFT_TOP_CORNER_OUT:
return "ephoto,slideshow,move,left,top,corner,out";
case EPHOTO_SLIDESHOW_MOVE_RIGHT_TOP_CORNER_OUT:
return "ephoto,slideshow,move,right,top,corner,out";
case EPHOTO_SLIDESHOW_MOVE_RIGHT_BOTTOM_CORNER_OUT:
return "ephoto,slideshow,move,right,bottom,corner,out";
case EPHOTO_SLIDESHOW_MOVE_LEFT_BOTTOM_CORNER_OUT:
return "ephoto,slideshow,move,left,bottom,corner,out";
default: return "default";
}
}
@ -136,52 +160,76 @@ _slideshow_move_start_get(Ephoto_Slideshow *ss)
{
case EPHOTO_SLIDESHOW_MOVE_LEFT_TO_RIGHT:
return "ephoto,slideshow,default,left,to,right";
case EPHOTO_SLIDESHOW_MOVE_RIGHT_TO_LEFT:
return "ephoto,slideshow,default,right,to,left";
case EPHOTO_SLIDESHOW_MOVE_TOP_TO_BOTTOM:
return "ephoto,slideshow,default,top,to,bottom";
case EPHOTO_SLIDESHOW_MOVE_BOTTOM_TO_TOP:
return "ephoto,slideshow,default,bottom,to,top";
case EPHOTO_SLIDESHOW_MOVE_LEFT_IN:
return "ephoto,slideshow,default,left,in";
case EPHOTO_SLIDESHOW_MOVE_RIGHT_IN:
return "ephoto,slideshow,default,right,in";
case EPHOTO_SLIDESHOW_MOVE_TOP_IN:
return "ephoto,slideshow,default,top,in";
case EPHOTO_SLIDESHOW_MOVE_BOTTOM_IN:
return "ephoto,slideshow,default,bottom,in";
case EPHOTO_SLIDESHOW_MOVE_LEFT_OUT:
return "ephoto,slideshow,default,left,out";
case EPHOTO_SLIDESHOW_MOVE_RIGHT_OUT:
return "ephoto,slideshow,default,right,out";
case EPHOTO_SLIDESHOW_MOVE_TOP_OUT:
return "ephoto,slideshow,default,top,out";
case EPHOTO_SLIDESHOW_MOVE_BOTTOM_OUT:
return "ephoto,slideshow,default,bottom,out";
case EPHOTO_SLIDESHOW_MOVE_LEFT_TOP_CORNER:
return "ephoto,slideshow,default,left,top,corner";
case EPHOTO_SLIDESHOW_MOVE_RIGHT_TOP_CORNER:
return "ephoto,slideshow,default,right,top,corner";
case EPHOTO_SLIDESHOW_MOVE_RIGHT_BOTTOM_CORNER:
return "ephoto,slideshow,default,right,bottom,corner";
case EPHOTO_SLIDESHOW_MOVE_LEFT_BOTTOM_CORNER:
return "ephoto,slideshow,default,left,bottom,corner";
case EPHOTO_SLIDESHOW_MOVE_LEFT_TOP_CORNER_IN:
return "ephoto,slideshow,default,left,top,corner,in";
case EPHOTO_SLIDESHOW_MOVE_RIGHT_TOP_CORNER_IN:
return "ephoto,slideshow,default,right,top,corner,in";
case EPHOTO_SLIDESHOW_MOVE_RIGHT_BOTTOM_CORNER_IN:
return "ephoto,slideshow,default,right,bottom,corner,in";
case EPHOTO_SLIDESHOW_MOVE_LEFT_BOTTOM_CORNER_IN:
return "ephoto,slideshow,default,left,bottom,corner,in";
case EPHOTO_SLIDESHOW_MOVE_LEFT_TOP_CORNER_OUT:
return "ephoto,slideshow,default,left,top,corner,out";
case EPHOTO_SLIDESHOW_MOVE_RIGHT_TOP_CORNER_OUT:
return "ephoto,slideshow,default,right,top,corner,out";
case EPHOTO_SLIDESHOW_MOVE_RIGHT_BOTTOM_CORNER_OUT:
return "ephoto,slideshow,default,right,bottom,corner,out";
case EPHOTO_SLIDESHOW_MOVE_LEFT_BOTTOM_CORNER_OUT:
return "ephoto,slideshow,default,left,bottom,corner,out";
default: return "default";
}
}
@ -206,75 +254,99 @@ _slideshow_move_randomize(Ephoto_Slideshow *ss)
case 0:
ss->move = EPHOTO_SLIDESHOW_MOVE_LEFT_TO_RIGHT;
break;
case 1:
ss->move = EPHOTO_SLIDESHOW_MOVE_RIGHT_TO_LEFT;
break;
case 2:
ss->move = EPHOTO_SLIDESHOW_MOVE_TOP_TO_BOTTOM;
break;
case 3:
ss->move = EPHOTO_SLIDESHOW_MOVE_BOTTOM_TO_TOP;
break;
case 4:
ss->move = EPHOTO_SLIDESHOW_MOVE_LEFT_IN;
break;
case 5:
ss->move = EPHOTO_SLIDESHOW_MOVE_RIGHT_IN;
break;
case 6:
ss->move = EPHOTO_SLIDESHOW_MOVE_TOP_IN;
break;
case 7:
ss->move = EPHOTO_SLIDESHOW_MOVE_BOTTOM_IN;
break;
case 8:
ss->move = EPHOTO_SLIDESHOW_MOVE_LEFT_OUT;
break;
case 9:
ss->move = EPHOTO_SLIDESHOW_MOVE_RIGHT_OUT;
break;
case 10:
ss->move = EPHOTO_SLIDESHOW_MOVE_TOP_OUT;
break;
case 11:
ss->move = EPHOTO_SLIDESHOW_MOVE_BOTTOM_OUT;
break;
case 12:
ss->move = EPHOTO_SLIDESHOW_MOVE_LEFT_TOP_CORNER;
break;
case 13:
ss->move = EPHOTO_SLIDESHOW_MOVE_RIGHT_TOP_CORNER;
break;
case 14:
ss->move = EPHOTO_SLIDESHOW_MOVE_RIGHT_BOTTOM_CORNER;
break;
case 15:
ss->move = EPHOTO_SLIDESHOW_MOVE_LEFT_BOTTOM_CORNER;
break;
case 16:
ss->move = EPHOTO_SLIDESHOW_MOVE_LEFT_TOP_CORNER_IN;
break;
case 17:
ss->move = EPHOTO_SLIDESHOW_MOVE_RIGHT_TOP_CORNER_IN;
break;
case 18:
ss->move = EPHOTO_SLIDESHOW_MOVE_RIGHT_BOTTOM_CORNER_IN;
break;
case 19:
ss->move = EPHOTO_SLIDESHOW_MOVE_LEFT_BOTTOM_CORNER_IN;
break;
case 20:
ss->move = EPHOTO_SLIDESHOW_MOVE_LEFT_TOP_CORNER_OUT;
break;
case 21:
ss->move = EPHOTO_SLIDESHOW_MOVE_RIGHT_TOP_CORNER_OUT;
break;
case 22:
ss->move = EPHOTO_SLIDESHOW_MOVE_RIGHT_BOTTOM_CORNER_OUT;
break;
case 23:
ss->move = EPHOTO_SLIDESHOW_MOVE_LEFT_BOTTOM_CORNER_OUT;
break;
default: ss->move = EPHOTO_SLIDESHOW_MOVE_LEFT_TO_RIGHT;
}
}
@ -985,3 +1057,4 @@ ephoto_slideshow_entry_set(Evas_Object *obj, Ephoto_Entry *entry)
evas_object_raise(ss->event);
elm_object_focus_set(ss->event, EINA_TRUE);
}

1
src/bin/ephoto_thumb.c
View File

@ -439,3 +439,4 @@ _e_thumb_cb_exe_event_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *ev
}
return ECORE_CALLBACK_PASS_ON;
}

6
src/bin/ephoto_thumb_browser.c
View File

@ -1000,6 +1000,7 @@ _grid_mouse_up_cb(void *data, Evas *e EINA_UNUSED,
tb);
evas_object_show(menu);
}
static void
_grid_mouse_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info)
@ -1488,7 +1489,6 @@ _todo_items_process(void *data)
if (entry->item)
{
elm_object_item_data_set(entry->item, entry);
}
else if (tb->sort != EPHOTO_SORT_SIMILARITY)
{
@ -1858,7 +1858,8 @@ _ephoto_main_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
_todo_items_free(tb);
elm_drop_item_container_del(tb->grid);
elm_drag_item_container_del(tb->grid);
EINA_LIST_FREE(tb->handlers, handler) ecore_event_handler_del(handler);
EINA_LIST_FREE(tb->handlers, handler)
ecore_event_handler_del(handler);
if (tb->animator.todo_items)
{
ecore_animator_del(tb->animator.todo_items);
@ -1883,7 +1884,6 @@ _ephoto_main_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
free(tb);
}
/*Ephoto Thumb Browser Public Functions*/
void
ephoto_thumb_browser_dirs_only_set(Ephoto *ephoto, Eina_Bool dirs_only)

5
src/bin/ephoto_thumbnailer.c
View File

@ -577,7 +577,8 @@ end:
/* will free all */
if (edje) evas_object_del(edje);
if (ee_im) ecore_evas_free(ee_im);
else if (im) evas_object_del(im);
else if (im)
evas_object_del(im);
if (im2) evas_object_del(im2);
if (bg) evas_object_del(bg);
ecore_evas_free(ee);
@ -621,7 +622,7 @@ e_sha1_sum(unsigned char *data, int size, unsigned char *dst)
buf[63] = (size) & 0xff;
}
buf[idx] = *d;
idx++;;
idx++;
if ((idx == 64) || (left == 1))
{
if ((left == 1) && (idx < 64)) buf[idx] = 0x80;