This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git.

The branch, master has been updated via 065f3db1028b2a0fecbfba71927b30198b332472 (commit) from a9676bd9397ba4a939a11341c66f7fba6a8293a5 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/065f3db1028b2a0fecbfba71927b30198b332...

commit 065f3db1028b2a0fecbfba71927b30198b332472 Author: Cyril Hrubis metan@ucw.cz Date: Tue May 21 23:48:54 2013 +0200

spiv: Cleanup and update help.

Signed-off-by: Cyril Hrubis metan@ucw.cz

diff --git a/demos/spiv/spiv.c b/demos/spiv/spiv.c index 5e0352e..8c77fff 100644 --- a/demos/spiv/spiv.c +++ b/demos/spiv/spiv.c @@ -717,8 +717,8 @@ static const char *keys_help[] = { "", "Esc, Enter, Q - quit spiv", "", - "< KP Minus - zoom out by 1.5", - ">, KP Plus - zoom in by 1.5", + "< or KP Minus - zoom out by 1.5", + "> or KP Plus - zoom in by 1.5", "R - rotate by 90 degrees clockwise", "Up, Down, Left, Right - move image by 1px", " (by 10 with Shift)", @@ -760,26 +760,26 @@ static void print_help(void) { int i;

- printf("Usage: spiv [opts] imagesnn"); - printf("-Intshow image info (filename and size)nn"); - printf("-Pntshow loading progressnn"); - printf("-fntuse floyd-steinberg ditheringnn"); - printf("-s secntsleep interval in secondsnn"); - printf("-cntturns on bicubic resampling (experimental)nn"); - printf("-d levelntsets GFXprim debug levelnn"); - printf("-e pixel_typentturns on backend type emulationn"); - printf("tfor example -e G1 sets 1-bit grayscalenn"); - printf("-r anglentrotate display 90,180 or 270 degreesnn"); - printf("-z sets zoom modent-zf zoom is set and modified by usern"); - printf("t-zw zoom is fixed to window size (currently default)nn"); - printf("-bntpass backend init string to backend initn"); - printf("tpass -b help for more infonn"); - puts(""); - printf("Actionsn"); - printf("-0 'cmd' sets first actionn"); - printf("-1 'cmd' sets second actionn"); - printf("...n"); - printf("-9 'cmd' sets tenth actionn"); + printf("Usage: spiv [opts] images or dirs with imagesnn"); + printf(" -I show image info boxn"); + printf(" -P show loading progressn"); + printf(" -f use floyd-steinberg ditheringn"); + printf(" -s sec sleep interval in secondsn"); + printf(" -c turns on bicubic resampling (experimental)n"); + printf(" -e pixel_type turns on backend type emulationn"); + printf(" for example -e G1 sets 1-bit grayscalen"); + printf(" -r angle rotate display 90,180 or 270 degreesn"); + printf(" -z moden"); + printf(" -zf zoom is set and modified by usern"); + printf(" -zw zoom is fixed to window size (currently default)n"); + printf(" -b pass backend init string to backend initn"); + printf(" pass -b help for more infon"); + puts("n"); + printf("Actions:nn"); + printf(" -0 'cmd' sets first actionn"); + printf(" -1 'cmd' sets second actionn"); + printf(" ...n"); + printf(" -9 'cmd' sets tenth actionn"); puts(""); printf(" actions are shell commands with following modifiers:n"); printf(" %%f path to current imagen"); @@ -787,7 +787,7 @@ static void print_help(void) printf(" %%n current image filename without extensionn"); printf(" %%N shell escaped image filename without extensionn"); printf(" %%e current image file extensionn"); - puts(""); + puts("n"); for (i = 0; i < keys_help_len; i++) puts(keys_help[i]); @@ -795,13 +795,13 @@ static void print_help(void) puts("");

printf("Some cool options to try:nn"); - printf("spiv -0 'cp %%F sorted/"); + printf("spiv -0 'cp %%F sorted' [images]n"); printf("tcopies current image into directory 'sorted/' on F1n"); - printf("spiv -e G1 -f imagesn"); + printf("spiv -e G1 -f [images]n"); printf("truns spiv in 1-bit bitmap mode and turns on ditheringnn"); - printf("spiv -b 'X11:ROOT_WIN' imagesn"); + printf("spiv -b 'X11:ROOT_WIN' [images]n"); printf("truns spiv using X root window as backend windownn"); - printf("spiv -b 'X11:CREATE_ROOT' imagesn"); + printf("spiv -b 'X11:CREATE_ROOT' [images]n"); printf("tSame as abowe but works in KDEn"); }

@@ -825,7 +825,7 @@ int main(int argc, char *argv[]) GP_Context *context = NULL; const char *backend_opts = "X11"; int sleep_sec = -1; - int opt, debug_level = 0; + int opt; int shift_flag, help_flag = 0; GP_PixelType emul_type = GP_PIXEL_UNKNOWN;

@@ -847,7 +847,7 @@ int main(int argc, char *argv[]) .img_orig_cache = NULL, };

- while ((opt = getopt(argc, argv, "b:cd:e:fhIPs:r:z:0:1:2:3:4:5:6:7:8:9:")) != -1) { + while ((opt = getopt(argc, argv, "b:ce:fhIPs:r:z:0:1:2:3:4:5:6:7:8:9:")) != -1) { switch (opt) { case 'I': params.show_info = 1; @@ -868,9 +868,6 @@ int main(int argc, char *argv[]) /* Cubic resampling is slow, show nn first */ params.show_nn_first = 1; break; - case 'd': - debug_level = atoi(optarg); - break; case 'e': emul_type = GP_PixelTypeByName(optarg);

@@ -919,8 +916,6 @@ int main(int argc, char *argv[]) return 1; }

- GP_SetDebugLevel(debug_level); - signal(SIGINT, sighandler); signal(SIGSEGV, sighandler); signal(SIGBUS, sighandler);

-----------------------------------------------------------------------

Summary of changes: demos/spiv/spiv.c | 63 ++++++++++++++++++++++++---------------------------- 1 files changed, 29 insertions(+), 34 deletions(-)

repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos@gmail.com if you want to unsubscribe, or site admin admin@repo.or.cz if you receive no reply.