Enlightenment CVS committal
Author : atmosphere
Project : e17
Module : libs/epsilon
Dir : e17/libs/epsilon/src/lib
Modified Files:
Epsilon.c Epsilon.h Epsilon_Exif.c
Log Message:
use minor/major(lvl/prop) keys for exif queries
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/epsilon/src/lib/Epsilon.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- Epsilon.c 9 Oct 2004 19:20:56 -0000 1.9
+++ Epsilon.c 17 Oct 2004 17:53:05 -0000 1.10
@@ -20,7 +20,8 @@
#define THUMBNAIL_SIZE 256
#include "exiftags/exif.h"
-extern int epsilon_info_exif_props_as_int_get (Epsilon_Info * ei, long prop);
+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);
/*
* epsilon_exif_info_get
@@ -274,11 +275,13 @@
{
if (p->w == 0)
{
- p->w = epsilon_info_exif_props_as_int_get (p, 0xa002);
+ p->w =
+ epsilon_info_exif_props_as_int_get (p, EPSILON_ED_IMG, 0xa002);
}
if (p->h == 0)
{
- p->h = epsilon_info_exif_props_as_int_get (p, 0xa003);
+ p->h =
+ epsilon_info_exif_props_as_int_get (p, EPSILON_ED_IMG, 0xa003);
}
}
return (p);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/epsilon/src/lib/Epsilon.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Epsilon.h 10 Oct 2004 00:52:38 -0000 1.5
+++ Epsilon.h 17 Oct 2004 17:53:05 -0000 1.6
@@ -7,6 +7,9 @@
typedef void Epsilon_Exif_Info;
+#define EPSILON_ED_CAM 0x02 /* Camera-specific info. */
+#define EPSILON_ED_IMG 0x04 /* Image-specific info. */
+
struct _Epsilon
{
char *hash;
@@ -55,8 +58,11 @@
Epsilon_Info *epsilon_info_get (Epsilon * e);
void epsilon_info_free (Epsilon_Info * ei);
-int epsilon_info_exif_props_as_int_get (Epsilon_Info * ei, long prop);
-const char *epsilon_info_exif_props_as_str_get (Epsilon_Info * ei, long prop);
+int epsilon_info_exif_props_as_int_get (Epsilon_Info * ei, unsigned short lvl,
+ long prop);
+const char *epsilon_info_exif_props_as_str_get (Epsilon_Info * ei,
+ unsigned short lvl,
+ long prop);
void epsilon_info_exif_props_print (Epsilon_Info * ei);
int epsilon_info_exif_get (Epsilon_Info * ei);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/epsilon/src/lib/Epsilon_Exif.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Epsilon_Exif.c 9 Oct 2004 18:54:46 -0000 1.1
+++ Epsilon_Exif.c 17 Oct 2004 17:53:05 -0000 1.2
@@ -11,12 +11,12 @@
_epsilon_exif_info_props_get (struct exifprop *list, unsigned short lvl,
int pas);
int
-epsilon_info_exif_props_as_int_get (Epsilon_Info * ei, long prop)
+epsilon_info_exif_props_as_int_get (Epsilon_Info * ei, unsigned short lvl,
+ long prop)
{
const char *n;
struct exifprop *list;
int pas = TRUE;
- unsigned short lvl = ED_IMG;
if (!ei || !ei->eei)
return (-1);
@@ -47,12 +47,12 @@
}
const char *
-epsilon_info_exif_props_as_string_get (Epsilon_Info * ei, long prop)
+epsilon_info_exif_props_as_string_get (Epsilon_Info * ei, unsigned short lvl,
+ long prop)
{
const char *n;
struct exifprop *list;
int pas = TRUE;
- unsigned short lvl = ED_IMG;
if (!ei || !ei->eei)
return (NULL);
@@ -69,6 +69,7 @@
if (list->lvl == ED_OVR || list->lvl == ED_BAD)
list->lvl = ED_VRB;
+
if (list->lvl == lvl)
{
n = list->descr ? list->descr : list->name;
@@ -129,6 +130,7 @@
case EXIF_T_EXPMODE:
case 0xa002:
case 0xa003:
+ case 0x010f:
if (list->str)
printf ("%s%s%s\n", n, " : ", list->str);
else
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
