gthumb r2187 - in trunk: . src
- From: mjc svn gnome org
- To: svn-commits-list gnome org
- Subject: gthumb r2187 - in trunk: . src
- Date: Tue, 15 Jan 2008 13:38:28 +0000 (GMT)
Author: mjc
Date: Tue Jan 15 13:38:27 2008
New Revision: 2187
URL: http://svn.gnome.org/viewvc/gthumb?rev=2187&view=rev
Log:
2008-01-15 Michael J. Chudobiak <mjc svn gnome org>
* src/dlg-image-prop.c: (update_notebook_page):
* src/gth-browser.c: (window_update_image_info):
* src/gth-exif-data-viewer.c: (update_metadata),
(gth_exif_data_viewer_update):
* src/gth-exif-data-viewer.h:
* src/gth-viewer.c: (viewer_update_image_info):
Removed all libexif references from gth-exif-data-viewer.c.
Modified:
trunk/ChangeLog
trunk/src/dlg-image-prop.c
trunk/src/gth-browser.c
trunk/src/gth-exif-data-viewer.c
trunk/src/gth-exif-data-viewer.h
trunk/src/gth-viewer.c
Modified: trunk/src/dlg-image-prop.c
==============================================================================
--- trunk/src/dlg-image-prop.c (original)
+++ trunk/src/dlg-image-prop.c Tue Jan 15 13:38:27 2008
@@ -494,8 +494,7 @@
case IPROP_PAGE_EXIF:
gth_exif_data_viewer_update (GTH_EXIF_DATA_VIEWER (data->i_exif_data_view),
data->browser_viewer,
- gth_window_get_image_data (GTH_WINDOW (data->browser)),
- NULL);
+ gth_window_get_image_data (GTH_WINDOW (data->browser)));
break;
case IPROP_PAGE_HISTOGRAM:
Modified: trunk/src/gth-browser.c
==============================================================================
--- trunk/src/gth-browser.c (original)
+++ trunk/src/gth-browser.c Tue Jan 15 13:38:27 2008
@@ -620,8 +620,7 @@
gth_exif_data_viewer_update (GTH_EXIF_DATA_VIEWER (browser->priv->exif_data_viewer),
IMAGE_VIEWER (browser->priv->viewer),
- browser->priv->image,
- browser->priv->exif_data);
+ browser->priv->image);
update_image_comment (browser);
}
Modified: trunk/src/gth-exif-data-viewer.c
==============================================================================
--- trunk/src/gth-exif-data-viewer.c (original)
+++ trunk/src/gth-exif-data-viewer.c Tue Jan 15 13:38:27 2008
@@ -39,13 +39,6 @@
#include "gconf-utils.h"
#include "preferences.h"
-#include <libexif/exif-data.h>
-#include <libexif/exif-content.h>
-#include <libexif/exif-entry.h>
-#include <libexif/exif-tag.h>
-#include <libexif/exif-ifd.h>
-#include <libexif/exif-mnote-data.h>
-
char *metadata_category_name[GTH_METADATA_CATEGORIES] =
{
@@ -65,246 +58,6 @@
};
-/* The mapping between exif tags and categories was taken (and heavily modified)
- * from the eog/libeog/eog-info-view-exif.c file from the eog image viewer
- * source code, which is released under the terms of the GNU General Public
- * License.
- *
- * Note: tags are displayed in the same order they appear in this list.
- *
- * The layout of tags within a jpeg file is grouped into blocks (IFDs) called:
- * IFD0 - basic data about the main image
- * IFD1 - basic data about the thumbnail, if present
- * EXIF - more data about the main image
- * GPS - GPS related info
- * INTEROPERABILITY - compability info
- *
- */
-
-#define MAX_TAGS_PER_CATEGORY 50
-
-#define MAX_TAGS_TOTAL_INCLUDING_MAKERNOTES 2048
-/* This just needs to be set a to value larger than the maximum
- conceivable number of tags. The tags that are sorted by the
- category map will be assigned a position in the display
- lower than this. The tags that are not sorted by the
- map (they are sorted by position in the file) will be
- assigned a position higher than this. This ensures there is
- no possibility of overlap. */
-
-static ExifTag exif_tag_category_map[GTH_METADATA_CATEGORIES][MAX_TAGS_PER_CATEGORY] = {
-
- /* GTH_METADATA_CATEGORY_FILE */
- /* The filesystem info is generated and inserted by gthumb in the
- correct order, so we don't need to sort it. */
- { -1 },
-
- /* GTH_METADATA_CATEGORY_EXIF_CAMERA */
- /* This is general information about the camera, date and user,
- that exists in the IFD0 or EXIF blocks. */
- { EXIF_TAG_MAKE,
- EXIF_TAG_MODEL,
- EXIF_TAG_SOFTWARE,
-
- EXIF_TAG_DATE_TIME,
- EXIF_TAG_SUB_SEC_TIME,
- EXIF_TAG_DATE_TIME_ORIGINAL,
- EXIF_TAG_SUB_SEC_TIME_ORIGINAL,
- EXIF_TAG_DATE_TIME_DIGITIZED,
- EXIF_TAG_SUB_SEC_TIME_DIGITIZED,
-
- EXIF_TAG_USER_COMMENT,
- EXIF_TAG_IMAGE_DESCRIPTION,
- EXIF_TAG_ARTIST,
- EXIF_TAG_COPYRIGHT,
-
- EXIF_TAG_IMAGE_UNIQUE_ID,
-
- EXIF_TAG_RELATED_SOUND_FILE,
- -1 },
-
- /* GTH_METADATA_CATEGORY_EXIF_CONDITIONS */
- /* These tags describe the conditions when the photo was taken,
- and are located in the IFD0 or EXIF blocks. */
- { EXIF_TAG_ISO_SPEED_RATINGS,
- EXIF_TAG_BRIGHTNESS_VALUE,
-
- EXIF_TAG_FNUMBER,
- EXIF_TAG_APERTURE_VALUE,
- EXIF_TAG_MAX_APERTURE_VALUE,
-
- EXIF_TAG_EXPOSURE_TIME,
- EXIF_TAG_EXPOSURE_PROGRAM,
- EXIF_TAG_EXPOSURE_INDEX,
- EXIF_TAG_EXPOSURE_BIAS_VALUE,
- EXIF_TAG_EXPOSURE_MODE,
- EXIF_TAG_SHUTTER_SPEED_VALUE,
-
- EXIF_TAG_METERING_MODE,
- EXIF_TAG_LIGHT_SOURCE,
- EXIF_TAG_WHITE_BALANCE,
- EXIF_TAG_FLASH,
- EXIF_TAG_FLASH_ENERGY,
-
- EXIF_TAG_SUBJECT_DISTANCE,
- EXIF_TAG_SUBJECT_DISTANCE_RANGE,
- EXIF_TAG_SUBJECT_AREA,
- EXIF_TAG_SUBJECT_LOCATION,
-
- EXIF_TAG_FOCAL_LENGTH,
- EXIF_TAG_FOCAL_LENGTH_IN_35MM_FILM,
- EXIF_TAG_FOCAL_PLANE_X_RESOLUTION,
- EXIF_TAG_FOCAL_PLANE_Y_RESOLUTION,
- EXIF_TAG_FOCAL_PLANE_RESOLUTION_UNIT,
-
- EXIF_TAG_CONTRAST,
- EXIF_TAG_SATURATION,
- EXIF_TAG_SHARPNESS,
-
- EXIF_TAG_SCENE_TYPE,
- EXIF_TAG_SCENE_CAPTURE_TYPE,
-
- EXIF_TAG_CUSTOM_RENDERED,
-
- EXIF_TAG_DIGITAL_ZOOM_RATIO,
-
- EXIF_TAG_FILE_SOURCE,
-
- EXIF_TAG_SENSING_METHOD,
- EXIF_TAG_NEW_CFA_PATTERN,
-
- EXIF_TAG_DEVICE_SETTING_DESCRIPTION,
- EXIF_TAG_OECF,
- EXIF_TAG_SPATIAL_FREQUENCY_RESPONSE,
- EXIF_TAG_SPECTRAL_SENSITIVITY,
- EXIF_TAG_GAIN_CONTROL,
-
- -1 },
-
- /* GTH_METADATA_CATEGORY_MAKERNOTE */
- /* These tags are semi-proprietary and vary from manufacturer to
- manufacturer, so we don't bother trying to sort them. They are
- listed in the order that they appear in the jpeg file. */
- { -1 },
-
- /* GTH_METADATA_CATEGORY_GPS */
- /* GPS data is stored in a special IFD (GPS) */
- { EXIF_TAG_GPS_LATITUDE_REF,
- EXIF_TAG_GPS_LATITUDE,
- EXIF_TAG_GPS_LONGITUDE_REF,
- EXIF_TAG_GPS_LONGITUDE,
- EXIF_TAG_GPS_ALTITUDE_REF,
- EXIF_TAG_GPS_ALTITUDE,
- EXIF_TAG_GPS_TIME_STAMP,
- EXIF_TAG_GPS_SATELLITES,
- EXIF_TAG_GPS_STATUS,
- EXIF_TAG_GPS_MEASURE_MODE,
- EXIF_TAG_GPS_DOP,
- EXIF_TAG_GPS_SPEED_REF,
- EXIF_TAG_GPS_SPEED,
- EXIF_TAG_GPS_TRACK_REF,
- EXIF_TAG_GPS_TRACK,
- EXIF_TAG_GPS_IMG_DIRECTION_REF,
- EXIF_TAG_GPS_IMG_DIRECTION,
- EXIF_TAG_GPS_MAP_DATUM,
- EXIF_TAG_GPS_DEST_LATITUDE_REF,
- EXIF_TAG_GPS_DEST_LATITUDE,
- EXIF_TAG_GPS_DEST_LONGITUDE_REF,
- EXIF_TAG_GPS_DEST_LONGITUDE,
- EXIF_TAG_GPS_DEST_BEARING_REF,
- EXIF_TAG_GPS_DEST_BEARING,
- EXIF_TAG_GPS_DEST_DISTANCE_REF,
- EXIF_TAG_GPS_DEST_DISTANCE,
- EXIF_TAG_GPS_PROCESSING_METHOD,
- EXIF_TAG_GPS_AREA_INFORMATION,
- EXIF_TAG_GPS_DATE_STAMP,
- EXIF_TAG_GPS_DIFFERENTIAL,
- EXIF_TAG_GPS_VERSION_ID,
- -1 },
-
- /* GTH_METADATA_CATEGORY_EXIF_IMAGE */
- /* These tags describe the main image data structures, and
- come from the IFD0 and EXIF blocks. */
- {
-
- // Image data structure
-
- EXIF_TAG_IMAGE_WIDTH,
- EXIF_TAG_IMAGE_LENGTH,
- EXIF_TAG_PIXEL_X_DIMENSION,
- EXIF_TAG_PIXEL_Y_DIMENSION,
-
- EXIF_TAG_ORIENTATION,
-
- EXIF_TAG_X_RESOLUTION,
- EXIF_TAG_Y_RESOLUTION,
- EXIF_TAG_RESOLUTION_UNIT,
-
- EXIF_TAG_COMPRESSION,
-
- EXIF_TAG_SAMPLES_PER_PIXEL,
- EXIF_TAG_BITS_PER_SAMPLE,
-
- EXIF_TAG_PLANAR_CONFIGURATION,
- EXIF_TAG_YCBCR_SUB_SAMPLING,
- EXIF_TAG_YCBCR_POSITIONING,
- EXIF_TAG_PHOTOMETRIC_INTERPRETATION,
- EXIF_TAG_COMPONENTS_CONFIGURATION,
- EXIF_TAG_COMPRESSED_BITS_PER_PIXEL,
-
- // Offsets
-
- EXIF_TAG_STRIP_OFFSETS,
- EXIF_TAG_ROWS_PER_STRIP,
- EXIF_TAG_STRIP_BYTE_COUNTS,
- EXIF_TAG_JPEG_INTERCHANGE_FORMAT,
- EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH,
-
- // Image data characteristics
-
- EXIF_TAG_TRANSFER_FUNCTION,
- EXIF_TAG_WHITE_POINT,
- EXIF_TAG_PRIMARY_CHROMATICITIES,
- EXIF_TAG_YCBCR_COEFFICIENTS,
- EXIF_TAG_REFERENCE_BLACK_WHITE,
-
- EXIF_TAG_COLOR_SPACE,
-
- -1 },
-
- /* GTH_METADATA_CATEGORY_EXIF_THUMBNAIL */
- /* There are normally only a few of these tags, so we don't bother
- sorting them. They are displayed in the order that they appear in
- the file. IFD0 (main image) and IFD1 (thumbnail) share many of the
- same tags. The IFD0 tags are sorted by the structures above. The
- IFD1 tags are placed into this category. */
- { -1 },
-
- /* GTH_METADATA_CATEGORY_VERSIONS */
- /* From IFD0, EXIF,or INTEROPERABILITY blocks. */
- { EXIF_TAG_EXIF_VERSION,
- EXIF_TAG_FLASH_PIX_VERSION,
- EXIF_TAG_INTEROPERABILITY_INDEX,
- EXIF_TAG_INTEROPERABILITY_VERSION,
- EXIF_TAG_RELATED_IMAGE_FILE_FORMAT,
- EXIF_TAG_RELATED_IMAGE_WIDTH,
- EXIF_TAG_RELATED_IMAGE_LENGTH,
- -1 },
-
- /* GTH_METADATA_CATEGORY_XMP_EMBEDDED */
- /* Reserved for XMP, not exif */
- { -1},
-
- /* GTH_METADATA_CATEGORY_XMP_SIDECAR */
- /* Reserved for XMP, not exif */
- { -1},
-
- /* GTH_METADATA_CATEGORY_OTHER */
- /* New and unrecognized tags automatically go here. */
- { -1 }
-};
-
-
enum {
WRITEABLE_PATH_COLUMN,
NAME_COLUMN,
@@ -565,58 +318,6 @@
}
-static GthMetadataCategory
-tag_category (ExifTag tag,
- ExifIfd ifd,
- int *position)
-{
- GthMetadataCategory category;
-
- switch (ifd) {
- /* Some IFDs require special handling to ensure proper categorization.
- This is because:
- 1) IFD0 and IFD1 may duplicate some tags (with different values)
- 2) Some tag IDs (numeric values) overlap in the GPS and
- INTEROPERABILITY IFDs. */
- case EXIF_IFD_1:
- /* Data in IFD1 is for the embedded thumbnail. Keep it separate, do not sort */
- return GTH_METADATA_CATEGORY_EXIF_THUMBNAIL;
- break;
-
- case EXIF_IFD_GPS:
- /* Go straight to the GPS category if this is in a GPS IFD, to
- avoid the tag ID overlap problem. Do sort. */
- category = GTH_METADATA_CATEGORY_GPS;
- break;
-
- case EXIF_IFD_INTEROPERABILITY:
- /* Go straight to the version category if this is in an
- interop IFD, to avoid the tag ID overlap problem. Do sort. */
- category = GTH_METADATA_CATEGORY_VERSIONS;
- break;
-
- default:
- /* Start the tag search at the beginning, and use the first match */
- category = 1;
- }
-
- while (category < GTH_METADATA_CATEGORIES) {
- int j = 0;
- while (exif_tag_category_map[category][j] != -1) {
- if (exif_tag_category_map[category][j] == tag) {
- if (position != NULL)
- *position = j+1;
- return category;
- }
- j++;
- }
- category++;
- }
-
- return GTH_METADATA_CATEGORY_OTHER;
-}
-
-
static void
add_to_display (GthMetadata *entry,
GthExifDataViewer *edv)
@@ -630,164 +331,6 @@
}
-static GList *
-gth_read_exif (char *uri,
- GList *metadata,
- ExifData *edata)
-{
- unsigned int i, j, unique_id_for_unsorted_tags;
- gboolean list_is_empty = TRUE;
-
- if (edata == NULL)
- edata = gth_exif_data_new_from_uri (uri);
- else
- exif_data_ref (edata);
-
- if (edata == NULL)
- return metadata;
-
- metadata = g_list_reverse (metadata);
-
- /* Iterate through every IFD in the Exif data, checking for tags. The GPS tags are
- stored in their own private IFD. */
-
- unique_id_for_unsorted_tags = MAX_TAGS_TOTAL_INCLUDING_MAKERNOTES;
-
- for (i = 0; i < EXIF_IFD_COUNT; i++) {
- ExifContent *content = edata->ifd[i];
- const char *value;
- char *utf8_name;
- char *utf8_value;
-
- if (! edata->ifd[i] || ! edata->ifd[i]->count)
- continue;
-
- for (j = 0; j < content->count; j++) {
- ExifEntry *e = content->entries[j];
-
- if (! content->entries[j])
- continue;
-
- /* Accept all tags, but handle "maker notes" separately below */
-
- if (e->tag != EXIF_TAG_MAKER_NOTE) {
- GthMetadataCategory category;
- int position;
- GthMetadata *new_entry;
-
- /* The tag IDs for the GPS and non-GPS IFDs overlap slightly,
- so it is important to use the exif_tag_get_name_in_ifd
- function, and not the older exif_tag_get_name function. */
-
- value = exif_tag_get_name_in_ifd (e->tag, i);
-
- if (value == NULL)
- continue;
-
- utf8_name = g_strdup (value);
-
- value = get_exif_entry_value (e);
- if (value == NULL) {
- g_free (utf8_name);
- continue;
- }
-
- utf8_value = g_strdup (value);
- if ((utf8_value == NULL)
- || (*utf8_value == 0)
- || _g_utf8_all_spaces (utf8_value)) {
- g_free (utf8_name);
- g_free (utf8_value);
- continue;
- }
-
- /* Assign categories and sort positions. */
- position = 0;
- category = tag_category (e->tag, i, &position);
-
- /* The "thumbnail" and "other" categories are not sorted
- using the category map. They are simply presented in
- the order they are found in the file. */
- ++unique_id_for_unsorted_tags;
- if (!position)
- position = unique_id_for_unsorted_tags;
-
- new_entry = g_new (GthMetadata, 1);
- new_entry->category = category;
- new_entry->writeable_path = NULL;
- new_entry->display_name = g_strdup (utf8_name);
- new_entry->value = g_strdup (utf8_value);
- new_entry->position = position;
- metadata = g_list_prepend (metadata, new_entry);
-
- g_free (utf8_name);
- g_free (utf8_value);
- }
- else {
- /* Maker Notes have their own sub-structure which must be
- iterated through. libexif only knows how to handle certain
- types of manufacturer note styles. */
-
- ExifMnoteData *mnote;
- unsigned int k;
- unsigned int subnote_count;
- char mnote_buf[1024];
- GthMetadata *new_entry;
-
- mnote = exif_data_get_mnote_data (edata);
- if (mnote == NULL)
- continue;
-
- /* Supported MakerNote Found */
-
- subnote_count = exif_mnote_data_count (mnote);
-
- /* Iterate through each "sub-note" */
- for (k = 0; k < subnote_count; k++) {
- value = exif_mnote_data_get_title (mnote, k);
-
- if (value == NULL)
- continue;
-
- utf8_name = g_strdup (value);
-
- exif_mnote_data_get_value (mnote, k, mnote_buf, sizeof (mnote_buf));
-
- utf8_value = g_strdup (mnote_buf);
- if ((utf8_value == NULL)
- || (*utf8_value == 0)
- || _g_utf8_all_spaces (utf8_value)) {
- g_free (utf8_name);
- g_free (utf8_value);
- continue;
- }
-
- ++unique_id_for_unsorted_tags;
-
- new_entry = g_new (GthMetadata, 1);
- new_entry->category = GTH_METADATA_CATEGORY_MAKERNOTE;
- new_entry->writeable_path = NULL;
- new_entry->display_name = g_strdup (utf8_name);
- new_entry->value = g_strdup (utf8_value);
- new_entry->position = unique_id_for_unsorted_tags;
- metadata = g_list_prepend (metadata, new_entry);
-
- g_free (utf8_name);
- g_free (utf8_value);
- }
- }
-
- list_is_empty = FALSE;
- }
- }
-
- exif_data_unref (edata);
-
- metadata = g_list_reverse (metadata);
- return metadata;
-}
-
-
static gint
sort_by_tag_name (GthMetadata *entry1, GthMetadata *entry2)
{
@@ -796,24 +339,21 @@
static GList *
-update_metadata (GList *metadata, ExifData *existing_edata, char *uri, const char *mime_type)
+update_metadata (GList *metadata, char *uri, const char *mime_type)
{
char *local_file = NULL;
if (uri == NULL)
return metadata;
- /* for now, use both exiv2 and libexif, until we're more comfortable with exiv2 */
if ( mime_type_is_image (mime_type))
metadata = gth_read_exiv2 (uri, metadata);
- /*if ( mime_type_is (mime_type, "image/jpeg"))
- metadata = gth_read_exif (uri, metadata, existing_edata);*/
-
if ( mime_type_is_audio (mime_type) || mime_type_is_video (mime_type))
metadata = gth_read_gstreamer (uri, metadata);
- /* sort alphabetically by tag name */
+ /* Sort alphabetically by tag name. The "position" value will
+ override this sorting, if position is non-zero. */
metadata = g_list_sort (metadata, (GCompareFunc) sort_by_tag_name);
return metadata;
@@ -903,8 +443,7 @@
void
gth_exif_data_viewer_update (GthExifDataViewer *edv,
ImageViewer *viewer,
- FileData *file_data,
- gpointer exif_data)
+ FileData *file_data)
{
int i;
@@ -928,7 +467,7 @@
/* Now read metadata */
GList *metadata = NULL;
- metadata = update_metadata (metadata, exif_data, edv->priv->file->path, edv->priv->file->mime_type);
+ metadata = update_metadata (metadata, edv->priv->file->path, edv->priv->file->mime_type);
/* Display the data */
g_list_foreach (metadata, (GFunc) add_to_display, edv);
Modified: trunk/src/gth-exif-data-viewer.h
==============================================================================
--- trunk/src/gth-exif-data-viewer.h (original)
+++ trunk/src/gth-exif-data-viewer.h Tue Jan 15 13:38:27 2008
@@ -61,8 +61,7 @@
gboolean view_file_info);
void gth_exif_data_viewer_update (GthExifDataViewer *edv,
ImageViewer *viewer,
- FileData *file_data,
- gpointer exif_data);
+ FileData *file_data);
GtkWidget * gth_exif_data_viewer_get_view (GthExifDataViewer *edv);
#endif /* GTH_EXIF_DATA_VIEWER_H */
Modified: trunk/src/gth-viewer.c
==============================================================================
--- trunk/src/gth-viewer.c (original)
+++ trunk/src/gth-viewer.c Tue Jan 15 13:38:27 2008
@@ -742,8 +742,7 @@
gth_exif_data_viewer_update (GTH_EXIF_DATA_VIEWER (viewer->priv->exif_data_viewer),
IMAGE_VIEWER (viewer->priv->viewer),
- viewer->priv->image,
- viewer->priv->exif_data);
+ viewer->priv->image);
update_image_comment (viewer);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
