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

2001-10-11 Lutz M�ller <urc8@rz.uni-karlsruhe.de>

Browse Source 
* include/gphoto2-widget.h
        * libgphoto2/exif.[c,h]
        * libgphoto2/widget.c: Fix stuff gtk-doc was complaining about.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2478 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Lutz Mueller
2001-10-11 12:51:41 +00:00
parent 8877692c4c
commit c332acf24c
4 changed files with 74 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2001-10-11 Lutz Müller <urc8@rz.uni-karlsruhe.de>
* include/gphoto2-widget.h
* libgphoto2/exif.[c,h]
* libgphoto2/widget.c: Fix stuff gtk-doc was complaining about.
2001-10-10 Lutz Müller <urc8@rz.uni-karlsruhe.de>
* configure.in: Give some feedback (gtk-doc: yes/no?)

54
libgphoto2/exif.c
View File

@@ -26,7 +26,7 @@
*/
/***********
/*
* Conventions:
*
* "tag number" (tagnum) : ID number of a tag (see list just below).
@@ -42,20 +42,20 @@ static int exif_sizetab[13]={
0,1,1,2,4,8,1,1,2,4,8,4,8
};
/**************************************************************/
/* Foward declarations. move to exif.h if you want to export. */
/**************************************************************/
/*
* Foward declarations. move to exif.h if you want to export.
*/
int gpe_getvalue(unsigned char *data,int tagind);
int gpe_datsize(unsigned char *data,int tagind);
int gpe_tagnum( char *data,int tagind);
int gpe_getintval(unsigned char *data, int tagnum);
/**************************************************************/
/* Utility functions: get fields in little-endian format, */
/* initialize data structures, etc. */
/**************************************************************/
/*
* Utility functions: get fields in little-endian format,
* initialize data structures, etc.
*/
/**
/*
* Convert to Intel-Endian number.
*
* data : pointer to the data to convert
@@ -75,7 +75,7 @@ long exif_get_lilend(unsigned char *data, int size){
return(total);
};
/**
/*
* Convert to signed Intel-Endian number
*/
long exif_get_slilend(unsigned char *data, int size){
@@ -94,7 +94,7 @@ long exif_get_slilend(unsigned char *data, int size){
};
/**
/*
* Return "value" of directory entry at tagind
*/
int gpe_theval(unsigned char *data,int tagind){
@@ -102,7 +102,7 @@ int gpe_theval(unsigned char *data,int tagind){
};
/**
/*
* Set the "value" of directory entry at tagind.
*/
void gpe_setval(unsigned char *data,int tagind,long newval){
@@ -131,7 +131,7 @@ long exif_next_ifd(unsigned char *exif,int num){
}
/**
/*
* Parse an exif data structure and initialise the "exifparser".
*
* exifdat : the exif data
@@ -197,9 +197,9 @@ int exif_parse_data(exifparser *exifdat) {
return exifdat->exiflen;
}
/**************************************************************/
/* tag-level functions: get/set tags in the EXIF structure */
/**************************************************************/
/*
* tag-level functions: get/set tags in the EXIF structure
*/
/**
* Returns the value of a field, identified by its tag and the IFD.
@@ -306,7 +306,7 @@ int exif_get_field( int tag_number, int ifd, exifparser *exifdata, ExifData *tag
return 0;
}
/**
/*
* Gets an ASCII tag.
*
* Specifying an IFD of '-1' will return the first occurence of
@@ -331,7 +331,7 @@ char * exif_get_ascii_field( int tag_number, int ifd, exifparser *exifdat) {
}
}
/**
/*
* Gets a numeric tag.
*
* Specifying an IFD of '-1' will return the first occurence of
@@ -362,7 +362,7 @@ int exif_get_int_field( int tag_number, int ifd, exifparser *exifdat) {
}
/**
/*
* Returns the name of a given tag number
*/
char *exif_get_tagname(int tag_number) {
@@ -374,12 +374,12 @@ char *exif_get_tagname(int tag_number) {
return("Unknown");
}
/**************************************************************/
/* Higher-level functions: get/set logical entities, such as */
/* comments, thumbnail, etc. */
/**************************************************************/
/*
* Higher-level functions: get/set logical entities, such as
* comments, thumbnail, etc.
*/
/**
/*
* Gets the comment field if it exists.
*/
int exif_get_comment(exifparser *exifdat, char *comment) {
@@ -398,14 +398,14 @@ int exif_get_comment(exifparser *exifdat, char *comment) {
return 0;
}
/**
/*
* Sets the comment field if it exists.
*/
int exif_set_comment(exifparser *exifdat, char *comment) {
return 0;
}
/**
/*
* Gets the thumbnail of an EXIF image.
*
* The returned thumbnail might be in JPEG or TIFF format.
@@ -418,7 +418,7 @@ unsigned char *exif_get_thumbnail(exifparser *exifdat) {
}
/**
/*
* Gets the thumbnail of an EXIF image.
* The thumbnail size is provided
*

36
libgphoto2/exif.h
View File

@@ -8,7 +8,7 @@
#include <sys/times.h>
#include <fcntl.h>
/**
/*
* EXIF file format support library. This API allows to parse, read and
* modify EXIF data structures. It provides a low-level API which allows
* to manipulate EXIF tags in a generic way, and a higher-level API which
@@ -150,60 +150,60 @@ static struct tagarray{
extern int exif_debug; /* Non-zero for debug messages */
/**
/*
* Parse an exif header, return size of the rest of the file.
*/
int exif_parse_data(exifparser *exifdat);
/**
/*
* Returns the value of a field, identified by its tag and the IFD.
*/
int exif_get_field( int tag_number, int ifd, exifparser *exifdat, ExifData *tag_data);
/**
/*
* Gets a numeric tag
*/
int exif_get_int_field( int tag_number, int ifd, exifparser *exifdat);
/**
/*
* Gets an ASCII tag.
*/
char * exif_get_ascii_field( int tag_number, int ifd, exifparser *exifdat);
/**
/*
* Returns the name of a given tag number
*/
char *exif_get_tagname(int tag_number);
/**
/*
* Returns a pointer to the thumbnail data if it
* exists.
*/
unsigned char *exif_get_thumbnail(exifparser *exifdat);
/**
/*
* The same as exif_get_thumbnail but returns
* also the thumbnail size
*/
unsigned char *exif_get_thumbnail_and_size(exifparser *exifdat, long *size);
/**
/*
* Gets the comment field if it exists.
*/
int gpe_get_comment(exifparser *exifdat, char *comment);
/**
/*
* Sets the comment field.
*/
int gpe_set_comment(exifparser *exifdat, char *comment);
/**
/*
* COMMENT ME
*/
int stat_exif(exifparser *exifdata);
int gpe_dump_exif(exifparser *exifdata);
/**************
/*
* Now, all the 'defines'
*/
@@ -300,15 +300,3 @@ int gpe_dump_exif(exifparser *exifdata);
#define EXIF_SceneType 0xA301
#endif /* _gphoto_exif_ */

54
libgphoto2/widget.c
View File

@@ -17,11 +17,13 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include <config.h>
#include "../include/gphoto2-widget.h"
#include <stdlib.h>
#include <string.h>
#include <gphoto2-widget.h>
#include <gphoto2-result.h>
#include "../include/gphoto2-result.h"
#define CHECK_NULL(r) {if (!(r)) return (GP_ERROR_BAD_PARAMETERS);}
@@ -140,7 +142,7 @@ gp_widget_free (CameraWidget *widget)
/**
* gp_widget_ref:
* @widget: a CameraWidget you want to ref-count
* @widget: a #CameraWidget you want to ref-count
*
* Increments the reference count for the CameraWidget.
*
@@ -158,7 +160,7 @@ gp_widget_ref (CameraWidget *widget)
/**
* gp_widget_unref:
* @widget: a CameraWidget you want to unref
* @widget: a #CameraWidget you want to unref
*
* Decrements the reference count for the CameraWidget:
*
@@ -179,7 +181,7 @@ gp_widget_unref (CameraWidget *widget)
/**
* gp_widget_get_info:
* @widget: a CameraWidget
* @widget: a #CameraWidget
* @info:
*
* Retrieves the information about the widget.
@@ -198,7 +200,7 @@ gp_widget_get_info (CameraWidget *widget, const char **info)
/**
* gp_widget_set_info:
* @widget: a CameraWidget
* @widget: a #CameraWidget
* @info: Information about above widget
*
* Sets the information about the widget.
@@ -216,7 +218,7 @@ gp_widget_set_info (CameraWidget *widget, const char *info)
/**
* gp_widget_get_name:
* @widget: a CameraWidget
* @widget: a #CameraWidget
* @name: Name of above widget
*
* Gets the name of the widget.
@@ -234,7 +236,7 @@ gp_widget_get_name (CameraWidget *widget, const char **name)
/**
* gp_widget_set_name:
* @widget: a CameraWidget
* @widget: a #CameraWidget
* @name: Name of above widget
*
* Sets the name of the widget.
@@ -254,7 +256,7 @@ gp_widget_set_name (CameraWidget *widget, const char *name)
/**
* gp_widget_get_id:
* @widget: a CameraWidget
* @widget: a #CameraWidget
* @id:
*
* Retreives the unique id of the CameraWidget.
@@ -281,7 +283,7 @@ gp_widget_set_changed (CameraWidget *widget, int changed)
/**
* gp_widget_get_type:
* @widget: a CameraWidget
* @widget: a #CameraWidget
* @type:
*
* Retreives the type of the CameraWidget.
@@ -299,7 +301,7 @@ gp_widget_get_type (CameraWidget *widget, CameraWidgetType *type)
/**
* gp_widget_get_label:
* @widget: a CameraWidget
* @widget: a #CameraWidget
* @label:
*
* Retreives the label of the CameraWidget.
@@ -317,7 +319,7 @@ gp_widget_get_label (CameraWidget *widget, const char **label)
/**
* gp_widget_set_value:
* @widget: a CameraWidget
* @widget: a #CameraWidget
* @value:
*
* Sets the value of the widget. Please pass
@@ -370,7 +372,7 @@ gp_widget_set_value (CameraWidget *widget, void *value)
/**
* gp_widget_get_value:
* @widget: a CameraWidget
* @widget: a #CameraWidget
* @value:
*
* Retreives the value of the CameraWidget.
@@ -434,7 +436,7 @@ gp_widget_append (CameraWidget *parent, CameraWidget *child)
/**
* gp_widget_prepend:
* @parent: a CameraWidget
* @parent: a #CameraWidget
* @child: the CameraWidget you would like to prepend to above
*
* Prepends a CameraWidget to a CameraWidget.
@@ -468,7 +470,7 @@ gp_widget_prepend (CameraWidget *parent, CameraWidget *child)
/**
* gp_widget_count_children:
* @widget: a CameraWidget
* @widget: a #CameraWidget
*
* Counts the children of the CameraWidget.
*
@@ -507,8 +509,9 @@ gp_widget_get_child (CameraWidget *parent, int child_number,
/**
* gp_widget_get_child_by_label:
* @widget: a CameraWidget
* @widget: a #CameraWidget
* @label: the label of the child
* @child:
*
* Retreives the child with label @label of the CameraWidget.
*
@@ -544,8 +547,9 @@ gp_widget_get_child_by_label (CameraWidget *widget, const char *label,
/**
* gp_widget_get_child_by_id:
* @widget: a CameraWidget
* @widget: a #CameraWidget
* @id: the id of the child
* @child:
*
* Retreives the child with id @id of the widget.
*
@@ -580,7 +584,7 @@ gp_widget_get_child_by_id (CameraWidget *widget, int id, CameraWidget **child)
/**
* gp_widget_get_child_by_name:
* @widget: a CameraWidget
* @widget: a #CameraWidget
* @name: the name of the child
*
* Retreives the child with name @name of the widget.
@@ -627,7 +631,7 @@ gp_widget_get_parent (CameraWidget *widget, CameraWidget **parent)
/**
* gp_widget_get_root:
* @widget: a CameraWidget
* @widget: a #CameraWidget
* @root:
*
* Retreives the root of the CameraWidget.
@@ -674,8 +678,8 @@ gp_widget_set_range (CameraWidget *range, float min, float max, float increment)
}
/**
* gp_widget_get_range
* @range: a CameraWidget of type GP_WIDGET_RANGE
* gp_widget_get_range:
* @range: a #CameraWidget of type GP_WIDGET_RANGE
* @min:
* @max:
* @increment:
@@ -701,7 +705,7 @@ gp_widget_get_range (CameraWidget *range, float *min, float *max,
/**
* gp_widget_add_choice:
* @widget: a CameraWidget of type GP_WIDGET_RADIO or GP_WIDGET_MENU
* @widget: a #CameraWidget of type GP_WIDGET_RADIO or GP_WIDGET_MENU
* @choice:
*
* Adds a choice to the CameraWidget.
@@ -724,7 +728,7 @@ gp_widget_add_choice (CameraWidget *widget, const char *choice)
/**
* gp_widget_count_choices:
* @widget: a CameraWidget of type GP_WIDGET_RADIO or GP_WIDGET_MENU
* @widget: a #CameraWidget of type GP_WIDGET_RADIO or GP_WIDGET_MENU
*
* Counts the choices of the CameraWidget.
*
@@ -743,7 +747,7 @@ gp_widget_count_choices (CameraWidget *widget)
/**
* gp_widget_get_choice:
* @widget: a CameraWidget of type GP_WIDGET_RADIO or GP_WIDGET_MENU
* @widget: a #CameraWidget of type GP_WIDGET_RADIO or GP_WIDGET_MENU
* @choice_number:
* @choice:
*
@@ -769,7 +773,7 @@ gp_widget_get_choice (CameraWidget *widget, int choice_number,
/**
* gp_widget_changed:
* @widget: a CameraWidget
* @widget: a #CameraWidget
*
* Returns the changed flag (1 if value of widget has been changed) of the
* CameraWidget and sets it to 0.