Author: abrander
Date: 2009-12-31 03:44:28 +0100 (Thu, 31 Dec 2009)
New Revision: 2946
Modified:
branches/rawstudio-ng-color/librawstudio/rs-color-space.c
branches/rawstudio-ng-color/librawstudio/rs-lens-db-editor.c
branches/rawstudio-ng-color/librawstudio/rs-lens-db.c
branches/rawstudio-ng-color/librawstudio/rs-lens-db.h
Log:
Fixed a few warnings.
Modified: branches/rawstudio-ng-color/librawstudio/rs-color-space.c
===================================================================
--- branches/rawstudio-ng-color/librawstudio/rs-color-space.c 2009-12-31
02:11:12 UTC (rev 2945)
+++ branches/rawstudio-ng-color/librawstudio/rs-color-space.c 2009-12-31
02:44:28 UTC (rev 2946)
@@ -82,11 +82,11 @@
g_assert(RS_IS_COLOR_SPACE(color_space));
/* Could this be replaced by bradford? */
- const RS_VECTOR3 identity = {1.0, 1.0, 1.0};
+ const RS_VECTOR3 identity = {{1.0}, {1.0}, {1.0}};
const RS_VECTOR3 w1 = vector3_multiply_matrix(&identity, matrix);
const RS_VECTOR3 w2 = XYZ_WP_D50;
- const RS_VECTOR3 scale_vector = { w2.x/w1.x, w2.y/w1.y, w2.z/w2.z };
+ const RS_VECTOR3 scale_vector = { {w2.x/w1.x}, {w2.y/w1.y}, {w2.z/w2.z}
};
const RS_MATRIX3 scale = vector3_as_diagonal(&scale_vector);
matrix3_multiply(&scale, matrix, &color_space->matrix_to_pcs);
Modified: branches/rawstudio-ng-color/librawstudio/rs-lens-db-editor.c
===================================================================
--- branches/rawstudio-ng-color/librawstudio/rs-lens-db-editor.c
2009-12-31 02:11:12 UTC (rev 2945)
+++ branches/rawstudio-ng-color/librawstudio/rs-lens-db-editor.c
2009-12-31 02:44:28 UTC (rev 2946)
@@ -372,8 +372,6 @@
gboolean
view_popupmenu (GtkWidget *treeview, gpointer userdata)
{
- GtkTreePath *path;
-
GtkTreeSelection *selection;
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
GtkTreeModel *tree_model =
gtk_tree_view_get_model(GTK_TREE_VIEW(treeview));
Modified: branches/rawstudio-ng-color/librawstudio/rs-lens-db.c
===================================================================
--- branches/rawstudio-ng-color/librawstudio/rs-lens-db.c 2009-12-31
02:11:12 UTC (rev 2945)
+++ branches/rawstudio-ng-color/librawstudio/rs-lens-db.c 2009-12-31
02:44:28 UTC (rev 2946)
@@ -222,9 +222,6 @@
{
RSLens *lens = rs_lens_new();
- xmlChar *filename = NULL;
- gint setting_id = -1;
-
entry = cur->xmlChildrenNode;
while (entry)
@@ -237,13 +234,13 @@
else if ((!xmlStrcmp(entry->name,
BAD_CAST "lensfun-model")))
g_object_set(lens,
"lensfun-model", val, NULL);
else if ((!xmlStrcmp(entry->name,
BAD_CAST "min-focal")))
- g_object_set(lens, "min-focal",
rs_atof(val), NULL);
+ g_object_set(lens, "min-focal",
rs_atof((gchar *) val), NULL);
else if ((!xmlStrcmp(entry->name,
BAD_CAST "max-focal")))
- g_object_set(lens, "max-focal",
rs_atof(val), NULL);
+ g_object_set(lens, "max-focal",
rs_atof((gchar *) val), NULL);
else if ((!xmlStrcmp(entry->name,
BAD_CAST "min-aperture")))
- g_object_set(lens,
"min-aperture", rs_atof(val), NULL);
+ g_object_set(lens,
"min-aperture", rs_atof((gchar *) val), NULL);
else if ((!xmlStrcmp(entry->name,
BAD_CAST "max-aperture")))
- g_object_set(lens,
"max-aperture", rs_atof(val), NULL);
+ g_object_set(lens,
"max-aperture", rs_atof((gchar *) val), NULL);
else if ((!xmlStrcmp(entry->name,
BAD_CAST "camera-make")))
g_object_set(lens,
"camera-make", val, NULL);
else if ((!xmlStrcmp(entry->name,
BAD_CAST "camera-model")))
@@ -251,7 +248,7 @@
else if ((!xmlStrcmp(entry->name,
BAD_CAST "enabled")))
{
gboolean enabled = FALSE;
- if (g_strcmp0(val, "TRUE") == 0)
+ if (g_strcmp0((gchar *) val,
"TRUE") == 0)
enabled = TRUE;
g_object_set(lens, "enabled",
enabled, NULL);
}
@@ -348,7 +345,7 @@
* @param lens_db A RSLensDb
* @param lens A RSLens to add
*/
-void *
+void
rs_lens_db_add_lens(RSLensDb *lens_db, RSLens *lens)
{
gchar *rs_identifier = NULL;
Modified: branches/rawstudio-ng-color/librawstudio/rs-lens-db.h
===================================================================
--- branches/rawstudio-ng-color/librawstudio/rs-lens-db.h 2009-12-31
02:11:12 UTC (rev 2945)
+++ branches/rawstudio-ng-color/librawstudio/rs-lens-db.h 2009-12-31
02:44:28 UTC (rev 2946)
@@ -71,7 +71,7 @@
* @param lens_db A RSLensDb
* @param lens A RSLens to add
*/
-void *rs_lens_db_add_lens(RSLensDb *lens_db, RSLens *lens);
+void rs_lens_db_add_lens(RSLensDb *lens_db, RSLens *lens);
/**
* Lookup a lens in the database based on information in a RSMetadata
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
