diff options
| author | Lucas Rocha <lucasr@gnome.org> | 2007-03-17 22:19:09 +0000 |
|---|---|---|
| committer | Lucas Almeida Rocha <lucasr@src.gnome.org> | 2007-03-17 22:19:09 +0000 |
| commit | 9ac162fa8eddb77f2760a01b1b1315f202a8366c (patch) | |
| tree | 450c0c5269b2befa452619293d801afdf0de9cc7 /src/eog-metadata-reader.c | |
| parent | 4aaab084893195f2c8232475fbbbf9e83082d276 (diff) | |
| download | eog-ng.tar.gz | |
Restabilished ICC profiling functionality with full code refactoring.eog-ng
2007-03-18 Lucas Rocha <lucasr@gnome.org>
Restabilished ICC profiling functionality with full code refactoring.
* src/eog-debug.[ch] (eog_debug_init): added EOG_DEBUG_LCMS for ICC
profiles debugging.
* src/eog-image.[ch] (eog_image_get_profile,
eog_image_apply_display_profile, eog_image_set_icc_data,
eog_image_real_load): load embedded ICC profile from the image if
present.
* src/eog-metadata-reader.[ch] (eog_metadata_reader_get_icc_chunk,
eog_metadata_reader_get_icc_chunk_size): unify ICC functions for
consistency.
* src/eog-window.c (eog_job_load_cb, eog_window_init,
eog_job_model_cb, eog_window_dispose,
eog_window_get_display_profile): load and cache display profile
to be applied on images just after they are successfully loaded.
svn path=/branches/eog-ng/; revision=3650
Diffstat (limited to 'src/eog-metadata-reader.c')
| -rw-r--r-- | src/eog-metadata-reader.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/src/eog-metadata-reader.c b/src/eog-metadata-reader.c index b49d0b7c..c3223750 100644 --- a/src/eog-metadata-reader.c +++ b/src/eog-metadata-reader.c @@ -154,7 +154,7 @@ eog_metadata_reader_consume (EogMetadataReader *emr, guchar *buf, guint len) priv->size = 0; priv->state = EMR_READ_SIZE_HIGH_BYTE; - eog_debug_message (DEBUG_IMAGE_DATA, "APPx Marker Found: %x\n", priv->last_marker); + eog_debug_message (DEBUG_IMAGE_DATA, "APPx Marker Found: %x", priv->last_marker); } else { /* otherwise simply consume the byte */ @@ -342,20 +342,16 @@ eog_metadata_reader_get_exif_data (EogMetadataReader *emr) * parse the sections and construct a single memory chunk, or maybe even parse * the profile. */ - -gpointer -eog_metadata_reader_get_icc_chunk (EogMetadataReader *emr) +void +eog_metadata_reader_get_icc_chunk (EogMetadataReader *emr, guchar **data, guint *len) { - g_return_val_if_fail (EOG_IS_METADATA_READER (emr), NULL); - if (emr->priv->icc_chunk) - return emr->priv->icc_chunk + 14; - else - return NULL; -} + EogMetadataReaderPrivate *priv; + + g_return_if_fail (EOG_IS_METADATA_READER (emr)); + priv = emr->priv; -guint -eog_metadata_reader_get_icc_chunk_size (EogMetadataReader *emr) -{ - g_return_val_if_fail (EOG_IS_METADATA_READER (emr), -1); - return emr->priv->icc_len - 14; + if (priv->icc_chunk) { + *data = (guchar*) priv->icc_chunk + 14; + *len = priv->icc_len - 14; + } } |