summaryrefslogtreecommitdiff
path: root/src/imlib.c
AgeCommit message (Collapse)AuthorLines
2012-08-12Add %o, %r and %z format specifiers (see #95)Daniel Friesel-1/+1
2012-04-04Lots of EXIF mode fixes and improvements by Dennis Real (closes #87)Daniel Friesel-5/+5
Squashed commit of the following: commit 58dd2e303c5ee380527d92a3fa3d6baeeacb50a1 Merge: cf6f032 82a976e Author: Dennis Real <github@tildepipe.org> Date: Sat Mar 31 18:43:47 2012 +0200 Merge branch 'master' of git://github.com/derf/feh commit cf6f0320c15abd753951990a963d5c94b180bbde Merge: 10b7b1e 877e634 Author: Dennis Real <github@tildepipe.org> Date: Sun Mar 25 19:07:30 2012 +0200 Merge branch 'master' of git://github.com/derf/feh commit 10b7b1e3e10ba650b240a742947cb6850bbadd23 Author: Dennis Real <github@tildepipe.org> Date: Sat Mar 24 14:41:15 2012 +0100 Support for Canon Exif makernote tags commit 3c284dc81dcb26249114b7ecf32ed0000f492b8b Author: Dennis Real <github@tildepipe.org> Date: Thu Mar 22 19:44:32 2012 +0100 Support for Active D-Lightning commit ad5aea8cb853cc9d1b322c69f4812ad0bcb08ef3 Merge: cc6de20 9c43b64 Author: Dennis Real <github@tildepipe.org> Date: Thu Mar 22 19:01:38 2012 +0100 Merge remote branch 'upstream/master' commit cc6de20061eaa7172aa0184e03df947da14d713e Author: Dennis Real <github@tildepipe.org> Date: Thu Mar 22 19:00:30 2012 +0100 Nikon makernote parts changed commit e401bd9c78a82b8290ec524e56b7c832631725e6 Author: Dennis Real <github@tildepipe.org> Date: Wed Mar 21 19:47:15 2012 +0100 1. Own module for nikon maker notes 2. Support for AFInfo2 commit 39cbd1ed2b6693beea5e974a6ae83207c6e9a826 Merge: 9e1bbf8 a100123 Author: Dennis Real <github@tildepipe.org> Date: Fri Mar 16 22:22:28 2012 +0100 Merge remote branch 'upstream/master' commit 9e1bbf874500e99506baffec3c6b54ed04e60a2f Author: Dennis Real <github@tildepipe.org> Date: Fri Mar 16 22:20:58 2012 +0100 - exif handling changed - gps info added if available commit 8e96382805eb77a82209df9d71dbf9c0dd1c4cdb Merge: 77fa5ac 29cd868 Author: Dennis Real <github@tildepipe.org> Date: Fri Mar 16 19:13:47 2012 +0100 Merge branch 'master' of git://github.com/derf/feh commit 77fa5aca182435f2771511832ea198d027393ceb Merge: 93a90e6 3b2756b Author: Dennis Real <github@tildepipe.org> Date: Wed Mar 7 17:18:07 2012 +0100 Merge branch 'master' of git://github.com/derf/feh commit 93a90e60d0cf093ca71c34f4f5dbfde974f433f0 Merge: a81465d 52d5da9 Author: Dennis Real <github@tildepipe.org> Date: Tue Mar 6 21:42:40 2012 +0100 Merge branch 'master' of git://github.com/derf/feh commit a81465d019593cfd1e506eb66f20f6b5e10488f3 Merge: a19e50d 31afac4 Author: Dennis Real <github@tildepipe.org> Date: Mon Mar 5 17:23:40 2012 +0100 Merge branch 'master' of git://github.com/derf/feh commit a19e50deb749c5188bdbc75a5c1cd6ab1f3f3a3a Merge: 1c89da1 fe9a16b Author: Dennis Real <github@tildepipe.org> Date: Sun Mar 4 15:35:45 2012 +0100 Merge branch 'master' of ssh://github.com/reald/feh commit 1c89da1269089d98529a6635c36d014da1b08eb4 Author: Dennis Real <github@tildepipe.org> Date: Tue Feb 28 22:37:22 2012 +0100 test case adapted to new testfile commit bb3c9d3571e43f913c6f659fefd9cd34971fd004 Author: Dennis Real <github@tildepipe.org> Date: Tue Feb 28 22:34:51 2012 +0100 test file with some exif data added commit fe9a16bce3f06d45acf103fc4439c1af2dc4ac6c Author: Dennis Real <github@tildepipe.org> Date: Tue Feb 28 22:37:22 2012 +0100 test case adapted to new testfile commit e0bedc0438cf4ab4eafe43afca0886ad63591560 Merge: 46801fe 69ecc5c Author: Dennis Real <github@tildepipe.org> Date: Tue Feb 28 22:36:08 2012 +0100 Merge remote branch 'upstream/master' commit 46801fee8de26f4e0af2ed294c3a4f7fc1c45ca3 Author: Dennis Real <github@tildepipe.org> Date: Tue Feb 28 22:34:51 2012 +0100 test file with some exif data added
2012-03-28feh_magick_load_image: Fix memory leak when encountering unloadable fileDaniel Friesel-0/+1
2012-03-15feh_magick_load_image: close stdin as wellDaniel Friesel-2/+2
2012-03-14Terminate convert when receiving SIG{INT,TERM,QUIT}Daniel Friesel-1/+2
2012-03-14imlib.c: "Fix" Zombie issueDaniel Friesel-0/+11
Still to do: signal handler for sigint/quit/term
2012-03-13Experimental code to limit imagemagick convert runtime (see #82)Daniel Friesel-6/+24
Problems so far: * leaks zombie processes * does not work when terminating feh with a signal (since the convert process is no longer in feh's process group)
2012-03-07Fix memory leak in feh_edit_inplace_losslessDaniel Friesel-1/+3
2012-03-03magick: use correct filenameDaniel Friesel-2/+2
2012-03-03use convert (imagemagick) for unsupported file typesDaniel Friesel-24/+92
2012-02-06EXIF fixes by reald (closes #80)Daniel Friesel-0/+2
commit 9c8226a1a54d1246e086923bb1b36e3827b25767 Merge: e4483e5 132ecc0 Author: Dennis Real <github@tildepipe.org> Date: Sun Feb 5 17:24:17 2012 +0100 Merge branch 'master' of ssh://github.com/reald/feh commit e4483e5e25a1471728a31a18d22ba86def489509 Author: Dennis Real <github@tildepipe.org> Date: Sun Feb 5 16:56:29 2012 +0100 - improved handling of images which have exif tags but not ours - fixed uninitialized pointer in thumbnail mode - added nikon lens info if available commit 132ecc0f9f0a2243c4f6745d0af36be810bf9eba Author: Dennis Real <github@tildepipe.org> Date: Sun Feb 5 16:56:29 2012 +0100 - improved handling of images which have exif tags but not ours - fixed uninitialzed pointer in thumbnail mode - added nikon lens info if available
2012-01-27optional exif support (build with exif=1), initial patch importDaniel Friesel-0/+115
2012-01-25imlib.c: Set CURLOPT_VERBOSE when built with DEBUGDaniel Friesel-0/+3
2012-01-02imlib.c: Follow HTTP redirects (Debian #653689)Daniel Friesel-0/+1
2011-10-24imlib.c: Fix too long mkstemp argument (debian #646421)Daniel Friesel-0/+4
2011-10-10filelist.c, imlib.c: Simplify opt.quiet handlingDaniel Friesel-46/+33
2011-10-03feh_display_info: Allow state to be reset for successive callsDaniel Friesel-0/+7
Required e.g. for feh --preload --thumbnails
2011-09-28feh_draw_info: Do not fail if the info_cmd did not output anythingDaniel Friesel-0/+3
2011-09-12feh_load_image: Do not add file to rm filelist unless it is cachedDaniel Friesel-2/+3
This fixes a "memory leak" (though strictly speaking it is none) when using feh --reload on http URLs.
2011-09-02imlib.c: fill_text_bg: Simplify background initialization (patch by penma)Daniel Friesel-5/+3
fixes valgrind warning about use of uninitialized values
2011-09-02imlib.c: Remove font loading code duplication (thx penma)Daniel Friesel-75/+27
2011-09-01Revert "feh_reload_image: Always die if reload failed"Daniel Friesel-2/+2
This reverts commit 8b79bc33f37db12cbb672bdb47dcfeb0f2030bce.
2011-08-31feh_reload_image: Always die if reload failedDaniel Friesel-2/+2
This fixes a segfault in --reload when the image becomes unloadable while feh is running. Note that this does not affect --reload with more than one file: If the current image is removed, feh will simply jump to the next image. feh will only quit if the file still exists, but can no longer be loaded.
2011-08-23imlib.c: feh_draw_info: Fix overlay image dimensions (for --draw-tinted)Daniel Friesel-24/+37
feh_draw_info used to iterate line-wise over the info output, but now we need to cache it somewhere to get the length of the longest line.
2011-08-23imlib.c: feh_draw_info: Fix info box offsetsDaniel Friesel-2/+2
The info text used to be located 2px away from the bottom / left edges. Now that --draw-tinted has been implemented, that leaves us with an ugly edge, so move it directly to the edge.
2011-08-23Add --draw-tinted option to draw overlay text on a semi-transparent ↵Daniel Friesel-37/+23
background (closes #60, #61) By default, feh draws white text with a black drop-shadow, which is well readable in most, but not all cases. The --draw-tinted option draws a semi-transparent black box around all texts. This improves readability, but does not look as nice, so it won't become default behaviour. It was suggested to use #7f7f7f7f for the background, but I decided that for small images surrounded by a black border.
2011-08-18imlib.c: feh_draw_info: Only kill a line's last character if it's a newlineDaniel Friesel-1/+3
feh_draw_info used to unconditionally swallow the last character of a line, assuming that it must be a newline. However, the very last line of a program's output may not end in a newline, in which case its last output character was omitted.
2011-08-09Merge patch by livibetter: Add flip and mirror in-place edit actions (closes ↵Daniel Friesel-14/+31
#53)
2011-08-09Add flip/mirror in-placec edit actions (derf/#9)Yu-Jie Lin-14/+31
2011-05-31Fix --draw-filename "x of y" being cut off by short filenames (closes #45)Daniel Friesel-12/+20
2011-05-12imlib.c: Do not include curl.h unless we use libcurlDaniel Friesel-0/+3
2011-04-30Replace some printf calls by fputs/putcDaniel Friesel-5/+5
2011-04-30Convert some more weprintf statements to im_weprintfDaniel Friesel-3/+3
2011-04-30Initial support for in-image warning display (closes #43)Daniel Friesel-9/+75
2011-04-27feh_edit_inplace_lossless_rotate: Fix rotate arg in error messageDaniel Friesel-1/+1
2011-04-27Merge branch 'libcurl' of git://github.com/talisein/fehDaniel Friesel-1/+1
2011-04-26Only create caption directory when writing out a caption (closes #42)Daniel Friesel-4/+9
2011-04-22Remove unused feh_strip_hostname functionDaniel Friesel-25/+0
2011-02-16Fix use after free()Andrew Potter-1/+1
2011-02-16Remove builtin HTTP clientDaniel Friesel-242/+55
2011-02-16Make -lcurl optional (enabled by default), rework feature en-/disablingDaniel Friesel-0/+7
2011-02-16Remove wget support, use libcurl by defaultDaniel Friesel-29/+0
2011-02-16imlib.c indentation fixesDaniel Friesel-35/+35
2011-02-16imlib.c: Fix segfault introdused by talisein's patch.Daniel Friesel-1/+1
2011-02-15Fix errant whitespace screwupAndrew Potter-1/+1
2011-02-15Initial libcurl supportAndrew Potter-2/+53
2011-02-15Add libcurl option -{Andrew Potter-0/+3
2011-02-09imlib.c: Use wget --no-clobberDaniel Friesel-1/+2
This prevents a (highly unlikely) case of an attacker knowing feh's PID and the user's URL rewriting user files by means of a TOCTTOU attack. It is still possible to _create_ arbitrary files via dangling symlinks. That will be fixed once I switch from wget to libcurl.
2011-01-17Copyright FooDaniel Friesel-0/+1
2010-12-04imlib.c: Use getaddrinfo in builtin http client, enables IPv6 supportPascal Bleser-32/+20
Signed-off-by: Daniel Friesel <derf@finalrewind.org>