Author: post
Date: 2010-04-03 01:08:50 +0200 (Sat, 03 Apr 2010)
New Revision: 3321
Modified:
trunk/librawstudio/rs-filetypes.c
trunk/src/rs-photo.c
Log:
Do more checks on returned data from loaders.
Modified: trunk/librawstudio/rs-filetypes.c
===================================================================
--- trunk/librawstudio/rs-filetypes.c 2010-04-02 21:17:20 UTC (rev 3320)
+++ trunk/librawstudio/rs-filetypes.c 2010-04-02 23:08:50 UTC (rev 3321)
@@ -218,10 +218,15 @@
g_assert(rs_filetype_is_initialized);
g_assert(filename != NULL);
- while((loader = filetype_search(loaders, filename, &priority,
RS_LOADER_FLAGS_ALL)) && !image)
+ while((loader = filetype_search(loaders, filename, &priority,
RS_LOADER_FLAGS_ALL)))
+ {
image = loader(filename);
+ if (RS_IS_FILTER_RESPONSE(image))
+ if (rs_filter_response_has_image(image))
+ return image;
+ }
- return image;
+ return NULL;
}
/**
Modified: trunk/src/rs-photo.c
===================================================================
--- trunk/src/rs-photo.c 2010-04-02 21:17:20 UTC (rev 3320)
+++ trunk/src/rs-photo.c 2010-04-02 23:08:50 UTC (rev 3321)
@@ -596,7 +596,8 @@
gint i;
response = rs_filetype_load(filename);
- if (rs_filter_response_has_image(response))
+
+ if (response && RS_IS_FILTER_RESPONSE(response) &&
rs_filter_response_has_image(response))
{
photo = rs_photo_new();
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
