Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/eet

Dir     : e17/libs/eet/src/lib


Modified Files:
        Eet.h eet_data.c 


Log Message:


changes to support evoak efficiently

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/eet/src/lib/Eet.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- Eet.h       17 Jan 2004 17:52:10 -0000      1.14
+++ Eet.h       21 Apr 2004 06:38:36 -0000      1.15
@@ -202,6 +202,39 @@
 /***************************************************************************/
 
    /**
+    * Read just the header data for an image and dont decode the pixels.
+    * @param ef A valid eet file handle opened for reading.
+    * @param name Name of the entry. eg: "/base/file_i_want".
+    * @param w A pointer to the int to hold the width in pixels.
+    * @param h A pointer to the int to hold the height in pixels.
+    * @param alpha A pointer to the int to hold the alpha flag.
+    * @param compress A pointer to the int to hold the compression amount.
+    * @param quality A pointer to the int to hold the quality amount.
+    * @param lossy A pointer to the int to hold the lossiness flag.
+    * @return 1 on successfull decode, 0 otherwise
+    * 
+    * This function reads an image from an eet file stored under the named
+    * key in the eet file and return a pointer to the decompressed pixel data.
+    * 
+    * The other parameters of the image (width, height etc.) are placed into
+    * the values pointed to (they must be supplied). The pixel data is a linear
+    * array of pixels starting from the top-left of the image scanning row by 
+    * row from left to right. Each pile is a 32bit value, with the high byte
+    * being the alpha channel, the next being red, then green, and the low byte
+    * being blue. The width and height are measured in pixels and will be
+    * greater than 0 when returned. The alpha flag is either 0 or 1. 0 denotes
+    * that the alpha channel is not used. 1 denotes that it is significant.
+    * Compress is filled with the compression value/amount the image was
+    * stored with. The quality value is filled with the quality encoding of
+    * the image file (0 - 100). The lossy flags is either 0 or 1 as to if
+    * the image was encoded lossily or not.
+    * 
+    * On success the function returns 1 indicating the header was read and
+    * decoded properly, or 0 on failure.
+    */
+   int       eet_data_image_header_read(Eet_File *ef, char *name, int *w, int *h, int 
*alpha, int *compress, int *quality, int *lossy);
+   
+   /**
     * Read image data from the named key in the eet file.
     * @param ef A valid eet file handle opened for reading.
     * @param name Name of the entry. eg: "/base/file_i_want".
@@ -269,6 +302,39 @@
    int       eet_data_image_write(Eet_File *ef, char *name, void *data, int w, int h, 
int alpha, int compress, int quality, int lossy);
    
    /**
+    * Decode Image data header only to get information.
+    * @param data The encoded pixel data.
+    * @param size The size, in bytes, of the encoded pixel data.
+    * @param w A pointer to the int to hold the width in pixels.
+    * @param h A pointer to the int to hold the height in pixels.
+    * @param alpha A pointer to the int to hold the alpha flag.
+    * @param compress A pointer to the int to hold the compression amount.
+    * @param quality A pointer to the int to hold the quality amount.
+    * @param lossy A pointer to the int to hold the lossiness flag.
+    * @return 1 on success, 0 on failure.
+    * 
+    * This function takes encoded pixel data and decodes it into raw RGBA
+    * pixels on success.
+    * 
+    * The other parameters of the image (width, height etc.) are placed into
+    * the values pointed to (they must be supplied). The pixel data is a linear
+    * array of pixels starting from the top-left of the image scanning row by 
+    * row from left to right. Each pixel is a 32bit value, with the high byte
+    * being the alpha channel, the next being red, then green, and the low byte
+    * being blue. The width and height are measured in pixels and will be
+    * greater than 0 when returned. The alpha flag is either 0 or 1. 0 denotes
+    * that the alpha channel is not used. 1 denotes that it is significant.
+    * Compress is filled with the compression value/amount the image was
+    * stored with. The quality value is filled with the quality encoding of
+    * the image file (0 - 100). The lossy flags is either 0 or 1 as to if
+    * the image was encoded lossily or not.
+    * 
+    * On success the function returns 1 indicating the header was read and
+    * decoded properly, or 0 on failure.
+    */
+   int       eet_data_image_header_decode(void *data, int size, int *w, int *h, int 
*alpha, int *compress, int *quality, int *lossy);
+
+   /**
     * Decode Image data into pixel data.
     * @param data The encoded pixel data.
     * @param size The size, in bytes, of the encoded pixel data.
@@ -302,6 +368,7 @@
     * values may not contain any sensible data.
     */
    void     *eet_data_image_decode(void *data, int size, int *w, int *h, int *alpha, 
int *compress, int *quality, int *lossy);
+
    /**
     * Encode image data for storage or transmission.
     * @param data A pointer to the image pixel data.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- eet_data.c  20 Jan 2004 02:02:33 -0000      1.14
+++ eet_data.c  21 Apr 2004 06:38:37 -0000      1.15
@@ -112,6 +112,7 @@
 static void _JPEGErrorHandler(j_common_ptr cinfo);
 static void _JPEGErrorHandler2(j_common_ptr cinfo, int msg_level);
 
+static int   eet_data_image_jpeg_header_decode(void *data, int size, int *w, int *h);
 static void *eet_data_image_jpeg_rgb_decode(void *data, int size, int *w, int *h);
 static void *eet_data_image_jpeg_alpha_decode(void *data, int size, unsigned int *d, 
int *w, int *h);
 static void *eet_data_image_lossless_convert(int *size, void *data, int w, int h, int 
alpha);
@@ -168,23 +169,23 @@
 
 /*---*/
 
