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

free the correct file. move the get_data_and_size out of the loop

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15049 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Marcus Meissner
2014-07-01 07:54:07 +00:00
parent e4354bd7a2
commit df0aeac4a8
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
camlibs/kodak/dc120/library.c
View File

@@ -451,13 +451,15 @@ static int dc120_get_file_preview (Camera *camera, CameraFile *file, int file_nu
/* Create a file for KDC data */
gp_file_new(&f);
if (dc120_packet_read_data(camera, f, cmd_packet, size, 1024, context)==GP_ERROR) {
gp_file_free(file);
gp_file_free(f);
return (GP_ERROR);
}
/* Convert to PPM file for now */
gp_file_append(file, "P3\n80 60\n255\n", 13);
gp_file_get_data_and_size (f, &f_data, &f_size);
for (x=0; x<14400; x+=3) {
gp_file_get_data_and_size (f, &f_data, &f_size);
sprintf(buf, "%i %i %i\n",
(unsigned char)f_data[x+1280],
(unsigned char)f_data[x+1281],
@@ -465,7 +467,7 @@ static int dc120_get_file_preview (Camera *camera, CameraFile *file, int file_nu
gp_file_append(file, buf, strlen(buf));
}
sleep(1);
sleep(1); /* FIXME: why? */
return (GP_OK);
}