Skip to content

libexif is optional and is used if EPEG_USE_EXIF is defined at epeg_private.h #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jwurzer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

libexif is optional and is used if EPEG_USE_EXIF is defined at epeg_private.h #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/lib/epeg_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
#include "epeg_private.h"
#include <jerror.h>

#ifndef EPEG_USE_EXIF
/* if libexif is not used then include <sys/param.h> for MIN() and MAX() macros */
#include <sys/param.h>
#endif

static Epeg_Image *_epeg_open_header (Epeg_Image *im);
static int _epeg_decode (Epeg_Image *im);
static int _epeg_scale (Epeg_Image *im);
Expand All @@ -13,7 +18,9 @@ static void _epeg_fatal_error_handler (j_common_ptr cinfo);

static const JOCTET fake_EOI[2] = { 0xFF, JPEG_EOI };

#ifdef EPEG_USE_EXIF
static ExifByteOrder exif_byte_order = EXIF_BYTE_ORDER_INTEL;
#endif

/**
* Open a JPEG image by filename.
Expand Down Expand Up @@ -911,6 +918,7 @@ _epeg_open_header(Epeg_Image *im)
}
}
}
#ifdef EPEG_USE_EXIF
else if (m->marker == (JPEG_APP0 + 1))
{
/*
Expand All @@ -931,6 +939,7 @@ _epeg_open_header(Epeg_Image *im)
}
exif_data_unref(ed);
}
#endif
}
return im;
}
Expand Down Expand Up @@ -1174,6 +1183,7 @@ struct epeg_destination_mgr
unsigned char *buf;
};

#ifdef EPEG_USE_EXIF
/* Get an existing tag, or create one if it doesn't exist */
static ExifEntry *init_tag(ExifData *exif, ExifIfd ifd, ExifTag tag)
{
Expand All @@ -1187,6 +1197,7 @@ static ExifEntry *init_tag(ExifData *exif, ExifIfd ifd, ExifTag tag)
}
return entry;
}
#endif

static int
_epeg_encode(Epeg_Image *im)
Expand Down Expand Up @@ -1266,6 +1277,7 @@ _epeg_encode(Epeg_Image *im)
}
jpeg_start_compress(&(im->out.jinfo), TRUE);

#ifdef EPEG_USE_EXIF
/* Set the image options for Exif */
ExifData *exif = exif_data_new();
exif_data_set_option(exif, EXIF_DATA_OPTION_FOLLOW_SPECIFICATION);
Expand All @@ -1284,6 +1296,7 @@ _epeg_encode(Epeg_Image *im)
jpeg_write_marker(&(im->out.jinfo), JPEG_APP0 + 1, exif_data, exif_data_len);
exif_data_unref(exif);
free(exif_data);
#endif

/* Output comment if there is one */
if (im->out.comment && *im->out.comment)
Expand Down
6 changes: 6 additions & 0 deletions src/lib/epeg_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,13 @@
#include <sys/stat.h>
#include <setjmp.h>
#include <jpeglib.h>

/* if macro EPEG_USE_EXIF is defined then the libexif library is used */
#define EPEG_USE_EXIF

#ifdef EPEG_USE_EXIF
#include <libexif/exif-data.h>
#endif

#include "config.h"

Expand Down