tracker r2180 - in branches/indexer-split: . src/tracker-thumbnailer

[carlosg svn gnome org]

Author: carlosg
Date: Thu Aug 28 10:58:43 2008
New Revision: 2180
URL: http://svn.gnome.org/viewvc/tracker?rev=2180&view=rev

Log:
2008-08-28  Carlos Garnacho  <carlos imendio com>

        * src/tracker-thumbnailer/tracker-thumbnailer.c: Use GChecksum instead
        of shipped MD5 implementation.
        * src/tracker-thumbnailer/Makefile.am:
        * src/tracker-thumbnailer/md5.[ch]: Removed MD5 implementation, no
        longer necessary.


Removed:
   branches/indexer-split/src/tracker-thumbnailer/md5.c
   branches/indexer-split/src/tracker-thumbnailer/md5.h
Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/tracker-thumbnailer/Makefile.am
   branches/indexer-split/src/tracker-thumbnailer/tracker-thumbnailer.c

Modified: branches/indexer-split/src/tracker-thumbnailer/Makefile.am
==============================================================================
--- branches/indexer-split/src/tracker-thumbnailer/Makefile.am	(original)
+++ branches/indexer-split/src/tracker-thumbnailer/Makefile.am	Thu Aug 28 10:58:43 2008
@@ -5,10 +5,7 @@
 
 libexec_PROGRAMS = tracker-thumbnailer
 
-tracker_thumbnailer_SOURCES = \
-	tracker-thumbnailer.c \
-	md5.c \
-	md5.h
+tracker_thumbnailer_SOURCES = tracker-thumbnailer.c
 
 tracker_thumbnailer_LDADD = \
 	$(GLIB2_LIBS) \

Modified: branches/indexer-split/src/tracker-thumbnailer/tracker-thumbnailer.c
==============================================================================
--- branches/indexer-split/src/tracker-thumbnailer/tracker-thumbnailer.c	(original)
+++ branches/indexer-split/src/tracker-thumbnailer/tracker-thumbnailer.c	Thu Aug 28 10:58:43 2008
@@ -29,7 +29,6 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <png.h>
-#include "md5.h"
 
 #ifdef OS_WIN32
 #include <Windows.h>
@@ -82,12 +81,10 @@
 	gchar          realname[MAXPATHLEN];
 	struct stat    stat_info;
 	gchar         *mtime;
-	md5_state_t    hash_state;
-	guchar         hash[16];
-	gchar          uri_hash[21], *p;
+	const gchar   *md5_hash;
 	int	       i;
 	guint32        j;
-	gchar         *thumbnail_filename;
+	gchar         *filename, *thumbnail_filename;
 	FILE          *fp;
 	png_structp    png_ptr;
 	png_infop      info_ptr;
@@ -101,6 +98,7 @@
 	png_colorp     palette;
 	int            num_palette;
 	png_bytepp     row_pointers;
+	GChecksum     *checksum;
 
 	/* only make normal size thumbnails for now */
 	if (strcmp (argv[3], "normal") != 0) {
@@ -134,17 +132,17 @@
 	mtime = g_strdup_printf ("%lu", stat_info.st_mtime);
 
 	/* create path to thumbnail */
-	md5_init (&hash_state);
-	md5_append (&hash_state, (guchar *)uri, strlen (uri));
-	md5_finish (&hash_state, hash);
-	p = uri_hash;
-	for (i = 0; i < 16; i++) {
-		g_sprintf (p, "%02x", hash[i]);
-		p += 2;
-	}
-	g_sprintf (p, ".png");
+	checksum = g_checksum_new (G_CHECKSUM_MD5);
+	g_checksum_update (checksum, (guchar *) uri, -1);
+	md5_hash = g_checksum_get_string (checksum);
+
+	filename = g_strdup_printf ("%s.png", md5_hash);
+	g_checksum_free (checksum);
+
 	thumbnail_filename = g_build_filename (
-		g_get_home_dir (), ".thumbnails", argv[3], uri_hash, NULL);
+		g_get_home_dir (), ".thumbnails", argv[3], filename, NULL);
+
+	g_free (filename);
 
 	/* check to see if the thumbnail already exists */
 	if (g_file_test (thumbnail_filename, G_FILE_TEST_EXISTS)) {