Enlightenment CVS committal

Author  : atmosphere
Project : e17
Module  : libs/epsilon

Dir     : e17/libs/epsilon/src/lib


Modified Files:
        Epsilon.c Epsilon.h Makefile.am 


Log Message:
edje thumbnailing patch from jerome wilson(wilanje), untested
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/epsilon/src/lib/Epsilon.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- Epsilon.c   1 Feb 2005 03:24:11 -0000       1.11
+++ Epsilon.c   16 Jul 2005 15:50:10 -0000      1.12
@@ -20,6 +20,10 @@
 #define THUMBNAIL_SIZE 256
 #include "exiftags/exif.h"
 
+#include <Evas.h>
+#include <Ecore_Evas.h>
+#include <Edje.h>
+
 extern int epsilon_info_exif_props_as_int_get (Epsilon_Info * ei, unsigned
                                               short lvl, long prop);
 extern void epsilon_exif_info_free (Epsilon_Exif_Info * eei);
@@ -51,7 +55,6 @@
          result = malloc (sizeof (Epsilon));
          memset (result, 0, sizeof (Epsilon));
          result->src = strdup (file);
-         result->hash = epsilon_hash (result->src);
        }
       else
        {
@@ -67,6 +70,8 @@
 {
   if (e)
     {
+      if (e->key)
+       free (e->key);
       if (e->hash)
        free (e->hash);
       if (e->src)
@@ -94,6 +99,31 @@
     }
 }
 
+void
+epsilon_key_set (Epsilon * e, const char *key)
+{
+  if (e)
+    {
+      if (e->key)
+       free (e->key);
+      if (key)
+       e->key = strdup (key);
+      else
+       e->key = NULL;
+    }
+}
+
+void
+epsilon_resolution_set (Epsilon * e, int w, int h)
+{
+  if (e && w > 0 && h > 0)
+    {
+      char buf[PATH_MAX];
+      e->w = w;
+      e->h = h;
+    }
+}
+
 const char *
 epsilon_file_get (Epsilon * e)
 {
@@ -307,6 +337,37 @@
   char *dirs[] = { "large", "normal", "fail/epsilon" };
   char home[PATH_MAX], buf[PATH_MAX];
 
+  char *hash_seed = NULL;
+
+  if (!e || !e->src)
+    return (EPSILON_FAIL);
+
+  if (!e->hash)
+    {
+      hash_seed = malloc (PATH_MAX * sizeof (char));
+      memset (hash_seed, 0, PATH_MAX * sizeof (char));
+
+      if (e->key)
+       {
+         snprintf (buf, PATH_MAX, "%s:%s", e->src, e->key);
+         strcat (hash_seed, buf);
+       }
+
+      if ((e->w > 0) && (e->h > 0))
+       {
+         snprintf (buf, PATH_MAX, ":%dx%d", e->w, e->h);
+         strcat (hash_seed, buf);
+       }
+
+      if (hash_seed)
+       e->hash = epsilon_hash (hash_seed);
+      else
+       e->hash = epsilon_hash (e->src);
+    }
+
+  if (!e->hash)
+    return (EPSILON_FAIL);
+
   snprintf (home, PATH_MAX, "%s", getenv ("HOME"));
   for (i = 0; i < 3; i++)
     {
@@ -357,7 +418,7 @@
   int len = 0;
 #endif
 
-  if (!e || !e->hash || !e->src)
+  if (!e || !e->src || !e->hash)
     return (EPSILON_FAIL);
 #ifdef HAVE_EPEG_H
   len = strlen (e->src);
@@ -369,23 +430,23 @@
                getenv ("HOME"), e->hash);
       epeg_thumbnail_comments_get (im, &info);
       epeg_size_get (im, &iw, &ih);
-       if (iw > ih)
-         {
-          th = THUMBNAIL_SIZE * ((double) ih / (double) iw);
-         }
-       else
-         {
-          tw = THUMBNAIL_SIZE * ((double) iw / (double) ih);
-         }
-         epeg_decode_size_set (im, tw, th);
+      if (iw > ih)
+       {
+         th = THUMBNAIL_SIZE * ((double) ih / (double) iw);
+       }
+      else
+       {
+         tw = THUMBNAIL_SIZE * ((double) iw / (double) ih);
+       }
+      epeg_decode_size_set (im, tw, th);
       epeg_quality_set (im, 100);
       epeg_thumbnail_comments_enable (im, 1);
       epeg_file_output_set (im, outfile);
-      if(!epeg_encode (im)) 
-      {
-        epeg_close (im);
-        return (EPSILON_OK);
-      }
+      if (!epeg_encode (im))
+       {
+         epeg_close (im);
+         return (EPSILON_OK);
+       }
       epeg_close (im);
     }
 #endif
@@ -394,17 +455,83 @@
     char uri[PATH_MAX];
     char format[32];
     struct stat filestatus;
+    int isedje = 0;
     Imlib_Image tmp = NULL;
     Imlib_Image src = NULL;
+    Ecore_Evas *ee = NULL;
 
     if (stat (e->src, &filestatus) != 0)
       return (EPSILON_FAIL);
 
     mtime = filestatus.st_mtime;
-    if ((tmp = imlib_load_image_immediately_without_cache (e->src)))
+
+    len = strlen (e->src);
+
+    if ((len > 4) && (!strcmp (&e->src[len - 3], "edj")))
+      {
+       Evas *evas = NULL;
+       Evas_Object *edje = NULL;
+       const int *pixels;
+       int w, h;
+       edje_init ();
+       if (!e->key)
+         {
+           fprintf (stderr, "Key required for this file type! ERROR!!\n");
+           return (EPSILON_FAIL);
+         }
+
+       isedje = 1;
+       if (e->w > 0)
+         w = e->w;
+       else
+         w = THUMBNAIL_SIZE;
+
+       if (e->h > 0)
+         h = e->h;
+       else
+         h = THUMBNAIL_SIZE;
+
+       ee = ecore_evas_buffer_new (w, h);
+       if (ee)
+         {
+           evas = ecore_evas_get (ee);
+           edje = edje_object_add (evas);
+           if (edje_object_file_set (edje, e->src, e->key))
+             {
+               evas_object_move (edje, 0, 0);
+               evas_object_resize (edje, w, h);
+               evas_object_show (edje);
+               edje_message_signal_process ();
+
+               pixels = ecore_evas_buffer_pixels_get (ee);
+               tmp = imlib_create_image_using_data (w, h, (DATA32 *) pixels);
+
+               imlib_context_set_image (tmp);
+               snprintf (format, 32, "image/edje");
+             }
+           else
+             {
+               printf ("Cannot load file %s, group %s\n", e->src, e->key);
+               return (EPSILON_FAIL);
+             }
+         }
+       else
+         {
+           fprintf (fprintf, "Cannot create buffer canvas! ERROR!\n");
+           return (EPSILON_FAIL);
+         }
+      }
+
+
+    if (!tmp)
       {
+       tmp = imlib_load_image_immediately_without_cache (e->src);
        imlib_context_set_image (tmp);
        snprintf (format, 32, "image/%s", imlib_image_format ());
+      }
+
+    if (tmp)
+      {
        iw = imlib_image_get_width ();
        ih = imlib_image_get_height ();
        if (iw > ih)
@@ -668,11 +795,13 @@
       if (!rename (tmpfile, file))
        {
          if (chmod (file, S_IWUSR | S_IRUSR))
-           printf ("epsilon: could not set permissions on \"%s\"!?\n", file);
+           fprintf (stderr,
+                    "epsilon: could not set permissions on \"%s\"!?\n",
+                    file);
        }
     }
   else
-    printf ("epsilon: Unable to open \"%s\" for writing\n", tmpfile);
+    fprintf (stderr, "epsilon: Unable to open \"%s\" for writing\n", tmpfile);
 
   fflush (fp);
   if (fp)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/epsilon/src/lib/Epsilon.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Epsilon.h   22 Oct 2004 21:25:57 -0000      1.7
+++ Epsilon.h   16 Jul 2005 15:50:10 -0000      1.8
@@ -15,6 +15,8 @@
   char *hash;
   char *src;
   char *thumb;
+  char *key;
+  int w, h;
 };
 typedef struct _Epsilon Epsilon;
 
