From 8203e1ac50ac526b7473588d0ba05b631df74bd8 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Fri, 28 Mar 2008 16:47:38 +0000 Subject: [PATCH] use GCheckSum instead of the MD5 routine from libgimpmath. 2008-03-28 Sven Neumann * libgimpthumb/gimpthumb-utils.c (gimp_thumb_png_name): use GCheckSum instead of the MD5 routine from libgimpmath. * gimpthumb.pc.in * libgimpthumb/Makefile.am: removed libgimpmath dependency from libgimpthumb. svn path=/trunk/; revision=25287 --- ChangeLog | 9 +++++++++ gimpthumb.pc.in | 2 +- libgimpthumb/Makefile.am | 4 +--- libgimpthumb/gimpthumb-utils.c | 19 ++++++++++++------- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d2b28edd5..77c01bcd72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-03-28 Sven Neumann + + * libgimpthumb/gimpthumb-utils.c (gimp_thumb_png_name): use + GCheckSum instead of the MD5 routine from libgimpmath. + + * gimpthumb.pc.in + * libgimpthumb/Makefile.am: removed libgimpmath dependency from + libgimpthumb. + 2008-03-28 Sven Neumann * app/sanity.c (sanity_check_glib): bumped glib version. diff --git a/gimpthumb.pc.in b/gimpthumb.pc.in index d386dc9ee5..6f166f8397 100644 --- a/gimpthumb.pc.in +++ b/gimpthumb.pc.in @@ -7,5 +7,5 @@ Name: GIMP Thumb Description: GIMP Thumbnail Library Version: @GIMP_REAL_VERSION@ Requires: gdk-pixbuf-2.0 -Libs: -L${libdir} -lgimpthumb-@GIMP_API_VERSION@ -lgimpmath-@GIMP_API_VERSION@ +Libs: -L${libdir} -lgimpthumb-@GIMP_API_VERSION@ Cflags: -I${includedir}/gimp-@GIMP_API_VERSION@ diff --git a/libgimpthumb/Makefile.am b/libgimpthumb/Makefile.am index 7a15b59b0b..2e7b5314fb 100644 --- a/libgimpthumb/Makefile.am +++ b/libgimpthumb/Makefile.am @@ -1,7 +1,5 @@ ## Process this file with automake to produce Makefile.in -libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la - if PLATFORM_WIN32 no_undefined = -no-undefined endif @@ -81,7 +79,7 @@ libgimpthumb_2_0_la_LDFLAGS = \ $(no_undefined) \ $(libgimpthumb_export_symbols) -libgimpthumb_2_0_la_LIBADD = $(libgimpmath) $(GDK_PIXBUF_LIBS) $(GLIB_LIBS) +libgimpthumb_2_0_la_LIBADD = $(GDK_PIXBUF_LIBS) $(GLIB_LIBS) noinst_PROGRAMS = gimp-thumbnail-list diff --git a/libgimpthumb/gimpthumb-utils.c b/libgimpthumb/gimpthumb-utils.c index fb564776f1..ceb170b053 100644 --- a/libgimpthumb/gimpthumb-utils.c +++ b/libgimpthumb/gimpthumb-utils.c @@ -40,8 +40,6 @@ #include "libgimpbase/gimpwin32-io.h" #endif -#include "libgimpmath/gimpmath.h" - #include "gimpthumb-error.h" #include "gimpthumb-types.h" #include "gimpthumb-utils.h" @@ -763,14 +761,21 @@ static const gchar * gimp_thumb_png_name (const gchar *uri) { static gchar name[40]; - guchar digest[16]; - guchar n; - gint i; - gimp_md5_get_digest (uri, -1, digest); + GChecksum *checksum; + guchar digest[16]; + gsize len = sizeof (digest); + gsize i; - for (i = 0; i < 16; i++) + checksum = g_checksum_new (G_CHECKSUM_MD5); + g_checksum_update (checksum, (const guchar *) uri, -1); + g_checksum_get_digest (checksum, digest, &len); + g_checksum_free (checksum); + + for (i = 0; i < len; i++) { + guchar n; + n = (digest[i] >> 4) & 0xF; name[i * 2] = (n > 9) ? 'a' + n - 10 : '0' + n;