[Rawstudio-commit] r4419 - trunk/src

[Anders Kvist]

Author: akv
Date: 2013-06-25 22:56:20 +0200 (Tue, 25 Jun 2013)
New Revision: 4419

Modified:
   trunk/src/gtk-interface.c
   trunk/src/rs-enfuse.c
   trunk/src/rs-geo-db.c
Log:
Reverted some of rev 4418.

Modified: trunk/src/gtk-interface.c
===================================================================
--- trunk/src/gtk-interface.c   2013-06-25 20:53:17 UTC (rev 4418)
+++ trunk/src/gtk-interface.c   2013-06-25 20:56:20 UTC (rev 4419)
@@ -1586,7 +1586,7 @@
        {
                rs->toolbox = gtk_notebook_new();
                gtk_notebook_append_page(GTK_NOTEBOOK(rs->toolbox), tools, 
gtk_label_new(_("Tools")));
-               gtk_notebook_append_page(GTK_NOTEBOOK(rs->toolbox), geolocbox, 
gtk_label_new(_("Map")));
+               //gtk_notebook_append_page(GTK_NOTEBOOK(rs->toolbox), 
geolocbox, gtk_label_new(_("Map")));
                gtk_notebook_append_page(GTK_NOTEBOOK(rs->toolbox), batchbox, 
gtk_label_new(_("Batch")));
                gtk_notebook_append_page(GTK_NOTEBOOK(rs->toolbox), open_box, 
gtk_label_new(_("Open")));
        }

Modified: trunk/src/rs-enfuse.c
===================================================================
--- trunk/src/rs-enfuse.c       2013-06-25 20:53:17 UTC (rev 4418)
+++ trunk/src/rs-enfuse.c       2013-06-25 20:56:20 UTC (rev 4419)
@@ -35,7 +35,7 @@
 #include "rs-metadata.h"
 #include "conf_interface.h"
 
-#define ENFUSE_OPTIONS "-d 8"
+#define ENFUSE_OPTIONS "-d 16"
 #define ENFUSE_OPTIONS_QUICK "-d 8"
 
 gboolean has_align_image_stack ();

Modified: trunk/src/rs-geo-db.c
===================================================================
--- trunk/src/rs-geo-db.c       2013-06-25 20:53:17 UTC (rev 4418)
+++ trunk/src/rs-geo-db.c       2013-06-25 20:56:20 UTC (rev 4419)
@@ -254,6 +254,7 @@
                                                                rc = 
sqlite3_bind_double (stmt, 4, ele);
                                                                rc = 
sqlite3_bind_int (stmt, 5, import_id);
                                                                rc = 
sqlite3_step(stmt);
+                                                               
sqlite3_finalize(stmt);  
                                                        }
                                                        
gui_progress_advance_one(progress);
                                                        GUI_CATCHUP();
@@ -268,7 +269,6 @@
                }
                cur = cur->next;
        }
-       sqlite3_finalize(stmt);
        gui_progress_free(progress);
 }
 
@@ -576,7 +576,6 @@
        rs->photo->time_offset = time_offset;
   
        rs_geo_db_find_coordinate(geodb, rs->photo->metadata->timestamp + 
time_offset);
-       printf("coordinate: %f %f\n", geodb->lon, geodb->lat);
        rs_geo_db_set_coordinates(geodb, rs->photo);
 
        osm_gps_map_track_remove_all(geodb->map);


_______________________________________________
Rawstudio-commit mailing list
Rawstudio-commit@rawstudio.org
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit