comparison src/exif.c @ 43:ee03f36e9e4b

Sun May 15 21:40:26 2005 John Ellis <[e-mail]> * format_raw.[ch]: New files to parse image data and exif offsets for the raw camera formats. * exif.c, image-load.c: Add support calls to format_raw.c functions above. * filelist.c: Add Fujifilm raw file extension to known formats. * thumb_standard.c (thumb_loader_std_start): Check for existing thumbnail file before checking for a failure mark. * src/Makefile.am: Add format_raw.[ch]. ##### Note: GQview CVS on sourceforge is not always up to date, please use ##### ##### an offical release when making enhancements and translation updates. #####

42:606fcf461a68

#include "intl.h"

#include "exif.h"

#include "ui_fileops.h"


/*
 *-----------------------------------------------------------------------------

 *-----------------------------------------------------------------------------
 */

#define BYTE_ORDER_INTEL	1
#define BYTE_ORDER_MOTOROLA	2
                                                                                                                          
#define MARKER_UNKNOWN		0x00
#define MARKER_SOI		0xD8
#define MARKER_APP1		0xE1

typedef struct {
	char		byte_order[2];
	uint16_t	magic;
	uint32_t	IFD_offset;
} TIFFHeader;
 
typedef struct {
	uint16_t	tag;
	uint16_t	format;
	uint32_t	nb;
	uint32_t	data;
} IFDEntry;

	exif->items = NULL;

	if ((res = parse_JPEG(exif, (unsigned char *)f, size)) == -2)
		{
		res = parse_TIFF(exif, (unsigned char *)f, size);
		}

	if (res != 0)
		{
		exif_free(exif);

43:ee03f36e9e4b

#include "intl.h"

#include "exif.h"

#include "format_raw.h"
#include "ui_fileops.h"


/*
 *-----------------------------------------------------------------------------

 *-----------------------------------------------------------------------------
 */

#define BYTE_ORDER_INTEL	1
#define BYTE_ORDER_MOTOROLA	2


#define MARKER_UNKNOWN		0x00
#define MARKER_SOI		0xD8
#define MARKER_APP1		0xE1

/* These data structs are packed to make sure the
 * byte alignment matches the on-disk data format.
 */
typedef struct __attribute__((packed)) {
	char		byte_order[2];
	uint16_t	magic;
	uint32_t	IFD_offset;
} TIFFHeader;
 
typedef struct __attribute__((packed)) {
	uint16_t	tag;
	uint16_t	format;
	uint32_t	nb;
	uint32_t	data;
} IFDEntry;

	exif->items = NULL;

	if ((res = parse_JPEG(exif, (unsigned char *)f, size)) == -2)
		{
		res = parse_TIFF(exif, (unsigned char *)f, size);
		}

	if (res != 0)
		{
		guint32 offset = 0;
		
		if (format_raw_img_exif_offsets(-1, f, size, NULL, &offset))
			{
			res = parse_TIFF(exif, (unsigned char*)f + offset, size - offset);
			}
		}

	if (res != 0)
		{
		exif_free(exif);