-#define SWAP64(x) (x) = \
-   ((((x) & 0x00000000000000ff ) << 56) |\
-       (((x) & 0x000000000000ff00 ) << 40) |\
-       (((x) & 0x0000000000ff0000 ) << 24) |\
-       (((x) & 0x00000000ff000000 ) << 8) |\
-       (((x) & 0x000000ff00000000 ) >> 8) |\
-       (((x) & 0x0000ff0000000000 ) >> 24) |\
-       (((x) & 0x00ff000000000000 ) >> 40) |\
-       (((x) & 0xff00000000000000 ) >> 56))
-#define SWAP32(x) (x) = \
-   ((((x) & 0x000000ff ) << 24) |\
-       (((x) & 0x0000ff00 ) << 8) |\
-       (((x) & 0x00ff0000 ) >> 8) |\
-       (((x) & 0xff000000 ) >> 24))
-#define SWAP16(x) (x) = \
-   ((((x) & 0x00ff ) << 8) |\
-       (((x) & 0xff00 ) >> 8))
+#define SWAP64(x) (unsigned long long)(x) = \
+   ((((unsigned long long)(x) & 0x00000000000000ff ) << 56) |\
+       (((unsigned long long)(x) & 0x000000000000ff00 ) << 40) |\
+       (((unsigned long long)(x) & 0x0000000000ff0000 ) << 24) |\
+       (((unsigned long long)(x) & 0x00000000ff000000 ) << 8) |\
+       (((unsigned long long)(x) & 0x000000ff00000000 ) >> 8) |\
+       (((unsigned long long)(x) & 0x0000ff0000000000 ) >> 24) |\
+       (((unsigned long long)(x) & 0x00ff000000000000 ) >> 40) |\
+       (((unsigned long long)(x) & 0xff00000000000000 ) >> 56))
+#define SWAP32(x) (int)(x) = \
+   ((((int)(x) & 0x000000ff ) << 24) |\
+       (((int)(x) & 0x0000ff00 ) << 8) |\
+       (((int)(x) & 0x00ff0000 ) >> 8) |\
+       (((int)(x) & 0xff000000 ) >> 24))
+#define SWAP16(x) (short)(x) = \
+   ((((short)(x) & 0x00ff ) << 8) |\
+       (((short)(x) & 0xff00 ) >> 8))
 
 #define CONV8(x)
 #define CONV16(x) {if (words_bigendian) SWAP16(x);}
