flickcurl.h   flickcurl.h 
skipping to change at line 405 skipping to change at line 405
typedef struct { typedef struct {
int is_public; int is_public;
int is_contact; int is_contact;
int is_friend; int is_friend;
int is_family; int is_family;
int perm_comment; int perm_comment;
int perm_addmeta; int perm_addmeta;
} flickcurl_perms; } flickcurl_perms;
/** /**
* flickcurl_tag_namespace:
* @name: Name
* @usage_count: Number of uses of this namespace
* @predicates_count: Number of predicates for this namespace
*
* A machine tags namespace
*/
typedef struct {
char *name;
int usage_count;
int predicates_count;
} flickcurl_tag_namespace;
/**
* flickcurl_tag_predicate_value:
* @usage_count: Number of uses of this predicate-value pair
* @predicate: Predicate name or NULL
* @used_in_namespace_count: number of namespaces this pair is used in
* @value: Value or NULL
*
* A machine tag predicate-value pair
*/
typedef struct {
int usage_count;
char *predicate;
int used_in_namespace_count;
char *value;
} flickcurl_tag_predicate_value;
/**
* flickcurl_location: * flickcurl_location:
* @latitude: The latitude from -90 to 90 * @latitude: The latitude from -90 to 90
* @longitude: The longitude from -180 to 180 * @longitude: The longitude from -180 to 180
* @accuracy: Recorded accuracy level of the location. * @accuracy: Recorded accuracy level of the location.
* World level is 1, Country is ~3, Region ~6, City ~11, Street * World level is 1, Country is ~3, Region ~6, City ~11, Street
* ~16. Current range is 1-16. (<0 for unknown accuracy) * ~16. Current range is 1-16. (<0 for unknown accuracy)
* *
* A Location in the world with an optional accuracy * A Location in the world with an optional accuracy
*/ */
typedef struct { typedef struct {
skipping to change at line 453 skipping to change at line 483
/** /**
* flickcurl_place: * flickcurl_place:
* @names: Array of place names * @names: Array of place names
* @ids: Array of place IDs * @ids: Array of place IDs
* @urls: Array of place urls. * @urls: Array of place urls.
* @type: Location type of index 0 (the location) usually * @type: Location type of index 0 (the location) usually
* FLICKCURL_PLACE_LOCATION but may be wider * FLICKCURL_PLACE_LOCATION but may be wider
* @woe_ids: Array of WOE IDs * @woe_ids: Array of WOE IDs
* @location: location for this place * @location: location for this place
* @count: count of photos (when used for flickcurl_places_forUser() ) * @count: count of photos (when used for flickcurl_places_placesForUser()
)
* @shapedata: XML string of &lt;shapedata&gt; element and content elements
when present (or NULL)
* @shapedata_length: size of @shapedate string
* @shapefile_urls: NULL-terminated array of pointers to shapefile URLs whe
n present (or NULL)
* @shapefile_urls_count: number of entries in @shapefile_urls array
* *
* A Place. * A Place.
* *
* Index 0 in the array is the location itself. flickcurl_get_place_type_la bel() * Index 0 in the array is the location itself. flickcurl_get_place_type_la bel()
* can give labels for the array indexes of type #flickcurl_place_type. * can give labels for the array indexes of type #flickcurl_place_type.
* *
*/ */
typedef struct { typedef struct {
char* names[FLICKCURL_PLACE_LAST+1]; char* names[FLICKCURL_PLACE_LAST+1];
char* ids[FLICKCURL_PLACE_LAST+1]; char* ids[FLICKCURL_PLACE_LAST+1];
char* urls[FLICKCURL_PLACE_LAST+1]; char* urls[FLICKCURL_PLACE_LAST+1];
flickcurl_place_type type; flickcurl_place_type type;
char* woe_ids[FLICKCURL_PLACE_LAST+1]; char* woe_ids[FLICKCURL_PLACE_LAST+1];
flickcurl_location location; flickcurl_location location;
int count; int count;
/* shapefile fields */
char* shapedata;
size_t shapedata_length;
char** shapefile_urls;
int shapefile_urls_count;
} flickcurl_place; } flickcurl_place;
/** /**
* flickcurl_tag: * flickcurl_tag:
* @photo: Associated photo object if any * @photo: Associated photo object if any
* @id: tag identifier * @id: tag identifier
* @author: author (may be NULL) * @author: author (may be NULL)
* @authorname: author real name (may be NULL) * @authorname: author real name (may be NULL)
* @raw: raw tag as user typed it (may be NULL, but if so @cooked must be n ot NULL) * @raw: raw tag as user typed it (may be NULL, but if so @cooked must be n ot NULL)
* @cooked: cooked tag (may be NULL, but if so @raw must not be NULL) * @cooked: cooked tag (may be NULL, but if so @raw must not be NULL)
skipping to change at line 1227 skipping to change at line 1267
/* flickcurl* object set methods */ /* flickcurl* object set methods */
FLICKCURL_API FLICKCURL_API
const char* flickcurl_get_api_key(flickcurl *fc); const char* flickcurl_get_api_key(flickcurl *fc);
FLICKCURL_API FLICKCURL_API
const char* flickcurl_get_shared_secret(flickcurl *fc); const char* flickcurl_get_shared_secret(flickcurl *fc);
FLICKCURL_API FLICKCURL_API
const char* flickcurl_get_auth_token(flickcurl *fc); const char* flickcurl_get_auth_token(flickcurl *fc);
/* other flickcurl class destructors */ /* other flickcurl class destructors */
FLICKCURL_API FLICKCURL_API
void flickcurl_free_tag_namespace(flickcurl_tag_namespace *tag_nspace);
FLICKCURL_API
void flickcurl_free_tag_namespaces(flickcurl_tag_namespace** tag_nspaces);
FLICKCURL_API
void flickcurl_free_tag(flickcurl_tag *t); void flickcurl_free_tag(flickcurl_tag *t);
FLICKCURL_API FLICKCURL_API
void flickcurl_free_tag_clusters(flickcurl_tag_clusters *tcs); void flickcurl_free_tag_clusters(flickcurl_tag_clusters *tcs);
FLICKCURL_API FLICKCURL_API
void flickcurl_free_photo(flickcurl_photo *photo); void flickcurl_free_photo(flickcurl_photo *photo);
FLICKCURL_API FLICKCURL_API
void flickcurl_free_photos(flickcurl_photo** photos); void flickcurl_free_photos(flickcurl_photo** photos);
FLICKCURL_API FLICKCURL_API
void flickcurl_free_photos_list(flickcurl_photos_list* photos_list); void flickcurl_free_photos_list(flickcurl_photos_list* photos_list);
FLICKCURL_API FLICKCURL_API
skipping to change at line 1269 skipping to change at line 1313
FLICKCURL_API FLICKCURL_API
void flickcurl_free_tickets(flickcurl_ticket **tickets_object); void flickcurl_free_tickets(flickcurl_ticket **tickets_object);
FLICKCURL_API FLICKCURL_API
void flickcurl_free_user_upload_status(flickcurl_user_upload_status *u); void flickcurl_free_user_upload_status(flickcurl_user_upload_status *u);
FLICKCURL_API FLICKCURL_API
void flickcurl_free_place(flickcurl_place* place); void flickcurl_free_place(flickcurl_place* place);
FLICKCURL_API FLICKCURL_API
void flickcurl_free_places(flickcurl_place** places_object); void flickcurl_free_places(flickcurl_place** places_object);
FLICKCURL_API FLICKCURL_API
void flickcurl_free_video(flickcurl_video *video); void flickcurl_free_video(flickcurl_video *video);
FLICKCURL_API
void flickcurl_free_tag_predicate_value(flickcurl_tag_predicate_value* tag_
pv);
FLICKCURL_API
void flickcurl_free_tag_predicate_values(flickcurl_tag_predicate_value **ta
g_pvs);
/* utility methods */ /* utility methods */
/* get an image URL for a photo in some size */ /* get an image URL for a photo in some size */
FLICKCURL_API FLICKCURL_API
char* flickcurl_photo_as_source_uri(flickcurl_photo *photo, const char c); char* flickcurl_photo_as_source_uri(flickcurl_photo *photo, const char c);
/* get labels for various field/types */ /* get labels for various field/types */
FLICKCURL_API FLICKCURL_API
const char* flickcurl_get_photo_field_label(flickcurl_photo_field_type fiel d); const char* flickcurl_get_photo_field_label(flickcurl_photo_field_type fiel d);
FLICKCURL_API FLICKCURL_API
const char* flickcurl_get_person_field_label(flickcurl_person_field_type fi eld); const char* flickcurl_get_person_field_label(flickcurl_person_field_type fi eld);
skipping to change at line 1391 skipping to change at line 1439
void flickcurl_free_group(flickcurl_group *group); void flickcurl_free_group(flickcurl_group *group);
FLICKCURL_API FLICKCURL_API
void flickcurl_free_groups(flickcurl_group **groups_object); void flickcurl_free_groups(flickcurl_group **groups_object);
/* flickr.interestingness */ /* flickr.interestingness */
FLICKCURL_API FLICKCURL_API
flickcurl_photo** flickcurl_interestingness_getList(flickcurl* fc, const ch ar* date, const char* extras, int per_page, int page); flickcurl_photo** flickcurl_interestingness_getList(flickcurl* fc, const ch ar* date, const char* extras, int per_page, int page);
FLICKCURL_API FLICKCURL_API
flickcurl_photos_list* flickcurl_interestingness_getList_params(flickcurl* fc, const char* date, flickcurl_photos_list_params* list_params); flickcurl_photos_list* flickcurl_interestingness_getList_params(flickcurl* fc, const char* date, flickcurl_photos_list_params* list_params);
/* flickr.machinetags */
FLICKCURL_API
flickcurl_tag_namespace** flickcurl_machinetags_getNamespaces(flickcurl* fc
, const char* predicate, int per_page, int page);
FLICKCURL_API
flickcurl_tag_predicate_value** flickcurl_machinetags_getPairs(flickcurl* f
c, const char* namespace, const char* predicate, int per_page, int page);
FLICKCURL_API
flickcurl_tag_predicate_value** flickcurl_machinetags_getPredicates(flickcu
rl* fc, const char* namespace, int per_page, int page);
FLICKCURL_API
flickcurl_tag_predicate_value** flickcurl_machinetags_getValues(flickcurl*
fc, const char* namespace, const char* predicate, int per_page, int page);
/* flickr.photo.getSizes */ /* flickr.photo.getSizes */
FLICKCURL_API FLICKCURL_API
void flickcurl_free_size(flickcurl_size *size); void flickcurl_free_size(flickcurl_size *size);
FLICKCURL_API FLICKCURL_API
void flickcurl_free_sizes(flickcurl_size **sizes_object); void flickcurl_free_sizes(flickcurl_size **sizes_object);
/* flickr.people */ /* flickr.people */
FLICKCURL_API FLICKCURL_API
char* flickcurl_people_findByEmail(flickcurl* fc, const char* email); char* flickcurl_people_findByEmail(flickcurl* fc, const char* email);
FLICKCURL_API FLICKCURL_API
skipping to change at line 1491 skipping to change at line 1549
int flickcurl_photos_setSafetyLevel(flickcurl* fc, const char* photo_id, in t safety_level, int hidden); int flickcurl_photos_setSafetyLevel(flickcurl* fc, const char* photo_id, in t safety_level, int hidden);
FLICKCURL_API FLICKCURL_API
int flickcurl_photos_setTags(flickcurl* fc, const char* photo_id, const cha r* tags); int flickcurl_photos_setTags(flickcurl* fc, const char* photo_id, const cha r* tags);
/* flickr.places */ /* flickr.places */
FLICKCURL_API FLICKCURL_API
flickcurl_place** flickcurl_places_find(flickcurl* fc, const char* query); flickcurl_place** flickcurl_places_find(flickcurl* fc, const char* query);
FLICKCURL_API FLICKCURL_API
flickcurl_place* flickcurl_places_findByLatLon(flickcurl* fc, double lat, d ouble lon, int accuracy); flickcurl_place* flickcurl_places_findByLatLon(flickcurl* fc, double lat, d ouble lon, int accuracy);
FLICKCURL_API FLICKCURL_API
flickcurl_place** flickcurl_places_getChildrenWithPhotosPublic(flickcurl* f
c, const char* place_id, const char* woe_id);
FLICKCURL_API
flickcurl_place* flickcurl_places_getInfo(flickcurl* fc, const char* place_
id, const char* woe_id);
FLICKCURL_API
flickcurl_place* flickcurl_places_getInfoByUrl(flickcurl* fc, const char* u
rl);
FLICKCURL_API
flickcurl_place* flickcurl_places_resolvePlaceId(flickcurl* fc, const char* place_id); flickcurl_place* flickcurl_places_resolvePlaceId(flickcurl* fc, const char* place_id);
FLICKCURL_API FLICKCURL_API
flickcurl_place* flickcurl_places_resolvePlaceURL(flickcurl* fc, const char * url); flickcurl_place* flickcurl_places_resolvePlaceURL(flickcurl* fc, const char * url);
FLICKCURL_API FLICKCURL_API
const char* flickcurl_get_place_type_label(flickcurl_place_type place_type) ; const char* flickcurl_get_place_type_label(flickcurl_place_type place_type) ;
flickcurl_place_type flickcurl_get_place_type_by_label(const char* place_la bel); flickcurl_place_type flickcurl_get_place_type_by_label(const char* place_la bel);
FLICKCURL_API FLICKCURL_API
flickcurl_place** flickcurl_places_placesForUser(flickcurl* fc, flickcurl_p
lace_type place_type, int woe_id, const char* place_id, int threshold);
FLICKCURL_API FLICKCURL_DEPRECATED
flickcurl_place** flickcurl_places_forUser(flickcurl* fc, flickcurl_place_t ype place_type, int woe_id, const char* place_id, int threshold); flickcurl_place** flickcurl_places_forUser(flickcurl* fc, flickcurl_place_t ype place_type, int woe_id, const char* place_id, int threshold);
/* flickr.contacts */ /* flickr.contacts */
FLICKCURL_API FLICKCURL_API
void flickcurl_free_contact(flickcurl_contact *contact_object); void flickcurl_free_contact(flickcurl_contact *contact_object);
FLICKCURL_API FLICKCURL_API
void flickcurl_free_contacts(flickcurl_contact **contacts_object); void flickcurl_free_contacts(flickcurl_contact **contacts_object);
FLICKCURL_API FLICKCURL_API
flickcurl_contact** flickcurl_contacts_getList(flickcurl* fc, const char* f ilter, int page, int per_page); flickcurl_contact** flickcurl_contacts_getList(flickcurl* fc, const char* f ilter, int page, int per_page);
FLICKCURL_API FLICKCURL_API
skipping to change at line 1621 skipping to change at line 1687
/* flickr.reflection */ /* flickr.reflection */
FLICKCURL_API FLICKCURL_API
void flickcurl_free_method(flickcurl_method *method); void flickcurl_free_method(flickcurl_method *method);
FLICKCURL_API FLICKCURL_API
char** flickcurl_reflection_getMethods(flickcurl* fc); char** flickcurl_reflection_getMethods(flickcurl* fc);
FLICKCURL_API FLICKCURL_API
flickcurl_method* flickcurl_reflection_getMethodInfo(flickcurl* fc, const c har* name); flickcurl_method* flickcurl_reflection_getMethodInfo(flickcurl* fc, const c har* name);
/* flickr.tag */ /* flickr.tag */
FLICKCURL_API FLICKCURL_API
flickcurl_photos_list* flickcurl_tags_getClusterPhotos(flickcurl* fc, const
char* tag, const char* cluster_id, flickcurl_photos_list_params* list_para
ms);
FLICKCURL_API
flickcurl_tag_clusters* flickcurl_tags_getClusters(flickcurl* fc, const cha r* tag); flickcurl_tag_clusters* flickcurl_tags_getClusters(flickcurl* fc, const cha r* tag);
FLICKCURL_API FLICKCURL_API
flickcurl_tag** flickcurl_tags_getHotList(flickcurl* fc, const char* period , int tag_count); flickcurl_tag** flickcurl_tags_getHotList(flickcurl* fc, const char* period , int tag_count);
FLICKCURL_API FLICKCURL_API
flickcurl_tag** flickcurl_tags_getListPhoto(flickcurl* fc, const char* phot o_id); flickcurl_tag** flickcurl_tags_getListPhoto(flickcurl* fc, const char* phot o_id);
FLICKCURL_API FLICKCURL_API
flickcurl_tag** flickcurl_tags_getListUser(flickcurl* fc, const char* user_ id); flickcurl_tag** flickcurl_tags_getListUser(flickcurl* fc, const char* user_ id);
FLICKCURL_API FLICKCURL_API
flickcurl_tag** flickcurl_tags_getListUserPopular(flickcurl* fc, const char * user_id, int pop_count); flickcurl_tag** flickcurl_tags_getListUserPopular(flickcurl* fc, const char * user_id, int pop_count);
FLICKCURL_API FLICKCURL_API
 End of changes. 9 change blocks. 
1 lines changed or deleted 84 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/