[maemo-commits] [maemo-commits] r16011 - in projects/haf/branches/hildon-thumbnail/daemonize: . daemon daemon/plugins
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Thu Sep 4 18:14:31 EEST 2008
- Previous message: [maemo-commits] r16010 - projects/haf/tags/osso-af-startup
- Next message: [maemo-commits] r16012 - projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: pvanhoof Date: 2008-09-04 18:14:28 +0300 (Thu, 04 Sep 2008) New Revision: 16011 Added: projects/haf/branches/hildon-thumbnail/daemonize/daemon/md5.c projects/haf/branches/hildon-thumbnail/daemonize/daemon/md5.h projects/haf/branches/hildon-thumbnail/daemonize/daemon/pixbuf-io-loader.c projects/haf/branches/hildon-thumbnail/daemonize/daemon/utils.c projects/haf/branches/hildon-thumbnail/daemonize/daemon/utils.h Modified: projects/haf/branches/hildon-thumbnail/daemonize/ChangeLog projects/haf/branches/hildon-thumbnail/daemonize/daemon/Makefile.am projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/Makefile.am projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/default.c projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.c Log: 2008-09-04 Philip Van Hoof <philip at codeminded.be> * daemon/pixbuf-io-loader.c * daemon/plugins/default.c * daemon/plugins/Makefile.am * daemon/utils.c * daemon/utils.h * daemon/thumbnailer.c * daemon/md5.c * daemon/Makefile.am * daemon/md5.h: Making our very first thumbnails! Modified: projects/haf/branches/hildon-thumbnail/daemonize/ChangeLog =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/ChangeLog 2008-09-04 11:58:15 UTC (rev 16010) +++ projects/haf/branches/hildon-thumbnail/daemonize/ChangeLog 2008-09-04 15:14:28 UTC (rev 16011) @@ -1,18 +1,30 @@ 2008-09-04 Philip Van Hoof <philip at codeminded.be> - tests/daemon.xml - tests/daemon.c - daemon/thumbnailer.h - daemon/manager.h - daemon/manager.xml - daemon/thumbnailer.xml: Changed spec + * daemon/pixbuf-io-loader.c + * daemon/plugins/default.c + * daemon/plugins/Makefile.am + * daemon/utils.c + * daemon/utils.h + * daemon/thumbnailer.c + * daemon/md5.c + * daemon/Makefile.am + * daemon/md5.h: Making our very first thumbnails! +2008-09-04 Philip Van Hoof <philip at codeminded.be> + + * tests/daemon.xml + * tests/daemon.c + * daemon/thumbnailer.h + * daemon/manager.h + * daemon/manager.xml + * daemon/thumbnailer.xml: Changed spec + 2008-09-03 Philip Van Hoof <philip at codeminded.be> - tests/daemon.xml - tests/daemon.c - tests/Makefile.am - configure.ac: Made a little external plugin test + * tests/daemon.xml + * tests/daemon.c + * tests/Makefile.am + * configure.ac: Made a little external plugin test 2008-09-03 Philip Van Hoof <philip at codeminded.be> Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/Makefile.am =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/Makefile.am 2008-09-04 11:58:15 UTC (rev 16010) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/Makefile.am 2008-09-04 15:14:28 UTC (rev 16011) @@ -1,13 +1,18 @@ -SUBDIRS = plugins +SUBDIRS = . plugins INCLUDES = \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \ $(GMODULE_CFLAGS) \ $(GIO_CFLAGS) \ + $(GDK_PIXBUF_CFLAGS) \ -DPLUGINS_DIR=\""$(libdir)/hildon-thumbnailer/plugins"\" +noinst_LTLIBRARIES = libshared.la + +libshared_la_SOURCES = md5.c md5.h utils.h utils.c pixbuf-io-loader.c + libexec_PROGRAMS = hildon-thumbnailerd include_HEADERS = hildon-thumbnail-plugin.h @@ -33,6 +38,7 @@ dbus-utils.c hildon_thumbnailerd_LDADD = \ + $(top_builddir)/daemon/libshared.la \ $(DBUS_LIBS) \ $(GLIB_LIBS) \ $(GMODULE_LIBS) \ Added: projects/haf/branches/hildon-thumbnail/daemonize/daemon/md5.c =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/md5.c 2008-09-04 11:58:15 UTC (rev 16010) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/md5.c 2008-09-04 15:14:28 UTC (rev 16011) @@ -0,0 +1,393 @@ +/* + Copyright (C) 1999 Aladdin Enterprises. All rights reserved. + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + L. Peter Deutsch + ghost at aladdin.com + + */ +/*$Id: md5.c,v 1.1 2005/01/27 15:43:14 jsaul Exp $ */ +/* + Independent implementation of MD5 (RFC 1321). + + This code implements the MD5 Algorithm defined in RFC 1321. + It is derived directly from the text of the RFC and not from the + reference implementation. + + The original and principal author of md5.c is L. Peter Deutsch + <ghost at aladdin.com>. Other authors are noted in the change history + that follows (in reverse chronological order): + + 1999-11-04 lpd Edited comments slightly for automatic TOC extraction. + 1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5). + 1999-05-03 lpd Original version. + */ + +#include "md5.h" +#include <string.h> + +#ifdef TEST +/* + * Compile with -DTEST to create a self-contained executable test program. + * The test program should print out the same values as given in section + * A.5 of RFC 1321, reproduced below. + */ +#include <string.h> +main() +{ + static const char *const test[7] = { + "", /*d41d8cd98f00b204e9800998ecf8427e*/ + "a", /*0cc175b9c0f1b6a831c399e269772661*/ + "abc", /*900150983cd24fb0d6963f7d28e17f72*/ + "message digest", /*f96b697d7cb7938d525a2f31aaf161d0*/ + "abcdefghijklmnopqrstuvwxyz", /*c3fcd3d76192e4007dfb496cca67e13b*/ + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", + /*d174ab98d277d9f5a5611c2c9f419d9f*/ + "12345678901234567890123456789012345678901234567890123456789012345678901234567890" /*57edf4a22be3c955ac49da2e2107b67a*/ + }; + int i; + + for (i = 0; i < 7; ++i) { + md5_state_t state; + md5_byte_t digest[16]; + int di; + + md5_init(&state); + md5_append(&state, (const md5_byte_t *)test[i], strlen(test[i])); + md5_finish(&state, digest); + printf("MD5 (\"%s\") = ", test[i]); + for (di = 0; di < 16; ++di) + printf("%02x", digest[di]); + printf("\n"); + } + return 0; +} +#endif /* TEST */ + + +/* + * For reference, here is the program that computed the T values. + */ +#if 0 +#include <math.h> +main() +{ + int i; + for (i = 1; i <= 64; ++i) { + unsigned long v = (unsigned long)(4294967296.0 * fabs(sin((double)i))); + printf("#define T%d 0x%08lx\n", i, v); + } + return 0; +} +#endif +/* + * End of T computation program. + */ +#define T1 0xd76aa478 +#define T2 0xe8c7b756 +#define T3 0x242070db +#define T4 0xc1bdceee +#define T5 0xf57c0faf +#define T6 0x4787c62a +#define T7 0xa8304613 +#define T8 0xfd469501 +#define T9 0x698098d8 +#define T10 0x8b44f7af +#define T11 0xffff5bb1 +#define T12 0x895cd7be +#define T13 0x6b901122 +#define T14 0xfd987193 +#define T15 0xa679438e +#define T16 0x49b40821 +#define T17 0xf61e2562 +#define T18 0xc040b340 +#define T19 0x265e5a51 +#define T20 0xe9b6c7aa +#define T21 0xd62f105d +#define T22 0x02441453 +#define T23 0xd8a1e681 +#define T24 0xe7d3fbc8 +#define T25 0x21e1cde6 +#define T26 0xc33707d6 +#define T27 0xf4d50d87 +#define T28 0x455a14ed +#define T29 0xa9e3e905 +#define T30 0xfcefa3f8 +#define T31 0x676f02d9 +#define T32 0x8d2a4c8a +#define T33 0xfffa3942 +#define T34 0x8771f681 +#define T35 0x6d9d6122 +#define T36 0xfde5380c +#define T37 0xa4beea44 +#define T38 0x4bdecfa9 +#define T39 0xf6bb4b60 +#define T40 0xbebfbc70 +#define T41 0x289b7ec6 +#define T42 0xeaa127fa +#define T43 0xd4ef3085 +#define T44 0x04881d05 +#define T45 0xd9d4d039 +#define T46 0xe6db99e5 +#define T47 0x1fa27cf8 +#define T48 0xc4ac5665 +#define T49 0xf4292244 +#define T50 0x432aff97 +#define T51 0xab9423a7 +#define T52 0xfc93a039 +#define T53 0x655b59c3 +#define T54 0x8f0ccc92 +#define T55 0xffeff47d +#define T56 0x85845dd1 +#define T57 0x6fa87e4f +#define T58 0xfe2ce6e0 +#define T59 0xa3014314 +#define T60 0x4e0811a1 +#define T61 0xf7537e82 +#define T62 0xbd3af235 +#define T63 0x2ad7d2bb +#define T64 0xeb86d391 + +static void +md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/) +{ + md5_word_t + a = pms->abcd[0], b = pms->abcd[1], + c = pms->abcd[2], d = pms->abcd[3]; + md5_word_t t; + +#ifndef ARCH_IS_BIG_ENDIAN +# define ARCH_IS_BIG_ENDIAN 1 /* slower, default implementation */ +#endif +#if ARCH_IS_BIG_ENDIAN + + /* + * On big-endian machines, we must arrange the bytes in the right + * order. (This also works on machines of unknown byte order.) + */ + md5_word_t X[16]; + const md5_byte_t *xp = data; + int i; + + for (i = 0; i < 16; ++i, xp += 4) + X[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24); + +#else /* !ARCH_IS_BIG_ENDIAN */ + + /* + * On little-endian machines, we can process properly aligned data + * without copying it. + */ + md5_word_t xbuf[16]; + const md5_word_t *X; + + if (!((data - (const md5_byte_t *)0) & 3)) { + /* data are properly aligned */ + X = (const md5_word_t *)data; + } else { + /* not aligned */ + memcpy(xbuf, data, 64); + X = xbuf; + } +#endif + +#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n)))) + + /* Round 1. */ + /* Let [abcd k s i] denote the operation + a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */ +#define F(x, y, z) (((x) & (y)) | (~(x) & (z))) +#define SET(a, b, c, d, k, s, Ti)\ + t = a + F(b,c,d) + X[k] + Ti;\ + a = ROTATE_LEFT(t, s) + b + /* Do the following 16 operations. */ + SET(a, b, c, d, 0, 7, T1); + SET(d, a, b, c, 1, 12, T2); + SET(c, d, a, b, 2, 17, T3); + SET(b, c, d, a, 3, 22, T4); + SET(a, b, c, d, 4, 7, T5); + SET(d, a, b, c, 5, 12, T6); + SET(c, d, a, b, 6, 17, T7); + SET(b, c, d, a, 7, 22, T8); + SET(a, b, c, d, 8, 7, T9); + SET(d, a, b, c, 9, 12, T10); + SET(c, d, a, b, 10, 17, T11); + SET(b, c, d, a, 11, 22, T12); + SET(a, b, c, d, 12, 7, T13); + SET(d, a, b, c, 13, 12, T14); + SET(c, d, a, b, 14, 17, T15); + SET(b, c, d, a, 15, 22, T16); +#undef SET + + /* Round 2. */ + /* Let [abcd k s i] denote the operation + a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */ +#define G(x, y, z) (((x) & (z)) | ((y) & ~(z))) +#define SET(a, b, c, d, k, s, Ti)\ + t = a + G(b,c,d) + X[k] + Ti;\ + a = ROTATE_LEFT(t, s) + b + /* Do the following 16 operations. */ + SET(a, b, c, d, 1, 5, T17); + SET(d, a, b, c, 6, 9, T18); + SET(c, d, a, b, 11, 14, T19); + SET(b, c, d, a, 0, 20, T20); + SET(a, b, c, d, 5, 5, T21); + SET(d, a, b, c, 10, 9, T22); + SET(c, d, a, b, 15, 14, T23); + SET(b, c, d, a, 4, 20, T24); + SET(a, b, c, d, 9, 5, T25); + SET(d, a, b, c, 14, 9, T26); + SET(c, d, a, b, 3, 14, T27); + SET(b, c, d, a, 8, 20, T28); + SET(a, b, c, d, 13, 5, T29); + SET(d, a, b, c, 2, 9, T30); + SET(c, d, a, b, 7, 14, T31); + SET(b, c, d, a, 12, 20, T32); +#undef SET + + /* Round 3. */ + /* Let [abcd k s t] denote the operation + a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */ +#define H(x, y, z) ((x) ^ (y) ^ (z)) +#define SET(a, b, c, d, k, s, Ti)\ + t = a + H(b,c,d) + X[k] + Ti;\ + a = ROTATE_LEFT(t, s) + b + /* Do the following 16 operations. */ + SET(a, b, c, d, 5, 4, T33); + SET(d, a, b, c, 8, 11, T34); + SET(c, d, a, b, 11, 16, T35); + SET(b, c, d, a, 14, 23, T36); + SET(a, b, c, d, 1, 4, T37); + SET(d, a, b, c, 4, 11, T38); + SET(c, d, a, b, 7, 16, T39); + SET(b, c, d, a, 10, 23, T40); + SET(a, b, c, d, 13, 4, T41); + SET(d, a, b, c, 0, 11, T42); + SET(c, d, a, b, 3, 16, T43); + SET(b, c, d, a, 6, 23, T44); + SET(a, b, c, d, 9, 4, T45); + SET(d, a, b, c, 12, 11, T46); + SET(c, d, a, b, 15, 16, T47); + SET(b, c, d, a, 2, 23, T48); +#undef SET + + /* Round 4. */ + /* Let [abcd k s t] denote the operation + a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */ +#define I(x, y, z) ((y) ^ ((x) | ~(z))) +#define SET(a, b, c, d, k, s, Ti)\ + t = a + I(b,c,d) + X[k] + Ti;\ + a = ROTATE_LEFT(t, s) + b + /* Do the following 16 operations. */ + SET(a, b, c, d, 0, 6, T49); + SET(d, a, b, c, 7, 10, T50); + SET(c, d, a, b, 14, 15, T51); + SET(b, c, d, a, 5, 21, T52); + SET(a, b, c, d, 12, 6, T53); + SET(d, a, b, c, 3, 10, T54); + SET(c, d, a, b, 10, 15, T55); + SET(b, c, d, a, 1, 21, T56); + SET(a, b, c, d, 8, 6, T57); + SET(d, a, b, c, 15, 10, T58); + SET(c, d, a, b, 6, 15, T59); + SET(b, c, d, a, 13, 21, T60); + SET(a, b, c, d, 4, 6, T61); + SET(d, a, b, c, 11, 10, T62); + SET(c, d, a, b, 2, 15, T63); + SET(b, c, d, a, 9, 21, T64); +#undef SET + + /* Then perform the following additions. (That is increment each + of the four registers by the value it had before this block + was started.) */ + pms->abcd[0] += a; + pms->abcd[1] += b; + pms->abcd[2] += c; + pms->abcd[3] += d; +} + +void +md5_init(md5_state_t *pms) +{ + pms->count[0] = pms->count[1] = 0; + pms->abcd[0] = 0x67452301; + pms->abcd[1] = 0xefcdab89; + pms->abcd[2] = 0x98badcfe; + pms->abcd[3] = 0x10325476; +} + +void +md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes) +{ + const md5_byte_t *p = data; + int left = nbytes; + int offset = (pms->count[0] >> 3) & 63; + md5_word_t nbits = (md5_word_t)(nbytes << 3); + + if (nbytes <= 0) + return; + + /* Update the message length. */ + pms->count[1] += nbytes >> 29; + pms->count[0] += nbits; + if (pms->count[0] < nbits) + pms->count[1]++; + + /* Process an initial partial block. */ + if (offset) { + int copy = (offset + nbytes > 64 ? 64 - offset : nbytes); + + memcpy(pms->buf + offset, p, copy); + if (offset + copy < 64) + return; + p += copy; + left -= copy; + md5_process(pms, pms->buf); + } + + /* Process full blocks. */ + for (; left >= 64; p += 64, left -= 64) + md5_process(pms, p); + + /* Process a final partial block. */ + if (left) + memcpy(pms->buf, p, left); +} + +void +md5_finish(md5_state_t *pms, md5_byte_t digest[16]) +{ + static const md5_byte_t pad[64] = { + 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + }; + md5_byte_t data[8]; + int i; + + /* Save the length before padding. */ + for (i = 0; i < 8; ++i) + data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3)); + /* Pad to 56 bytes mod 64. */ + md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1); + /* Append the length. */ + md5_append(pms, data, 8); + for (i = 0; i < 16; ++i) + digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3)); +} Added: projects/haf/branches/hildon-thumbnail/daemonize/daemon/md5.h =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/md5.h 2008-09-04 11:58:15 UTC (rev 16010) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/md5.h 2008-09-04 15:14:28 UTC (rev 16011) @@ -0,0 +1,94 @@ +/* + Copyright (C) 1999 Aladdin Enterprises. All rights reserved. + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + L. Peter Deutsch + ghost at aladdin.com + + */ +/*$Id: md5.h,v 1.1 2005/01/27 15:43:14 jsaul Exp $ */ +/* + Independent implementation of MD5 (RFC 1321). + + This code implements the MD5 Algorithm defined in RFC 1321. + It is derived directly from the text of the RFC and not from the + reference implementation. + + The original and principal author of md5.h is L. Peter Deutsch + <ghost at aladdin.com>. Other authors are noted in the change history + that follows (in reverse chronological order): + + 1999-11-04 lpd Edited comments slightly for automatic TOC extraction. + 1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5); + added conditionalization for C++ compilation from Martin + Purschke <purschke at bnl.gov>. + 1999-05-03 lpd Original version. + */ + +#ifndef md5_INCLUDED +# define md5_INCLUDED + +/* + * This code has some adaptations for the Ghostscript environment, but it + * will compile and run correctly in any environment with 8-bit chars and + * 32-bit ints. Specifically, it assumes that if the following are + * defined, they have the same meaning as in Ghostscript: P1, P2, P3, + * ARCH_IS_BIG_ENDIAN. + */ + +typedef unsigned char md5_byte_t; /* 8-bit byte */ +typedef unsigned int md5_word_t; /* 32-bit word */ + +/* Define the state of the MD5 Algorithm. */ +typedef struct md5_state_s { + md5_word_t count[2]; /* message length in bits, lsw first */ + md5_word_t abcd[4]; /* digest buffer */ + md5_byte_t buf[64]; /* accumulate block */ +} md5_state_t; + +#ifdef __cplusplus +extern "C" +{ +#endif + +/* Initialize the algorithm. */ +#ifdef P1 +void md5_init(P1(md5_state_t *pms)); +#else +void md5_init(md5_state_t *pms); +#endif + +/* Append a string to the message. */ +#ifdef P3 +void md5_append(P3(md5_state_t *pms, const md5_byte_t *data, int nbytes)); +#else +void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes); +#endif + +/* Finish the message and return the digest. */ +#ifdef P2 +void md5_finish(P2(md5_state_t *pms, md5_byte_t digest[16])); +#else +void md5_finish(md5_state_t *pms, md5_byte_t digest[16]); +#endif + +#ifdef __cplusplus +} /* end extern "C" */ +#endif + +#endif /* md5_INCLUDED */ Added: projects/haf/branches/hildon-thumbnail/daemonize/daemon/pixbuf-io-loader.c =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/pixbuf-io-loader.c 2008-09-04 11:58:15 UTC (rev 16010) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/pixbuf-io-loader.c 2008-09-04 15:14:28 UTC (rev 16011) @@ -0,0 +1,195 @@ + +/* -*- mode: C; c-file-style: "linux" -*- */ +/* GdkPixbuf library - Main loading interface. + * + * Copyright (C) 1999 The Free Software Foundation + * + * Authors: Miguel de Icaza <miguel at gnu.org> + * Federico Mena-Quintero <federico at gimp.org> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef gdk_pixbuf_new_from_stream_at_scale + + +#include <gio/gio.h> +#include <gdk-pixbuf/gdk-pixbuf.h> + +#define LOAD_BUFFER_SIZE 65536 + +static GdkPixbuf * +load_from_stream (GdkPixbufLoader *loader, + GInputStream *stream, + GCancellable *cancellable, + GError **error) +{ + GdkPixbuf *pixbuf; + gssize n_read; + guchar buffer[LOAD_BUFFER_SIZE]; + gboolean res; + + res = TRUE; + while (1) { + n_read = g_input_stream_read (stream, + buffer, + sizeof (buffer), + cancellable, + error); + if (n_read < 0) { + res = FALSE; + error = NULL; /* Ignore further errors */ + break; + } + + if (n_read == 0) + break; + + if (!gdk_pixbuf_loader_write (loader, + buffer, + n_read, + error)) { + res = FALSE; + error = NULL; + break; + } + } + + if (!gdk_pixbuf_loader_close (loader, error)) { + res = FALSE; + error = NULL; + } + + pixbuf = NULL; + if (res) { + pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); + if (pixbuf) + g_object_ref (pixbuf); + } + + return pixbuf; +} + +typedef struct { + gint width; + gint height; + gboolean preserve_aspect_ratio; +} AtScaleData; + +static void +at_scale_size_prepared_cb (GdkPixbufLoader *loader, + int width, + int height, + gpointer data) +{ + AtScaleData *info = data; + + g_return_if_fail (width > 0 && height > 0); + + if (info->preserve_aspect_ratio && + (info->width > 0 || info->height > 0)) { + if (info->width < 0) + { + width = width * (double)info->height/(double)height; + height = info->height; + } + else if (info->height < 0) + { + height = height * (double)info->width/(double)width; + width = info->width; + } + else if ((double)height * (double)info->width > + (double)width * (double)info->height) { + width = 0.5 + (double)width * (double)info->height / (double)height; + height = info->height; + } else { + height = 0.5 + (double)height * (double)info->width / (double)width; + width = info->width; + } + } else { + if (info->width > 0) + width = info->width; + if (info->height > 0) + height = info->height; + } + + width = MAX (width, 1); + height = MAX (height, 1); + + gdk_pixbuf_loader_set_size (loader, width, height); +} + +/** + * gdk_pixbuf_new_from_stream_at_scale: + * @stream: a #GInputStream to load the pixbuf from + * @width: The width the image should have or -1 to not constrain the width + * @height: The height the image should have or -1 to not constrain the height + * @preserve_aspect_ratio: %TRUE to preserve the image's aspect ratio + * @cancellable: optional #GCancellable object, %NULL to ignore + * @error: Return location for an error + * + * Creates a new pixbuf by loading an image from an input stream. + * + * The file format is detected automatically. If %NULL is returned, then + * @error will be set. The @cancellable can be used to abort the operation + * from another thread. If the operation was cancelled, the error + * %GIO_ERROR_CANCELLED will be returned. Other possible errors are in + * the #GDK_PIXBUF_ERROR and %G_IO_ERROR domains. + * + * The image will be scaled to fit in the requested size, optionally + * preserving the image's aspect ratio. When preserving the aspect ratio, + * a @width of -1 will cause the image to be scaled to the exact given + * height, and a @height of -1 will cause the image to be scaled to the + * exact given width. When not preserving aspect ratio, a @width or + * @height of -1 means to not scale the image at all in that dimension. + * + * The stream is not closed. + * + * Return value: A newly-created pixbuf, or %NULL if any of several error + * conditions occurred: the file could not be opened, the image format is + * not supported, there was not enough memory to allocate the image buffer, + * the stream contained invalid data, or the operation was cancelled. + * + * Since: 2.14 + */ +GdkPixbuf * +gdk_pixbuf_new_from_stream_at_scale (GInputStream *stream, + gint width, + gint height, + gboolean preserve_aspect_ratio, + GCancellable *cancellable, + GError **error) +{ + GdkPixbufLoader *loader; + GdkPixbuf *pixbuf; + AtScaleData info; + + loader = gdk_pixbuf_loader_new (); + + info.width = width; + info.height = height; + info.preserve_aspect_ratio = preserve_aspect_ratio; + + g_signal_connect (loader, "size-prepared", + G_CALLBACK (at_scale_size_prepared_cb), &info); + + pixbuf = load_from_stream (loader, stream, cancellable, error); + g_object_unref (loader); + + return pixbuf; +} + +#endif Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/Makefile.am =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/Makefile.am 2008-09-04 11:58:15 UTC (rev 16010) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/Makefile.am 2008-09-04 15:14:28 UTC (rev 16011) @@ -5,7 +5,8 @@ $(PKG_CFLAGS) \ -I$(top_srcdir)/thumbs \ $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) + $(GLIB_CFLAGS) \ + $(GDK_PIXBUF_CFLAGS) plugins_LTLIBRARIES = libhildon-thumbnailer-default.la @@ -13,9 +14,10 @@ libhildon_thumbnailer_default_la_LDFLAGS = $(plugin_flags) libhildon_thumbnailer_default_la_LIBADD = \ $(PGK_LIBS) \ - $(top_builddir)/thumbs/libhildonthumbnail.la \ + $(top_builddir)/daemon/libshared.la \ $(GMODULE_LIBS) \ - $(GLIB_LIBS) + $(GLIB_LIBS) \ + $(GDK_PIXBUF_LIBS) Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/default.c =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/default.c 2008-09-04 11:58:15 UTC (rev 16010) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/default.c 2008-09-04 15:14:28 UTC (rev 16011) @@ -22,10 +22,22 @@ * */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <string.h> #include <glib.h> +#include <gio/gio.h> #include <dbus/dbus-glib-bindings.h> -#include <hildon-thumbnail-factory.h> +#include <gdk-pixbuf/gdk-pixbuf.h> + +#define DEFAULT_ERROR_DOMAIN "HildonThumbnailerDefault" +#define DEFAULT_ERROR g_quark_from_static_string (DEFAULT_ERROR_DOMAIN) + +#include "utils.h" #include "default.h" #include "hildon-thumbnail-plugin.h" @@ -38,14 +50,148 @@ return supported; } +#define HILDON_THUMBNAIL_OPTION_PREFIX "tEXt::Thumb::" +#define HILDON_THUMBNAIL_APPLICATION "hildon-thumbnail" +#define DEFAULT_MAX_PROCESSES 1 +#define THUMBS_GCONF_DIR "/apps/osso/osso/thumbnailers" +#define URI_OPTION HILDON_THUMBNAIL_OPTION_PREFIX "URI" +#define MTIME_OPTION HILDON_THUMBNAIL_OPTION_PREFIX "MTime" +#define SOFTWARE_OPTION "tEXt::Software" +#define META_OPTION HILDON_THUMBNAIL_OPTION_PREFIX "Meta" + + +static gboolean +save_thumb_file_meta (GdkPixbuf *pixbuf, gchar *file, guint64 mtime, const gchar *uri, GError **error) +{ + gboolean ret; + char mtime_str[64]; + + const char *default_keys[] = { + URI_OPTION, + MTIME_OPTION, + SOFTWARE_OPTION, + NULL + }; + + const char *default_values[] = { + uri, + mtime_str, + HILDON_THUMBNAIL_APPLICATION "-" VERSION, + NULL + }; + + g_sprintf(mtime_str, "%lu", mtime); + + ret = gdk_pixbuf_savev (pixbuf, file, "png", + (char **) default_keys, + (char **) default_values, + error); + + return ret; +} + + + void hildon_thumbnail_plugin_create (GStrv uris, GError **error) { guint i = 0; + GString *errors = NULL; + while (uris[i] != NULL) { - g_print ("%s\n", uris[i]); + GError *nerror = NULL; + GFileInfo *info; + GFile *file; + GFileInputStream *stream; + gchar *uri = uris[i]; + GdkPixbuf *pixbuf_large; + GdkPixbuf *pixbuf_normal; + guint64 mtime; + gchar *large = NULL, *normal = NULL; + + g_print ("%s\n", uri); + + hildon_thumbnail_util_get_thumb_paths (uri, &large, &normal, &nerror); + + g_print ("L %s\n", large); + g_print ("N %s\n", normal); + + if (nerror) + goto nerror_handler; + + file = g_file_new_for_uri (uri); + + info = g_file_query_info (file, + G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE "," + G_FILE_ATTRIBUTE_TIME_MODIFIED, + G_FILE_QUERY_INFO_NONE, + NULL, &nerror); + + if (nerror) + goto nerror_handler; + + mtime = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED); + + stream = g_file_read (file, NULL, &nerror); + + if (nerror) + goto nerror_handler; + + pixbuf_large = gdk_pixbuf_new_from_stream_at_scale (G_INPUT_STREAM (stream), + 256, 256, + TRUE, + NULL, + &nerror); + + if (nerror) + goto nerror_handler; + + save_thumb_file_meta (pixbuf_large, large, mtime, uri, &nerror); + + if (nerror) + goto nerror_handler; + + g_seekable_seek (G_SEEKABLE (stream), 0, G_SEEK_SET, NULL, &nerror); + + if (nerror) + goto nerror_handler; + + pixbuf_normal = gdk_pixbuf_new_from_stream_at_scale (G_INPUT_STREAM (stream), + 128, 128, + TRUE, + NULL, + &nerror); + + g_input_stream_close (G_INPUT_STREAM (stream), NULL, NULL); + + if (nerror) + goto nerror_handler; + + save_thumb_file_meta (pixbuf_normal, normal, mtime, uri, &nerror); + + + nerror_handler: + + if (nerror) { + if (!errors) + errors = g_string_new (""); + g_string_append_printf (errors, "[`%s': %s] ", + uri, + nerror->message); + } + + if (stream) + g_object_unref (stream); + i++; } + + if (errors) { + g_set_error (error, DEFAULT_ERROR, 0, + errors->str); + g_string_free (errors, TRUE); + } + return; } Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.c =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.c 2008-09-04 11:58:15 UTC (rev 16010) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.c 2008-09-04 15:14:28 UTC (rev 16011) @@ -36,6 +36,7 @@ #include "thumbnailer-glue.h" #include "hildon-thumbnail-plugin.h" #include "dbus-utils.h" +#include "utils.h" #define THUMBNAILER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_THUMBNAILER, ThumbnailerPrivate)) @@ -96,42 +97,31 @@ static void get_some_file_infos (const gchar *uri, gchar **mime_type, gboolean *has_thumb, GError **error) { - const gchar *content_type, *tp; - GFileInfo *info, *thumb_info = NULL; + const gchar *content_type; + GFileInfo *info; GFile *file; + gchar *normal = NULL, *large = NULL; *mime_type = NULL; *has_thumb = FALSE; file = g_file_new_for_uri (uri); info = g_file_query_info (file, - G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE "," - G_FILE_ATTRIBUTE_THUMBNAIL_PATH, + G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, NULL, error); - if (info) - thumb_info = g_object_ref (info); - -/* thumb_info = g_file_query_info (file, - G_FILE_ATTRIBUTE_THUMBNAIL_PATH, - G_FILE_QUERY_INFO_NONE, - NULL, NULL); -*/ if (info) { content_type = g_file_info_get_content_type (info); *mime_type = content_type?g_strdup (content_type):g_strdup ("unknown/unknown"); g_object_unref (info); } - if (thumb_info) { - tp = g_file_info_get_attribute_byte_string (info, - G_FILE_ATTRIBUTE_THUMBNAIL_PATH); - *has_thumb = tp?g_file_test (tp, G_FILE_TEST_EXISTS):FALSE; - // g_print ("T: %s\n", tp); - g_object_unref (thumb_info); - } + hildon_thumbnail_util_get_thumb_paths (uri, &large, &normal, error); + *has_thumb = (g_file_test (large, G_FILE_TEST_EXISTS) && g_file_test (normal, G_FILE_TEST_EXISTS)); + g_free (normal); + g_free (large); g_object_unref (file); } Added: projects/haf/branches/hildon-thumbnail/daemonize/daemon/utils.c =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/utils.c 2008-09-04 11:58:15 UTC (rev 16010) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/utils.c 2008-09-04 15:14:28 UTC (rev 16011) @@ -0,0 +1,66 @@ +#include <string.h> +#include "md5.h" +#include "utils.h" + + +#define UTILS_ERROR_DOMAIN "HildonThumbnailerUtils" +#define UTILS_ERROR g_quark_from_static_string (UTILS_ERROR_DOMAIN) + + +static void +md5_digest_to_ascii(guchar digest[16], gchar str[33]) +{ + gint i; + gchar *cursor = str; + for(i = 0; i < 16; i++) { + g_sprintf(cursor, "%02x", digest[i]); + cursor += 2; + } +} + +static void +md5_c_string(const gchar *str, gchar ascii_digest[33]) +{ + md5_state_t md5; + guchar digest[16]; + + md5_init(&md5); + md5_append(&md5, (const unsigned char *)str, strlen(str)); + md5_finish(&md5, digest); + md5_digest_to_ascii(digest, ascii_digest); +} + +void +hildon_thumbnail_util_get_thumb_paths (const gchar *uri, gchar **large, gchar **normal, GError **error) +{ + gchar ascii_digest[33]; + gchar thumb_filename[128]; + + static gchar *large_dir = NULL; + static gchar *normal_dir = NULL; + + /* I know we leak, but it's better than doing memory fragementation on + * these strings ... */ + + if (!large_dir) + large_dir = g_build_filename (g_get_home_dir (), ".thumbnails", "large", NULL); + + if (!normal_dir) + normal_dir = g_build_filename (g_get_home_dir (), ".thumbnails", "normal", NULL); + + *large = NULL; + *normal = NULL; + + if(!g_file_test(large_dir, G_FILE_TEST_EXISTS)) + g_mkdir_with_parents (large_dir, 0770); + if(!g_file_test(normal_dir, G_FILE_TEST_EXISTS)) + g_mkdir_with_parents (normal_dir, 0770); + + md5_c_string (uri, ascii_digest); + + g_sprintf (thumb_filename, "%s.png", ascii_digest); + + *large = g_build_filename (large_dir, thumb_filename, NULL); + *normal = g_build_filename (normal_dir, thumb_filename, NULL); + +} Added: projects/haf/branches/hildon-thumbnail/daemonize/daemon/utils.h =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/utils.h 2008-09-04 11:58:15 UTC (rev 16010) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/utils.h 2008-09-04 15:14:28 UTC (rev 16011) @@ -0,0 +1,22 @@ +#ifndef __UTILS_H__ +#define __UTILS_H__ + +#include <glib.h> +#include <gdk-pixbuf/gdk-pixbuf.h> +#include <gio/gio.h> + +void hildon_thumbnail_util_get_thumb_paths (const gchar *uri, gchar **large, gchar **normal, GError **error); + +#ifndef g_sprintf +gint g_sprintf (gchar *string, gchar const *format, ...); +#endif + + +#ifndef gdk_pixbuf_new_from_stream_at_scale + +GdkPixbuf* gdk_pixbuf_new_from_stream_at_scale (GInputStream *stream, gint width, + gint height, gboolean preserve_aspect_ratio, + GCancellable *cancellable, GError **error); +#endif + +#endif
- Previous message: [maemo-commits] r16010 - projects/haf/tags/osso-af-startup
- Next message: [maemo-commits] r16012 - projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]