@@ -227,13 +228,48 @@
    msg_level = 0;
 }
 
+static int
+eet_data_image_jpeg_header_decode(void *data, int size, int *w, int *h)
+{
+   struct jpeg_decompress_struct cinfo;
+   struct _JPEG_error_mgr jerr;
+   FILE *f;
+   
+   f = _eet_memfile_read_open(data, (size_t)size);
+   if (!f) return 0;
+   cinfo.err = jpeg_std_error(&(jerr.pub));
+   jerr.pub.error_exit = _JPEGFatalErrorHandler;
+   jerr.pub.emit_message = _JPEGErrorHandler2;
+   jerr.pub.output_message = _JPEGErrorHandler;
+   if (setjmp(jerr.setjmp_buffer))
+     {
+       jpeg_destroy_decompress(&cinfo);
+       _eet_memfile_read_close(f);
+       return 0;
+     }
+   jpeg_create_decompress(&cinfo);
+   jpeg_stdio_src(&cinfo, f);
+   jpeg_read_header(&cinfo, TRUE);
+   cinfo.do_fancy_upsampling = FALSE;
+   cinfo.do_block_smoothing = FALSE;
+   jpeg_start_decompress(&cinfo);
+   
+   /* head decoding */
+   *w = cinfo.output_width;
+   *h = cinfo.output_height;
+   /* end head decoding */
+   jpeg_destroy_decompress(&cinfo);
+   _eet_memfile_read_close(f);
+   return 1;
+}
+
 static void *
 eet_data_image_jpeg_rgb_decode(void *data, int size, int *w, int *h)
 {
    unsigned int *d;
    struct jpeg_decompress_struct cinfo;
    struct _JPEG_error_mgr jerr;
-   unsigned char *ptr, *line[16], *tdata;
+   unsigned char *ptr, *line[16], *tdata = NULL;
    unsigned int *ptr2;
    int x, y, l, i, scans, count, prevy;
    FILE *f;
@@ -246,6 +282,7 @@
    jerr.pub.output_message = _JPEGErrorHandler;
    if (setjmp(jerr.setjmp_buffer))
      {
+       if (tdata) free(tdata);
        jpeg_destroy_decompress(&cinfo);
        _eet_memfile_read_close(f);
        return NULL;
@@ -343,7 +380,7 @@
 {
    struct jpeg_decompress_struct cinfo;
    struct _JPEG_error_mgr jerr;
-   unsigned char *ptr, *line[16], *tdata;
+   unsigned char *ptr, *line[16], *tdata = NULL;
    unsigned int *ptr2;
    int x, y, l, i, scans, count, prevy;
    FILE *f;
@@ -356,6 +393,7 @@
    jerr.pub.output_message = _JPEGErrorHandler;
    if (setjmp(jerr.setjmp_buffer))
      {
+       if (tdata) free(tdata);
        jpeg_destroy_decompress(&cinfo);
        _eet_memfile_read_close(f);
        return NULL;
@@ -922,26 +960,26 @@
 static int
 eet_data_get_long_long(void *src, void *src_end, void *dst)
 {
-   long long *d;
+   unsigned long long *d;
    
-   if ((src + sizeof(long long)) > src_end) return -1;
-   memcpy(dst, src, sizeof(long long));
-   d = (long long *)dst;
+   if ((src + sizeof(unsigned long long)) > src_end) return -1;
+   memcpy(dst, src, sizeof(unsigned long long));
+   d = (unsigned long long *)dst;
    CONV64(*d);
-   return sizeof(long long);
+   return sizeof(unsigned long long);
 }
 
 static void *
 eet_data_put_long_long(void *src, int *size_ret)
 {
-   long long *s, *d;
+   unsigned long long *s, *d;
    
-   d = (long long *)malloc(sizeof(long long));
+   d = (unsigned long long *)malloc(sizeof(unsigned long long));
    if (!d) return NULL;
-   s = (long long *)src;
+   s = (unsigned long long *)src;
    *d = *s;
    CONV64(*d);
-   *size_ret = sizeof(long long);
+   *size_ret = sizeof(unsigned long long);
    return d;
 }
 
@@ -1264,6 +1302,22 @@
    return d;
 }
 
+int
+eet_data_image_header_read(Eet_File *ef, char *name,
+                          int *w, int *h, int *alpha,
+                          int *compress, int *quality, int *lossy)
+{
+   void *data;
+   int size;
+   int d;
+ 
+   data = eet_read(ef, name, &size);
+   if (!data) return 0;
+   d = eet_data_image_header_decode(data, size, w, h, alpha, compress, quality, 
lossy);
+   free(data);
+   return d;
+}
+
 void *
 eet_data_image_encode(void *data, int *size_ret, int w, int h, int alpha, int 
compress, int quality, int lossy)
 {
@@ -1288,6 +1342,91 @@
    return d;
 }
 
+int
+eet_data_image_header_decode(void *data, int size, int *w, int *h, int *alpha, int 
*compress, int *quality, int *lossy)
+{
+   int header[8];
+   
+   if (words_bigendian == -1)
+     {
+       unsigned long int v;
+
+       v = htonl(0x12345678);
+       if (v == 0x12345678) words_bigendian = 1;
+       else words_bigendian = 0;
+     }
+   
+   if (size < 32) return 0;
+
+   memcpy(header, data, 32);
+   if (words_bigendian)
+     {
+       int i;
+       
+       for (i = 0; i < 8; i++) SWAP32(header[i]);           
+     }
+   if (header[0] == 0xac1dfeed)
+     {
+       int iw, ih, al, cp;
+       unsigned int *body;
+       
+       iw = header[1];
+       ih = header[2];
+       al = header[3];
+       cp = header[4];
+       if ((iw > 8192) || (ih > 8192)) return 0;
+       if ((cp == 0) && (size < ((iw * ih * 4) + 32))) return 0;
+       if (w) *w = iw;
+       if (h) *h = ih;
+       if (alpha) *alpha = al;
+       if (compress) *compress = cp;
+       if (lossy) *lossy = 0;
+       if (quality) *quality = 100;
+       return 1;
+     }
+   else if (header[0] == 0xbeeff00d)
+     {
+       int iw = 0, ih = 0;
+       int sz1, sz2;
+       unsigned char *dt;
+       int ok;
+       
+       sz1 = header[1];
+       sz2 = header[2];
+       dt = data;
+       dt += 12;
+       ok = eet_data_image_jpeg_header_decode(dt, sz1, &iw, &ih);
+       if (ok)
+         {
+            if (w) *w = iw;
+            if (h) *h = ih;
+            if (alpha) *alpha = 1;
+            if (compress) *compress = 0;
+            if (lossy) *lossy = 1;
+            if (quality) *quality = 75;
+            return 1;
+         }
+     }
+   else
+     {
+       int iw = 0, ih = 0;
+       int ok;
+       
+       ok = eet_data_image_jpeg_header_decode(data, size, &iw, &ih);
+       if (ok)
+         {
+            if (w) *w = iw;
+            if (h) *h = ih;
+            if (alpha) *alpha = 0;
+            if (compress) *compress = 0;
+            if (lossy) *lossy = 1;
+            if (quality) *quality = 75;
+            return 1;
+         }
+     }
+   return 0;
+}
+
 void *
 eet_data_image_decode(void *data, int size, int *w, int *h, int *alpha, int 
*compress, int *quality, int *lossy)
 {




-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to