@@ -35,6 +37,11 @@
 void epsilon_free (Epsilon * e);
 Epsilon *epsilon_new (const char *file);
 
+/* Set the part name as key (Edje for now)*/
+void epsilon_key_set (Epsilon * e, const char *key);
+/* Set the resolution*/
+void epsilon_resoltion_set (Epsilon * e, int w, int h);
+
 /*
  * the source filename
  */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/epsilon/src/lib/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Makefile.am 26 Oct 2004 06:41:29 -0000      1.5
+++ Makefile.am 16 Jul 2005 15:50:10 -0000      1.6
@@ -6,7 +6,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 SUBDIRS              = exiftags
 
-INCLUDES            = -I$(includedir) @imlib_cflags@ @epeg_cflags@
+INCLUDES            = -I$(includedir) @imlib_cflags@ @epeg_cflags@ 
@ecore_cflags@ @evas_cflags@ @edje_cflags@
 
 lib_LTLIBRARIES      = libepsilon.la
 include_HEADERS      = Epsilon.h
@@ -15,6 +15,6 @@
 Epsilon_Exif.c \
 md5.c md5.h
 
-libepsilon_la_LIBADD   = exiftags/libepsilon_exiftags.la @imlib_libs@ 
@epeg_libs@
+libepsilon_la_LIBADD   = exiftags/libepsilon_exiftags.la @imlib_libs@ 
@epeg_libs@ @ecore_libs@ @evas_libs@ @edje_libs@
 libepsilon_la_DEPENDENCIES = ../config.h 
 libepsilon_la_LDFLAGS      = $(LDFLAGS) -version-info 0:1:0




-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to