DeforaOS/Camera
DeforaOS/Camera
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2015-02-15 14:54:57 +01:00
parent 14c62e774a
commit 0d6dd307c8
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/camera.c
View File

@ -925,9 +925,8 @@ int camera_snapshot(Camera * camera, CameraSnapshotFormat format)
int ret; int ret;
char const * homedir; char const * homedir;
char const dcim[] = "DCIM"; char const dcim[] = "DCIM";
char const * ext; char const * ext[CSF_COUNT] = { NULL, ".png", ".jpeg" };
char const png[] = ".png"; char const * e;
char const jpeg[] = ".jpeg";
char * path; char * path;
if(camera->rgb_buffer == NULL) if(camera->rgb_buffer == NULL)
@ -938,19 +937,19 @@ int camera_snapshot(Camera * camera, CameraSnapshotFormat format)
switch(format) switch(format)
{ {
case CSF_JPEG: case CSF_JPEG:
ext = jpeg;
break;
case CSF_PNG: case CSF_PNG:
e = ext[format];
break;
default: default:
format = CSF_PNG; format = CSF_PNG;
ext = png; e = ext[format];
break; break;
} }
if((homedir = getenv("HOME")) == NULL) if((homedir = getenv("HOME")) == NULL)
homedir = g_get_home_dir(); homedir = g_get_home_dir();
if(_snapshot_dcim(camera, homedir, dcim) != 0) if(_snapshot_dcim(camera, homedir, dcim) != 0)
return -1; return -1;
if((path = _snapshot_path(camera, homedir, dcim, ext)) == NULL) if((path = _snapshot_path(camera, homedir, dcim, e)) == NULL)
return -1; return -1;
ret = _snapshot_save(camera, path, format); ret = _snapshot_save(camera, path, format);
free(path); free(path);