gthumb r2276 - in trunk: . libgthumb/jpegutils

[mjc svn gnome org]

Author: mjc
Date: Sun Feb 10 17:20:10 2008
New Revision: 2276
URL: http://svn.gnome.org/viewvc/gthumb?rev=2276&view=rev

Log:
2008-02-10  Michael J. Chudobiak  <mjc svn gnome org>

        * libgthumb/jpegutils/jpeg-data.c: (jpeg_data_save_data),
        (jpeg_data_load_data), (jpeg_data_free), (jpeg_data_dump):
        * libgthumb/jpegutils/jpeg-data.h:
        * libgthumb/jpegutils/jpegtran.c:
        Deleted libexif bits that were previously overlooked.



Modified:
   trunk/ChangeLog
   trunk/libgthumb/jpegutils/jpeg-data.c
   trunk/libgthumb/jpegutils/jpeg-data.h
   trunk/libgthumb/jpegutils/jpegtran.c

Modified: trunk/libgthumb/jpegutils/jpeg-data.c
==============================================================================
--- trunk/libgthumb/jpegutils/jpeg-data.c	(original)
+++ trunk/libgthumb/jpegutils/jpeg-data.c	Sun Feb 10 17:20:10 2008
@@ -102,9 +102,8 @@
 void
 jpeg_data_save_data (JPEGData *data, unsigned char **d, unsigned int *ds)
 {
-	unsigned int i, eds = 0;
+	unsigned int i;
 	JPEGSection s;
-	unsigned char *ed = NULL;
 
 	if (!data)
 		return;
@@ -129,18 +128,7 @@
 		switch (s.marker) {
 		case JPEG_MARKER_SOI:
 		case JPEG_MARKER_EOI:
-			break;
 		case JPEG_MARKER_APP1:
-			exif_data_save_data (s.content.app1, &ed, &eds);
-			if (!ed) break;
-			*d = realloc (*d, sizeof (char) * (*ds + 2));
-			(*d)[*ds + 0] = (eds + 2) >> 8;
-			(*d)[*ds + 1] = (eds + 2) >> 0;
-			*ds += 2;
-			*d = realloc (*d, sizeof (char) * (*ds + eds));
-			memcpy (*d + *ds, ed, eds);
-			*ds += eds;
-			free (ed);
 			break;
 		default:
 			*d = realloc (*d, sizeof (char) *
@@ -219,6 +207,7 @@
 		switch (s->marker) {
 		case JPEG_MARKER_SOI:
 		case JPEG_MARKER_EOI:
+		case JPEG_MARKER_APP1:
 			break;
 		default:
 
@@ -228,27 +217,19 @@
 			o += 2;
 			if (o + len > size) { o = size; break; }
 
-			switch (s->marker) {
-			case JPEG_MARKER_APP1:
-				s->content.app1 = exif_data_new_from_data (
-							d + o - 4, len + 4);
-				break;
-			default:
-				s->content.generic.size = len;
-				s->content.generic.data =
-						malloc (sizeof (char) * len);
-				memcpy (s->content.generic.data, &d[o], len);
-
-				/* In case of SOS, image data will follow. */
-				if (s->marker == JPEG_MARKER_SOS) {
-					data->size = size - 2 - o - len;
-					data->data = malloc (
-						sizeof (char) * data->size);
-					memcpy (data->data, d + o + len,
-						data->size);
-					o += data->size;
-				}
-				break;
+			s->content.generic.size = len;
+			s->content.generic.data =
+					malloc (sizeof (char) * len);
+			memcpy (s->content.generic.data, &d[o], len);
+
+			/* In case of SOS, image data will follow. */
+			if (s->marker == JPEG_MARKER_SOS) {
+				data->size = size - 2 - o - len;
+				data->data = malloc (
+					sizeof (char) * data->size);
+				memcpy (data->data, d + o + len,
+					data->size);
+				o += data->size;
 			}
 			o += len;
 			break;
@@ -336,9 +317,7 @@
 			switch (s.marker) {
 			case JPEG_MARKER_SOI:
 			case JPEG_MARKER_EOI:
-				break;
 			case JPEG_MARKER_APP1:
-				exif_data_unref (s.content.app1);
 				break;
 			default:
 				free (s.content.generic.data);
@@ -391,9 +370,7 @@
 		switch (marker) {
                 case JPEG_MARKER_SOI:
                 case JPEG_MARKER_EOI:
-			break;
                 case JPEG_MARKER_APP1:
-			exif_data_dump (content.app1);
 			break;
                 default:
 			printf ("  Size: %i\n", content.generic.size);
@@ -404,43 +381,6 @@
 }
 
 
-ExifData *
-jpeg_data_get_exif_data (JPEGData *data)
-{
-	JPEGSection *section;
-
-	if (!data)
-		return NULL;
-
-	section = jpeg_data_get_section (data, JPEG_MARKER_APP1);
-	if (section) {
-		exif_data_ref (section->content.app1);
-		return (section->content.app1);
-	}
-
-	return (NULL);
-}
-
-void
-jpeg_data_set_exif_data (JPEGData *data, ExifData *exif_data)
-{
-	JPEGSection *section;
-
-	section = jpeg_data_get_section (data, JPEG_MARKER_APP1);
-	if (!section) {
-		jpeg_data_append_section (data);
-		memmove (&data->sections[2], &data->sections[1],
-			 sizeof (JPEGSection) * (data->count - 2));
-		section = &data->sections[1];
-	} else {
-		exif_data_unref (section->content.app1);
-	}
-	section->marker = JPEG_MARKER_APP1;
-	section->content.app1 = exif_data;
-	exif_data_ref (exif_data);
-}
-
-
 void
 jpeg_data_set_header_data (JPEGData *data, JPEGMarker marker,
 			   unsigned char *buf, unsigned int size)

Modified: trunk/libgthumb/jpegutils/jpeg-data.h
==============================================================================
--- trunk/libgthumb/jpegutils/jpeg-data.h	(original)
+++ trunk/libgthumb/jpegutils/jpeg-data.h	Sun Feb 10 17:20:10 2008
@@ -22,9 +22,7 @@
 #define __JPEG_DATA_H__
 
 #include "jpeg-marker.h"
-#include <libexif/exif-data.h>
 
-typedef ExifData * JPEGContentAPP1;
 
 typedef struct _JPEGContentGeneric JPEGContentGeneric;
 struct _JPEGContentGeneric
@@ -37,7 +35,6 @@
 union _JPEGContent
 {
 	JPEGContentGeneric generic;
-	JPEGContentAPP1    app1;
 };
 
 typedef struct _JPEGSection JPEGSection;
@@ -78,10 +75,6 @@
 void      jpeg_data_load_file     (JPEGData *data, const char *path);
 int       jpeg_data_save_file     (JPEGData *data, const char *path);
 
-void      jpeg_data_set_exif_data (JPEGData *data, ExifData *exif_data);
-
-ExifData *jpeg_data_get_exif_data (JPEGData *data);
-
 void      jpeg_data_set_header_data (JPEGData *data, JPEGMarker marker,
 				     unsigned char * buf, unsigned int size);
 

Modified: trunk/libgthumb/jpegutils/jpegtran.c
==============================================================================
--- trunk/libgthumb/jpegutils/jpegtran.c	(original)
+++ trunk/libgthumb/jpegutils/jpegtran.c	Sun Feb 10 17:20:10 2008
@@ -98,30 +98,6 @@
 }
 
 
-void
-set_exif_orientation_to_top_left (ExifData *edata)
-{
-	unsigned int  i;
-	ExifByteOrder byte_order;
-
-	if (edata == NULL)
-		return;
-
-	byte_order = exif_data_get_byte_order (edata);
-
-	for (i = 0; i < EXIF_IFD_COUNT; i++) {
-		ExifContent *content = edata->ifd[i];
-		ExifEntry   *entry;
-
-		if ((content == NULL) || (content->count == 0))
-			continue;
-
-		entry = exif_content_get_entry (content, EXIF_TAG_ORIENTATION);
-		if (entry != NULL)
-			exif_set_short (entry->data, byte_order, 1);
-	}
-}
-
 
 static void
 update_exif_dimensions (GList       *metadata,