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

Added colons for new Manufacturer:Model notation

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@6043 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Michael Rensing
2003-01-10 21:10:22 +00:00
parent de3eaa87a5
commit 17dc3dcfc0
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
camlibs/polaroid/pdc320.c
View File

@@ -21,7 +21,7 @@
/* Originally written by Peter Desnoyers <pjd@fred.cambridge.ma.us>,
* and adapted for gphoto2 by
* Nathan Stenzel <nathanstenzel@users.sourceforge.net> and
* Lutz Müller <urc8@rz.uni-karlsruhe.de>
* Lutz Müller <lutz@users.sourceforge.net>
*
* Maintained by Nathan Stenzel <nathanstenzel@users.sourceforge.net>
*/
@@ -464,9 +464,9 @@ camera_init (Camera *camera, GPContext *context)
/* What model are we talking to? */
gp_camera_get_abilities (camera, &abilities);
if (!strcmp (abilities.model, "Polaroid Fun! 320"))
if (!strcmp (abilities.model, "Polaroid:Fun! 320"))
camera->pl->model = PDC320;
else if (!strcmp (abilities.model, "Polaroid 640SE"))
else if (!strcmp (abilities.model, "Polaroid:640SE"))
camera->pl->model = PDC640SE;
else {
free (camera->pl);

4
camlibs/polaroid/pdc320.h
View File

@@ -62,8 +62,8 @@ static struct {
const char *model;
unsigned char id;
} models[] = {
{"Polaroid Fun! 320", 0x3f},
{"Polaroid 640SE", 0x40},
{"Polaroid:Fun! 320", 0x3f},
{"Polaroid:640SE", 0x40},
{NULL, 0x00}
};

8
camlibs/polaroid/pdc640.c
View File

@@ -1,6 +1,6 @@
/* pdc640.c
*
* Copyright © 2001 Lutz Müller <urc8@rz.uni-karlsruhe.de>
* Copyright © 2001 Lutz Müller <lutz@users.sourceforge.net>
* Copyright © 2002 Marcus Meissner <marcus@jet.franken.de>
*
* This library is free software; you can redistribute it and/or
@@ -59,21 +59,21 @@ static struct {
int vendor,product;
struct _CameraPrivateLibrary pl;
} models[] = {
{"Polaroid Fun Flash 640", 0, 0, {
{"Polaroid:Fun Flash 640", 0, 0, {
pdc640,
BAYER_TILE_RGGB,
NULL, // add postprocessor here!
"pdc640%04i.ppm"
}
},
{"Jenoptik JD350 entrance", 0, 0, {
{"Jenoptik:JD350 entrance", 0, 0, {
jd350e,
BAYER_TILE_BGGR,
&jd350e_postprocessing,
"jd350e%04i.ppm"
}
},
{"Jenoptik JD350 video", 0xd96, 0x0000, {
{"Jenoptik:JD350 video", 0xd96, 0x0000, {
jd350e,
BAYER_TILE_BGGR,
&jd350e_postprocessing,

2
camlibs/polaroid/pdc700.c
View File

@@ -735,7 +735,7 @@ static struct {
unsigned short usb_product;
} models[] = {
{"Polaroid DC700", 0x784, 0x2888},
{"Polaroid:DC700", 0x784, 0x2888},
{NULL, 0, 0}
};