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

added patch from lutz to konica

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@803 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Scott Fritzinger
2000-07-30 17:59:24 +00:00
parent ce8705a471
commit 6df36f32e5
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
camlibs/konica/konica.c
View File

@@ -74,7 +74,7 @@ k_return_status_t return_status_translation (gchar byte1, gchar byte2)
case 0x0321:
return (K_ERROR_CARD_REMOVED_DURING_ACCESS);
case 0x0340:
return (K_ERROR_IMAGE_NOT_PROTECTED_DOES_NOT_EXIST);
return (K_ERROR_IMAGE_NUMBER_NOT_VALID);
case 0x0341:
return (K_ERROR_CARD_CAN_NOT_BE_WRITTEN);
case 0x0381:
@@ -93,8 +93,6 @@ k_return_status_t return_status_translation (gchar byte1, gchar byte2)
return (K_ERROR_ILLEGAL_PARAMETER);
case 0x0801:
return (K_ERROR_COMMAND_CANNOT_BE_CANCELLED);
case 0x0810:
return (K_ERROR_IMAGE_NUMBER_NOT_VALID);
case 0x0c01:
return (K_ERROR_UNSUPPORTED_COMMAND);
case 0x0c02:

5
camlibs/konica/konica.h
View File

@@ -153,7 +153,7 @@ typedef enum {
/* - 1: on */
/* - 2: auto */
/* - 5: on, redeye */
/* - 6: on, auto */
/* - 6: auto, redeye */
/* Other values are accepted as well, but will be changed to 2 */
/* at some point. */
/* */
@@ -223,7 +223,7 @@ typedef enum {
K_ERROR_NO_CARD_PRESENT,
K_ERROR_CARD_NOT_SUPPORTED,
K_ERROR_CARD_REMOVED_DURING_ACCESS,
K_ERROR_IMAGE_NOT_PROTECTED_DOES_NOT_EXIST,
K_ERROR_IMAGE_NUMBER_NOT_VALID,
K_ERROR_CARD_CAN_NOT_BE_WRITTEN,
K_ERROR_CARD_IS_WRITE_PROTECTED,
K_ERROR_NO_SPACE_LEFT_ON_CARD,
@@ -233,7 +233,6 @@ typedef enum {
K_ERROR_SYSTEM_ERROR,
K_ERROR_ILLEGAL_PARAMETER,
K_ERROR_COMMAND_CANNOT_BE_CANCELLED,
K_ERROR_IMAGE_NUMBER_NOT_VALID,
K_ERROR_UNSUPPORTED_COMMAND,
K_ERROR_OTHER_COMMAND_EXECUTING,
K_ERROR_COMMAND_ORDER_ERROR,

16
camlibs/konica/library.c
View File

@@ -83,8 +83,8 @@ gboolean error_happened (k_return_status_t return_status)
case K_ERROR_CARD_REMOVED_DURING_ACCESS:
gp_camera_message (NULL, "Card removed during access!");
return (TRUE);
case K_ERROR_IMAGE_NOT_PROTECTED_DOES_NOT_EXIST:
gp_camera_message (NULL, "Image not protected (does not exist)!");
case K_ERROR_IMAGE_NUMBER_NOT_VALID:
gp_camera_message (NULL, "Image number not valid!");
return (TRUE);
case K_ERROR_CARD_CAN_NOT_BE_WRITTEN:
gp_camera_message (NULL, "Card can not be written!");
@@ -113,9 +113,6 @@ gboolean error_happened (k_return_status_t return_status)
case K_ERROR_COMMAND_CANNOT_BE_CANCELLED:
gp_camera_message (NULL, "Command cannot be cancelled!");
return (TRUE);
case K_ERROR_IMAGE_NUMBER_NOT_VALID:
gp_camera_message (NULL, "Image number not valid!");
return (TRUE);
case K_ERROR_UNSUPPORTED_COMMAND:
gp_camera_message (NULL, "Unsupported command!");
return (TRUE);
@@ -438,6 +435,7 @@ int camera_file_count (Camera *camera)
guint total_pictures;
guint total_strobes;
if (debug_flag) printf ("*** Entering camera_file_count.\n");
if (error_happened (k_get_status (
&self_test_result,
&power_level,
@@ -461,6 +459,7 @@ int camera_file_count (Camera *camera)
&exposure,
&total_pictures,
&total_strobes))) return (GP_ERROR);
if (debug_flag) printf ("*** Leaving camera_file_count.\n");
return ((int) pictures);
}
@@ -473,6 +472,7 @@ int camera_file_get (Camera *camera, CameraFile *file, int file_number)
guchar *information_buffer = NULL;
guint information_buffer_size;
if (debug_flag) printf ("*** Entering camera_file_get.\n");
if (error_happened (k_get_image_information (
(gulong) (file_number + 1),
&image_id,
@@ -488,6 +488,7 @@ int camera_file_get (Camera *camera, CameraFile *file, int file_number)
strcpy(file->type, "image/jpg");
sprintf (file->name, "%i.jpg", (int) image_id);
g_free (information_buffer);
if (debug_flag) printf ("*** Leaving camera_file_get.\n");
return (GP_OK);
}
@@ -500,6 +501,7 @@ int camera_file_get_preview (Camera *camera, CameraFile *preview, int file_numbe
guchar *information_buffer = NULL;
guint information_buffer_size;
if (debug_flag) printf ("*** Entering camera_file_get_preview.\n");
if (error_happened (k_get_image_information (
(gulong) (file_number + 1),
&image_id,
@@ -507,7 +509,6 @@ int camera_file_get_preview (Camera *camera, CameraFile *preview, int file_numbe
&protected,
&information_buffer,
&information_buffer_size))) return (GP_ERROR);
return (0);
if (error_happened (k_get_image (
image_id,
K_THUMBNAIL,
@@ -516,6 +517,7 @@ int camera_file_get_preview (Camera *camera, CameraFile *preview, int file_numbe
strcpy(preview->type, "image/jpg");
sprintf (preview->name, "%i.jpg", (int) image_id);
g_free (information_buffer);
if (debug_flag) printf ("*** Leaving camera_file_get_preview.\n");
return (GP_OK);
}
@@ -534,6 +536,7 @@ int camera_file_delete (Camera *camera, int file_number)
guchar *information_buffer = NULL;
guint information_buffer_size;
if (debug_flag) printf ("*** Entering camera_file_delete.\n");
if (error_happened (k_get_image_information (
file_number,
&image_id,
@@ -542,6 +545,7 @@ int camera_file_delete (Camera *camera, int file_number)
&information_buffer,
&information_buffer_size))) return (GP_ERROR);
if (error_happened (k_erase_image (image_id))) return (GP_ERROR);
if (debug_flag) printf ("*** Leaving camera_file_delete.\n");
return (GP_OK);
}