This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git.
The branch, master has been updated via 143e4e08779b9dcd3aeed69e2de28c64d9c3d4d0 (commit) via 6d6eb1804dbbcf8a8507f2cd2474a3c282a1633b (commit) from 84df46f7a343005a0edbb3a744e8a62a109864ea (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/143e4e08779b9dcd3aeed69e2de28c64d9c3d...
commit 143e4e08779b9dcd3aeed69e2de28c64d9c3d4d0 Author: Cyril Hrubis metan@ucw.cz Date: Sun Feb 8 10:58:16 2015 +0100
Exif: Add a few more tags.
Signed-off-by: Cyril Hrubis metan@ucw.cz
diff --git a/libs/loaders/GP_Exif.c b/libs/loaders/GP_Exif.c index f936589..99f49f7 100644 --- a/libs/loaders/GP_Exif.c +++ b/libs/loaders/GP_Exif.c @@ -174,16 +174,29 @@ enum IFD_tags { IFD_EXIF_IMAGE_HEIGHT = 0xa003, /* May store related audio filename */ IFD_RELATED_SOUND_FILE = 0xa004, + /* */ + IFD_FOCAL_PLANE_X_RESOLUTION = 0xa20e, + IFD_FOCAL_PLANE_Y_RESOLUTION = 0xa20f, + /* 1 = No unit, 2 = Inch (default), 3 = Centimeter */ + IFD_FOCAL_PLANE_RESOLUTION_UNIT = 0xa210, /* TODO: enum of sensing methods */ IFD_SENSING_METHOD = 0xa217, IFD_FILE_SOURCE = 0xa300, IFD_SCENE_TYPE = 0xa301, /* 0 = Normal, 1 = Custom */ - IFD_CUSTOM_RENDERER = 0x0a401, + IFD_CUSTOM_RENDERER = 0xa401, /* 0 = Auto, 1 = Manual, 2 = Auto bracket */ - IFD_EXPOSURE_MODE = 0x0a402, + IFD_EXPOSURE_MODE = 0xa402, /* 0 = Auto, 1 = Manual */ - IFD_WHITE_BALANCE = 0x0a403, + IFD_WHITE_BALANCE = 0xa403, + /* 0 = Standard, 1 = Landscape, 2 = Portrait, 3 = Night Scene */ + IFD_SCENE_CAPTURE_TYPE = 0xa406, + /* 0 = Normal, 1 = Soft, 2 = Hard */ + IFD_CONTRAST = 0xa408, + /* 0 = Normal, 1 = Low Saturation, 2 = Hight Saturation */ + IFD_SATURATION = 0xa409, + /* 0 = Normal, 1 = Sort, 2 = Hard */ + IFD_SHARPNESS = 0xa40a, };
struct IFD_tag { @@ -255,12 +268,19 @@ static const struct IFD_tag IFD_tags[] = { {IFD_EXIF_IMAGE_WIDTH, "Exif Image Width", IFD_UNSIGNED_LONG, 1}, {IFD_EXIF_IMAGE_HEIGHT, "Exif Image Height", IFD_UNSIGNED_LONG, 1}, {IFD_RELATED_SOUND_FILE, "Related Soundfile", IFD_ASCII_STRING, 0}, + {IFD_FOCAL_PLANE_X_RESOLUTION, "Focal Plane X Resolution", IFD_UNSIGNED_RATIONAL, 1}, + {IFD_FOCAL_PLANE_Y_RESOLUTION, "Focal Plane Y Resolution", IFD_UNSIGNED_RATIONAL, 1}, + {IFD_FOCAL_PLANE_RESOLUTION_UNIT, "Focal Plane Resolution Unit", IFD_UNSIGNED_SHORT, 1}, {IFD_SENSING_METHOD, "Sensing Method", IFD_UNSIGNED_SHORT, 1}, {IFD_FILE_SOURCE, "File Source", IFD_UNDEFINED, 1}, {IFD_SCENE_TYPE, "Scene Type", IFD_UNDEFINED, 1}, {IFD_CUSTOM_RENDERER, "Custom Renderer", IFD_UNSIGNED_SHORT, 1}, {IFD_EXPOSURE_MODE, "Exposure Mode", IFD_UNSIGNED_SHORT, 1}, {IFD_WHITE_BALANCE, "White Balance", IFD_UNSIGNED_SHORT, 1}, + {IFD_SCENE_CAPTURE_TYPE, "Scene Capture Type", IFD_UNSIGNED_SHORT, 1}, + {IFD_CONTRAST, "Contrast", IFD_UNSIGNED_SHORT, 1}, + {IFD_SATURATION, "Saturation", IFD_UNSIGNED_SHORT, 1}, + {IFD_SHARPNESS, "Sharpness", IFD_UNSIGNED_SHORT, 1}, };
static const char *IFD_format_name(uint16_t format)
http://repo.or.cz/w/gfxprim.git/commit/6d6eb1804dbbcf8a8507f2cd2474a3c282a16...
commit 6d6eb1804dbbcf8a8507f2cd2474a3c282a1633b Author: Cyril Hrubis metan@ucw.cz Date: Sun Feb 8 11:26:04 2015 +0100
loaders: DataStorage: Fix segfault.
Fix segfault in GP_DataStorageGetByPath() in debug message that dereferenced possibly NULL pointer.
Signed-off-by: Cyril Hrubis metan@ucw.cz
diff --git a/libs/loaders/GP_DataStorage.c b/libs/loaders/GP_DataStorage.c index b6e9db9..cb02425 100644 --- a/libs/loaders/GP_DataStorage.c +++ b/libs/loaders/GP_DataStorage.c @@ -320,6 +320,9 @@ static struct GP_DataNode *get_by_path(GP_DataNode *node, const char *path)
node = lookup(node, path, i);
+ if (!node) + return NULL; + GP_DEBUG(3, "Lookup has node '%s'", node->id);
if (path[i] == '/')
-----------------------------------------------------------------------
Summary of changes: libs/loaders/GP_DataStorage.c | 3 +++ libs/loaders/GP_Exif.c | 26 +++++++++++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-)
repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos@gmail.com if you want to unsubscribe, or site admin admin@repo.or.cz if you receive no reply.