[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r19559 - gnunet/src/fs
From: |
gnunet |
Subject: |
[GNUnet-SVN] r19559 - gnunet/src/fs |
Date: |
Tue, 31 Jan 2012 01:20:17 +0100 |
Author: grothoff
Date: 2012-01-31 01:20:16 +0100 (Tue, 31 Jan 2012)
New Revision: 19559
Removed:
gnunet/src/fs/test_fs_file_information_meta_data_image.jpg
Modified:
gnunet/src/fs/Makefile.am
gnunet/src/fs/test_fs_file_information.c
Log:
-fix
Modified: gnunet/src/fs/Makefile.am
===================================================================
--- gnunet/src/fs/Makefile.am 2012-01-30 23:55:22 UTC (rev 19558)
+++ gnunet/src/fs/Makefile.am 2012-01-31 00:20:16 UTC (rev 19559)
@@ -442,7 +442,6 @@
test_fs_data.conf \
test_fs_download_data.conf \
test_fs_file_information_data.conf \
- test_fs_file_information_meta_data_image.jpg \
fs_test_lib_data.conf \
test_fs_list_indexed_data.conf \
test_fs_namespace_data.conf \
Modified: gnunet/src/fs/test_fs_file_information.c
===================================================================
--- gnunet/src/fs/test_fs_file_information.c 2012-01-30 23:55:22 UTC (rev
19558)
+++ gnunet/src/fs/test_fs_file_information.c 2012-01-31 00:20:16 UTC (rev
19559)
@@ -137,67 +137,9 @@
}
-static int
-testThumbnail ()
-{
- struct GNUNET_CONTAINER_MetaData *m;
- struct GNUNET_CONTAINER_MetaData *d;
- struct EXTRACTOR_PluginList *ex;
- unsigned char *thumb;
- size_t size;
- char *date;
- ex = EXTRACTOR_plugin_add_config (NULL, "thumbnailgtk",
- EXTRACTOR_OPTION_DEFAULT_POLICY);
- if (ex == NULL)
- {
- FPRINTF (stderr,
- "%s",
- "Test incomplete, have no GTK thumbnail extractor available.\n");
- return 0; /* can not test, no thumbnailer */
- }
- ex = EXTRACTOR_plugin_add_config (ex, "mime",
- EXTRACTOR_OPTION_DEFAULT_POLICY);
- m = GNUNET_CONTAINER_meta_data_create ();
- if (3 !=
- GNUNET_FS_meta_data_extract_from_file (m,
-
"test_fs_file_information_meta_data_image.jpg",
- ex))
- {
- GNUNET_break (0);
- EXTRACTOR_plugin_remove_all (ex);
- GNUNET_CONTAINER_meta_data_destroy (m);
- return 1;
- }
- EXTRACTOR_plugin_remove_all (ex);
- d = GNUNET_CONTAINER_meta_data_duplicate (m);
- GNUNET_CONTAINER_meta_data_destroy (m);
- thumb = NULL;
- size = GNUNET_CONTAINER_meta_data_get_thumbnail (d, &thumb);
- if (size == 0)
- {
- GNUNET_break (0);
- GNUNET_CONTAINER_meta_data_destroy (d);
- return 1;
- }
- GNUNET_free (thumb);
- GNUNET_CONTAINER_meta_data_add_publication_date (d);
- date =
- GNUNET_CONTAINER_meta_data_get_by_type (d,
-
EXTRACTOR_METATYPE_PUBLICATION_DATE);
- if (date == NULL)
- {
- GNUNET_break (0);
- GNUNET_CONTAINER_meta_data_destroy (d);
- return 1;
- }
- GNUNET_free (date);
- GNUNET_CONTAINER_meta_data_destroy (d);
- return 0;
-}
-
int
main (int argc, char *argv[])
{
@@ -221,8 +163,6 @@
"WARNING",
#endif
NULL);
- if (0 != testThumbnail ())
- return 1;
GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, argvx,
"test-fs-file_information", "nohelp", options, &run,
NULL);
Deleted: gnunet/src/fs/test_fs_file_information_meta_data_image.jpg
===================================================================
(Binary files differ)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r19559 - gnunet/src/fs,
gnunet <=