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

some cleanups

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@9407 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Marcus Meissner
2006-11-19 18:44:13 +00:00
parent dea2f5c011
commit 5259ecb79a
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
camlibs/kodak/dc210/dc210.h
View File

@@ -207,8 +207,6 @@ int dc210_delete_picture_by_name (Camera * camera, const char * filename );
/* other actions */
int dc210_open_card (Camera * camera);
int dc210_close_card (Camera * camera);
int dc210_format_card (Camera * camera, char * album_name, GPContext * context);
/* callbacks */
int dc210_system_time_callback (Camera * camera, CameraWidget * widget, GPContext * context);

18
camlibs/kodak/dc210/library.c
View File

@@ -27,12 +27,12 @@
# define N_(String) (String)
#endif
int dc210_cmd_error = 0;
char ppmheader[] = "P6\n96 72\n255\n";
static int dc210_cmd_error = 0;
static const char ppmheader[] = "P6\n96 72\n255\n";
#ifdef DEBUG
int firststatus = 1;
char oldstatus[DC210_STATUS_SIZE];
static int firststatus = 1;
static char oldstatus[DC210_STATUS_SIZE];
#endif
/***************************************************************************
@@ -44,21 +44,15 @@ char oldstatus[DC210_STATUS_SIZE];
static void cfa2ppm
(CameraFile * file)
{
/* this is a very quick and dirty hack to convert cfa into ppm */
unsigned char buf[THUMBHEIGHT][THUMBWIDTH];
unsigned char rgb[THUMBHEIGHT][THUMBWIDTH][3];
unsigned char val;
unsigned int addval;
const char * data;
unsigned long datasize;
int i, x, y;
static char ppmheader[] = "P6\n96 72\n255\n";
/* get data */
DC210_DEBUG("Converting CFA to PPM\n");
@@ -600,7 +594,7 @@ int dc210_system_time_callback (Camera * camera, CameraWidget * widget, GPContex
};
int dc210_format_card (Camera * camera, char * album_name, GPContext * context){
static int dc210_format_card (Camera * camera, char * album_name, GPContext * context){
char data[DC210_CMD_DATA_SIZE];
char cmd[8];
@@ -929,7 +923,7 @@ int dc210_open_card
return GP_OK;
};
int dc210_close_card
static int dc210_close_card
(Camera * camera)
{