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 31c7add5cb754ad8250691d0875d4bd7b2cd6341 (commit) from c104daa309d30c1ffd78acb93d1f451f5224d59e (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/31c7add5cb754ad8250691d0875d4bd7b2cd6...

commit 31c7add5cb754ad8250691d0875d4bd7b2cd6341 Author: Cyril Hrubis metan@ucw.cz Date: Thu Dec 18 17:35:21 2014 +0100

loader: Two fixes.

* When GP_LoadImageEx() was introduced one of the return NULL was changed to return 0 (should have been return 1).

* Do not try file signature based loader if the previous attempt was aborted from callback

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

diff --git a/libs/loaders/GP_Loader.c b/libs/loaders/GP_Loader.c index c7b13e23..8bc9caf1 100644 --- a/libs/loaders/GP_Loader.c +++ b/libs/loaders/GP_Loader.c @@ -379,14 +379,24 @@ int GP_LoadImageEx(const char *src_path, return 0; }

+ /* + * Operation was aborted, just here exit. + */ + if (errno == ECANCELED) + return 1; + sig_load = loader_by_signature(src_path);

/* * Avoid further work if extension matches the signature but image * couldn't be loaded. Probably unimplemented format or damaged file. */ - if (ext_load == sig_load) - return 0; + if (ext_load == sig_load) { + GP_WARN("Signature matches extension but file '%s' " + "can't be loaded. Unsupported/damaged file?", + src_path); + return 1; + }

if (ext_load && sig_load) { GP_WARN("File '%s': Extension says %s but signature %s",

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

Summary of changes: libs/loaders/GP_Loader.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 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.