Commit 2d8476f5 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Fix remaining compiler warnings (I probably won't implement these options anyways)

parent 51802b37

src/feh.h

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ struct hostent *feh_gethostbyname(const char *name); 
void slideshow_save_image(winwidget win);

void feh_edit_inplace_orient(winwidget w, int orientation);

void feh_edit_inplace_lossless_rotate(winwidget w, int orientation);

gib_list *feh_wrap_string(char *text, int wrap_width, int max_height, Imlib_Font fn, gib_style * style);

gib_list *feh_wrap_string(char *text, int wrap_width, Imlib_Font fn, gib_style * style);

char *build_caption_filename(feh_file * file);

gib_list *feh_list_jump(gib_list * root, gib_list * l, int direction, int num);

src/imlib.c

+2 −4
Original line number Diff line number Diff line
@@ -748,7 +748,7 @@ void feh_draw_caption(winwidget w) 
		D_RETURN_(4);

	}



	lines = feh_wrap_string(file->caption, w->w, w->h, fn, NULL);

	lines = feh_wrap_string(file->caption, w->w, fn, NULL);

	if (!lines)

		D_RETURN_(4);
@@ -870,9 +870,7 @@ void feh_edit_inplace_orient(winwidget w, int orientation) 
	D_RETURN_(4);

}



/* TODO max_height is ignored... Could use a function which generates a

 * transparent text overlay image, with wrapping and all. Would be useful */

gib_list *feh_wrap_string(char *text, int wrap_width, int max_height, Imlib_Font fn, gib_style * style)

gib_list *feh_wrap_string(char *text, int wrap_width, Imlib_Font fn, gib_style * style)

{

	gib_list *ll, *lines = NULL, *list = NULL, *words;

	gib_list *l = NULL;

src/thumbnail.c

+2 −2
Original line number Diff line number Diff line
@@ -714,7 +714,7 @@ int feh_thumbnail_get_thumbnail(Imlib_Image * image, feh_file * file) 
	if (td.cache_thumbnails) {

		uri = feh_thumbnail_get_name_uri(file->filename);

		thumb_file = feh_thumbnail_get_name(uri);

		status = feh_thumbnail_get_generated(image, file, thumb_file, uri);

		status = feh_thumbnail_get_generated(image, file, thumb_file);



		if (!status)

			status = feh_thumbnail_generate(image, file, thumb_file, uri);
@@ -832,7 +832,7 @@ int feh_thumbnail_generate(Imlib_Image * image, feh_file * file, 
	return (0);

}



int feh_thumbnail_get_generated(Imlib_Image * image, feh_file * file, char *thumb_file, char *uri)

int feh_thumbnail_get_generated(Imlib_Image * image, feh_file * file, char *thumb_file)

{

	struct stat sb;

	char *c_mtime;

src/thumbnail.h

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ void feh_thumbnail_calculate_geometry(void); 


int feh_thumbnail_get_thumbnail(Imlib_Image * image, feh_file * file);

int feh_thumbnail_generate(Imlib_Image * image, feh_file * file, char *thumb_file, char *uri);

int feh_thumbnail_get_generated(Imlib_Image * image, feh_file * file, char *thumb_file, char *uri);

int feh_thumbnail_get_generated(Imlib_Image * image, feh_file * file, char *thumb_file);

char *feh_thumbnail_get_name(char *uri);

char *feh_thumbnail_get_name_uri(char *name);

char *feh_thumbnail_get_name_md5(char *uri);