# HG changeset patch # User zas_ # Date 1214480920 0 # Node ID ff15a32ad17ffe5ee4933a0f426652f2753fcf54 # Parent 0c3f6ef17d182982a1fb0f33236f4113529c2521 Only define ExifOrientationType if GQ_BUILD is not defined since it is already defined in exif.h. diff -r 0c3f6ef17d18 -r ff15a32ad17f src/pixbuf-renderer.c --- a/src/pixbuf-renderer.c Wed Jun 25 20:53:52 2008 +0000 +++ b/src/pixbuf-renderer.c Thu Jun 26 11:48:40 2008 +0000 @@ -30,7 +30,19 @@ #ifdef GQ_BUILD #include "main.h" #include "pixbuf_util.h" - +#include "exif.h" +#else +typedef enum { + EXIF_ORIENTATION_UNKNOWN = 0, + EXIF_ORIENTATION_TOP_LEFT = 1, + EXIF_ORIENTATION_TOP_RIGHT = 2, + EXIF_ORIENTATION_BOTTOM_RIGHT = 3, + EXIF_ORIENTATION_BOTTOM_LEFT = 4, + EXIF_ORIENTATION_LEFT_TOP = 5, + EXIF_ORIENTATION_RIGHT_TOP = 6, + EXIF_ORIENTATION_RIGHT_BOTTOM = 7, + EXIF_ORIENTATION_LEFT_BOTTOM = 8 +} ExifOrientationType; #endif @@ -65,19 +77,6 @@ #define PR_MIN_SCALE_SIZE 8 typedef enum { - EXIF_ORIENTATION_UNKNOWN = 0, - EXIF_ORIENTATION_TOP_LEFT = 1, - EXIF_ORIENTATION_TOP_RIGHT = 2, - EXIF_ORIENTATION_BOTTOM_RIGHT = 3, - EXIF_ORIENTATION_BOTTOM_LEFT = 4, - EXIF_ORIENTATION_LEFT_TOP = 5, - EXIF_ORIENTATION_RIGHT_TOP = 6, - EXIF_ORIENTATION_RIGHT_BOTTOM = 7, - EXIF_ORIENTATION_LEFT_BOTTOM = 8 -} ExifOrientationType; - - -typedef enum { TILE_RENDER_NONE = 0, /* do nothing */ TILE_RENDER_AREA, /* render an area of the tile */ TILE_RENDER_ALL /* render the whole tile */