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/sq905 | |
| 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/sq905')
| -rw-r--r-- | camlibs/sq905/library.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/camlibs/sq905/library.c b/camlibs/sq905/library.c index b4291b3cb..4480785a1 100644 --- a/camlibs/sq905/library.c +++ b/camlibs/sq905/library.c @@ -381,7 +381,6 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename, gp_gamma_correct_single (gtable, ptr, w * h); gp_file_set_mime_type (file, GP_MIME_PPM); - gp_file_set_name (file, filename); gp_file_set_data_and_size (file, (char *)ppm, size); } else { /* type is GP_FILE_TYPE_RAW */ @@ -391,7 +390,6 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename, memcpy (rawdata, frame_data, size); memcpy (rawdata+size,camera->pl->catalog+16*entry,16); gp_file_set_mime_type (file, GP_MIME_RAW); - gp_file_set_name (file, filename); gp_file_set_data_and_size (file, (char *)rawdata, size+16); } /* Reset camera when done, for more graceful exit. */ @@ -422,7 +420,6 @@ camera_capture_preview (Camera *camera, CameraFile *file, GPContext *context) unsigned char *frame_data; unsigned char *ppm, *ptr; unsigned char gtable[256]; - char filename[12] = "sq_cap.ppm"; int size; int w = 320; int h = 240; @@ -468,7 +465,6 @@ camera_capture_preview (Camera *camera, CameraFile *file, GPContext *context) gp_gamma_fill_table (gtable, .5); gp_gamma_correct_single (gtable, ptr, w * h); gp_file_set_mime_type (file, GP_MIME_PPM); - gp_file_set_name (file, filename); gp_file_set_data_and_size (file, (char *)ppm, size); sq_reset(camera->port); |