darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added EXIF & GPContext support

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4352 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Raymond Penners
2002-03-27 22:37:02 +00:00
parent e335be16d3
commit ebe20b77bf
4 changed files with 73 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
camlibs/sonydscf55/ChangeLog Normal file
View File

@@ -0,0 +1,5 @@
2002-03-27 Raymond Penners <raymond@dotsphinx.com>
* *.[ch]: Made driver GPContext aware (i.e., operations can now be
cancelled), and added support for EXIF information.

9
camlibs/sonydscf55/camera.c
View File

@@ -138,10 +138,13 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
switch (type) {
case GP_FILE_TYPE_NORMAL:
rc = sony_image_get(camera, num, file);
rc = sony_image_get(camera, num, file, context);
break;
case GP_FILE_TYPE_PREVIEW:
rc = sony_thumbnail_get(camera, num, file);
rc = sony_thumbnail_get(camera, num, file, context);
break;
case GP_FILE_TYPE_EXIF:
rc = sony_exif_get(camera, num, file, context);
break;
default:
rc = GP_ERROR_NOT_SUPPORTED;
@@ -170,7 +173,7 @@ get_info_func (CameraFilesystem *fs, const char *folder,
return (num);
num++;
return (sony_image_info(camera, num, info));
return (sony_image_info(camera, num, info, context));
}
/**

68
camlibs/sonydscf55/sony.c
View File

@@ -1,5 +1,5 @@
/* Sony DSC-F55 & MSAC-SR1 - gPhoto2 camera library
* Copyright (C) 2001 Raymond Penners <raymond@dotsphinx.com>
* Copyright (C) 2001, 2002 Raymond Penners <raymond@dotsphinx.com>
* Copyright (C) 2000 Mark Davies <mdavies@dial.pipex.com>
*
* This library is free software; you can redistribute it and/or
@@ -42,6 +42,13 @@
#define SONY_START_CHAR 0xc0
#define SONY_END_CHAR 0xc1
enum
{
SONY_FILE_EXIF=0,
SONY_FILE_THUMBNAIL,
SONY_FILE_IMAGE
};
static unsigned char START_PACKET = 192;
static unsigned char END_PACKET = 193;
@@ -597,8 +604,8 @@ int sony_mpeg_count(Camera * camera)
* Fetches an image.
*/
static int
sony_file_get(Camera * camera, int imageid, int thumbnail,
CameraFile * file)
sony_file_get(Camera * camera, int imageid, int file_type,
CameraFile * file, GPContext *context)
{
int sc; /* count of bytes to skip at start of packet */
Packet dp;
@@ -606,6 +613,10 @@ sony_file_get(Camera * camera, int imageid, int thumbnail,
char buffer[128];
GP_DEBUG( "sony_file_get()");
if (gp_context_cancel(context) == GP_CONTEXT_FEEDBACK_CANCEL) {
return GP_ERROR_CANCEL;
}
rc = gp_file_clean(file);
if (rc == GP_OK) {
gp_file_set_mime_type (file, GP_MIME_JPEG);
@@ -619,7 +630,7 @@ sony_file_get(Camera * camera, int imageid, int thumbnail,
rc = sony_converse(camera, &dp, StillImage, 19);
if (rc == GP_OK) {
if (thumbnail) {
if (file_type == SONY_FILE_THUMBNAIL) {
sc = 0x247;
// FIXME
@@ -634,6 +645,12 @@ sony_file_get(Camera * camera, int imageid, int thumbnail,
}
for (;;) {
if (gp_context_cancel(context)
== GP_CONTEXT_FEEDBACK_CANCEL) {
rc = GP_ERROR_CANCEL;
break;
}
sony_converse(camera, &dp,
SendThumbnail, 4);
@@ -653,9 +670,28 @@ sony_file_get(Camera * camera, int imageid, int thumbnail,
sony_converse(camera, &dp, SendImage, 7);
for (;;) {
if (gp_context_cancel(context)
== GP_CONTEXT_FEEDBACK_CANCEL) {
rc = GP_ERROR_CANCEL;
break;
}
gp_file_append(file,
(char *) dp.buffer +
sc, dp.length - sc);
if (file_type == SONY_FILE_EXIF) {
const char *fdata;
unsigned long fsize;
gp_file_get_data_and_size
(file, &fdata, &fsize);
// FIXME: 4096 is a rather
// arbitrary value
if (fsize > 4096)
break;
}
sc = 7;
if (3 == dp.buffer[4])
@@ -679,29 +715,41 @@ sony_file_get(Camera * camera, int imageid, int thumbnail,
/**
* Fetches an image.
*/
int sony_thumbnail_get(Camera * camera, int imageid, CameraFile * file)
int sony_thumbnail_get(Camera * camera, int imageid, CameraFile * file, GPContext *context)
{
return sony_file_get(camera, imageid, TRUE, file);
return sony_file_get(camera, imageid, SONY_FILE_THUMBNAIL, file, context);
}
/**
* Fetches an image.
*/
int sony_image_get(Camera * camera, int imageid, CameraFile * file)
int sony_image_get(Camera * camera, int imageid, CameraFile * file, GPContext *context)
{
return sony_file_get(camera, imageid, FALSE, file);
return sony_file_get(camera, imageid, SONY_FILE_IMAGE, file, context);
}
/**
* Fetches EXIF information.
*/
int sony_exif_get(Camera * camera, int imageid, CameraFile * file, GPContext *context)
{
return sony_file_get(camera, imageid, SONY_FILE_EXIF, file, context);
}
/**
* Fetches image details.
*/
int sony_image_info(Camera * camera, int imageid, CameraFileInfo * info)
int sony_image_info(Camera * camera, int imageid, CameraFileInfo * info, GPContext *context)
{
unsigned int l = 0;
int rc;
Packet dp;
if (gp_context_cancel(context) == GP_CONTEXT_FEEDBACK_CANCEL) {
return GP_ERROR_CANCEL;
}
// FIXME
SelectImage[4] = imageid;
rc = sony_converse(camera, &dp, SelectImage, 7);
@@ -715,7 +763,7 @@ int sony_image_info(Camera * camera, int imageid, CameraFileInfo * info)
info->file.size = l;
strcpy (info->file.type, GP_MIME_JPEG);
info->preview.fields = 0;
info->preview.fields = GP_FILE_INFO_TYPE;
}
return rc;
}

7
camlibs/sonydscf55/sony.h
View File

@@ -43,9 +43,10 @@ int sony_init(Camera * camera, int ismsac);
int sony_exit(Camera * camera);
int sony_image_count(Camera * camera);
int sony_mpeg_count(Camera * camera);
int sony_image_get(Camera * camera, int imageid, CameraFile * file);
int sony_thumbnail_get(Camera * camera, int imageid, CameraFile * file);
int sony_image_info(Camera * camera, int imageid, CameraFileInfo * info);
int sony_image_get(Camera * camera, int imageid, CameraFile * file, GPContext *context);
int sony_thumbnail_get(Camera * camera, int imageid, CameraFile * file, GPContext *context);
int sony_exif_get(Camera * camera, int imageid, CameraFile * file, GPContext *context);
int sony_image_info(Camera * camera, int imageid, CameraFileInfo * info, GPContext *context);
#endif /* SONY_H */