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

2003-10-07 Lutz Mueller <lutz@users.sourceforge.net>

Browse Source 
* sq905.c: Patch by Theodore Kilgore <kilgota@banach.math.auburn.edu>,
	  without ChangeLog entry, unfortunately not against latest cvs, and
	  not in 'cvs diff -u3 -p' format. Hence no guaranty that I figured
	  out the right lines and the right changes. No idea if the code
	  now works better than before. But it compiles :-)


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@6809 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Lutz Mueller
2003-10-07 19:53:15 +00:00
parent 1d7ffb9e31
commit 1b367e1a70
3 changed files with 66 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
camlibs/sq905/ChangeLog
View File

@@ -1,3 +1,11 @@
2003-10-07 Lutz Mueller <lutz@users.sourceforge.net>
* sq905.c: Patch by Theodore Kilgore <kilgota@banach.math.auburn.edu>,
without ChangeLog entry, unfortunately not against latest cvs, and
not in 'cvs diff -u3 -p' format. Hence no guaranty that I figured
out the right lines and the right changes. No idea if the code
now works better than before. But it compiles :-)
2003-08-01 Lutz Mueller <lutz@users.sourceforge.net>
* sq905.c: Additional information by Paulo Tribolet Abreu

71
camlibs/sq905/library.c
View File

@@ -64,6 +64,9 @@ struct {
{"Argus DC-1510", GP_DRIVER_STATUS_PRODUCTION, 0x2770, 0x9120},
{"Gear to go", GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x9120},
{"Mitek CD10" , GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x9120},
{"Mitek CD30P", GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x9120},
{"Magpix B350", GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x9120},
{"Jenoptik JD 350", GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x9120},
{"GTW Electronics", GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x9120},
{"Concord Eye-Q Easy",GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x9120},
{"Che-ez Snap", GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x9120},
@@ -136,7 +139,7 @@ file_list_func (CameraFilesystem *fs, const char *folder, CameraList *list,
Camera *camera = data;
int n = sq_get_num_pics (camera->pl->data);
gp_list_populate (list, "pict%02i.ppm", n);
gp_list_populate (list, "pict%03i.ppm", n);
return GP_OK;
}
@@ -186,9 +189,11 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
case GP_FILE_TYPE_NORMAL:
sq_read_picture_data (camera->port, data, buffersize);
break;
/*
case GP_FILE_TYPE_PREVIEW:
sq_read_picture_data (camera->port, data, buffersize);
break;
*/
default:
free (data);
free (p_data);
@@ -207,22 +212,48 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
* shows up on some computers. Anyway, the switch turns off
* the machine which makes the salt!
*/
for (m = 0; m < buffersize; m++)
switch (comp_ratio) {
/* This is an experiment which does not work.
* But it almost works!
* By looking at the output, an expert might
* actually be able to
* see what to instead!
*/
case 2:
p_data[2 * m] = 0x10 * (data[m]/0x10 );
p_data[2 * m + 1] = 0x10 * (data[m] % 0x10);
break;
default:
p_data[m] = data[m];
}
/*
* Data seems to be arranged in planar form.
* The colors are still not quite right, but the
* geometry comes through. Evidence from photos of solid color
* seems to show the order of the planes is GBR. The method
* followed here is to try to "decompress" the raw data first and
* then to do Bayer interpolation afterwards.
*
* The even pixels on the odd lines of output are green, and the
* odd pixels on the even lines of output. We don't know if the
* data is right, but the output is at least preserves the
* geometry of the image. At least for the 09 05 00 26 cameras.
*/
/* Green */
for (m = 0; m < buffersize; m++) {
p_data[w * ((m * 4) / w) + 4*(m % (w / 4))
+ ((m * 4) / w) % 2 + 1] = data[m];
p_data[w * ((m * 4) / w) + 4*(m % (w / 4))
+ ((m * 4) / w) % 2 + 3] = data[m];
}
/*
* Blue.
*
* The even pixels on the even output lines are blue.
* We don't know yet if the data represent blue pixels,
* but again the geometry is preserved.
*
* The odd pixels on the odd lines of output are red.
*/
for (m = 0; m < buffersize / 4; m++) {
p_data[w * (2 * ((m * 4) / w))
+ 4 * (m % (w / 4)) + 2] = data[m + 2 * buffersize / 4];
p_data[w * (2 * ((m * 4) / w))
+ 4 * (m % (w / 4)) + 4] = data[m + 2 * buffersize / 4];
p_data[w * (2 * ((m * 4) / w) + 1)
+ 4 * (m % (w / 4)) + 1] = data[m + 3 * buffersize / 4];
p_data[w * (2 * ((m * 4) / w) +1)
+ 4 * (m % (w / 4)) + 3] = data[m + 3 * buffersize / 4];
}
/*
* Now we want to get our picture into a file on
@@ -230,10 +261,10 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
* Otherwise, the picture will be upside down.
*/
for (i = 0; i <= buffersize/2; ++i) {
for (i = 0; i <= w * h / 2; ++i) {
temp = p_data[i];
p_data[i] = p_data[buffersize -1 -i];
p_data[buffersize - 1 - i] = temp;
p_data[i] = p_data[w * h -1 -i];
p_data[w * h - 1 - i] = temp;
}
/* Now put the data into a real PPM picture file!

14
camlibs/sq905/sq905.h
View File

@@ -11,16 +11,16 @@ typedef enum {
SQ_MODEL_UNKNOWN
} SQModel;
int sq_reset (GPPort *port);
int sq_init (GPPort *port, SQModel *, SQData *data);
int sq_reset (GPPort *);
int sq_init (GPPort *, SQModel *, SQData *);
/* Those functions don't need data transfer with the camera */
int sq_get_num_pics (SQData *data);
int sq_get_comp_ratio (SQData *data, int n);
int sq_get_picture_width (SQData *data, int n);
int sq_get_num_pics (SQData *);
int sq_get_comp_ratio (SQData *, int n);
int sq_get_picture_width (SQData *, int n);
unsigned char *sq_read_data (GPPort *port, char *data, int size);
unsigned char *sq_read_picture_data (GPPort *port, char *data, int size);
unsigned char *sq_read_data (GPPort *, char *data, int size);
unsigned char *sq_read_picture_data (GPPort *, char *data, int size);
#endif