diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2009-02-16 08:09:49 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2009-02-16 08:09:49 +0000 |
| commit | bb3d18289e752db9dff5f7e60e5368f46bdd1a8a (patch) | |
| tree | 8b96a77cc35ca978600cbe450a0503d3dd6dc5aa /camlibs/jamcam | |
| parent | 2d0eae7c878f9ee870df185d27e0fafd120a4b42 (diff) | |
| download | libgphoto2-bb3d18289e752db9dff5f7e60e5368f46bdd1a8a.tar.gz | |
Batch commit from weekend work:
- removed "type" from CameraFile handling:
- all put_file functions and hooks get "type" as argument now
- added type to the set_file_info_noop call
- started removal of "name" from CameraFile
- generate new filename from original filename + camerafile type + mimetype
- new gp_camera_autodetect() helper function
- adapted all drivers.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@11818 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/jamcam')
| -rw-r--r-- | camlibs/jamcam/jamcam.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/camlibs/jamcam/jamcam.c b/camlibs/jamcam/jamcam.c index eca4eb166..7f431a4ec 100644 --- a/camlibs/jamcam/jamcam.c +++ b/camlibs/jamcam/jamcam.c @@ -179,7 +179,6 @@ static int get_file_func (CameraFilesystem *fs, const char *folder, { Camera *camera = user_data; char *raw, *ppm; - char tmp_filename[128]; unsigned char gtable[256]; char *ptr; int size = 0, n = 0; @@ -224,7 +223,6 @@ static int get_file_func (CameraFilesystem *fs, const char *folder, gp_gamma_correct_single( gtable, ptr, height * width ); CHECK_free (gp_file_set_mime_type (file, GP_MIME_PPM)); - CHECK_free (gp_file_set_name (file, filename)); CHECK_free (gp_file_append (file, ppm, size)); break; @@ -249,18 +247,12 @@ static int get_file_func (CameraFilesystem *fs, const char *folder, gp_gamma_correct_single( gtable, ptr, jc_file->width * jc_file->height ); CHECK_free (gp_file_set_mime_type (file, GP_MIME_PPM)); - CHECK_free (gp_file_set_name (file, filename)); CHECK_free (gp_file_append (file, ppm, size)); break; case GP_FILE_TYPE_RAW: CHECK_free (jamcam_request_image (camera, file, raw, &size, n, context)); CHECK_free (gp_file_set_mime_type (file, GP_MIME_RAW)); - strcpy( tmp_filename, filename ); - tmp_filename[strlen(tmp_filename)-3] = 'r'; - tmp_filename[strlen(tmp_filename)-2] = 'a'; - tmp_filename[strlen(tmp_filename)-1] = 'w'; - CHECK_free (gp_file_set_name (file, tmp_filename)); CHECK_free (gp_file_append (file, raw, size)); break; default: |