@@ -335,6 +335,8 @@ imageui_set_property(GObject *object,
335335{
336336 Imageui * imageui = (Imageui * ) object ;
337337
338+ double zoom ;
339+
338340#ifdef DEBUG_VERBOSE
339341 {
340342 g_autofree char * str = g_strdup_value_contents (value );
@@ -366,7 +368,7 @@ imageui_set_property(GObject *object,
366368 case PROP_ZOOM :
367369 /* Scale by the zoom factor (SVG etc. zoom) we picked on load.
368370 */
369- double zoom = g_value_get_double (value );
371+ zoom = g_value_get_double (value );
370372 zoom /= imageui -> tilesource -> zoom ;
371373
372374 g_object_set (imageui -> imagedisplay ,
@@ -396,6 +398,8 @@ imageui_get_property(GObject *object,
396398{
397399 Imageui * imageui = IMAGEUI (object );
398400
401+ double zoom ;
402+
399403 switch (prop_id ) {
400404 case PROP_TILESOURCE :
401405 g_value_set_object (value , imageui -> tilesource );
@@ -411,18 +415,14 @@ imageui_get_property(GObject *object,
411415 break ;
412416
413417 case PROP_ZOOM :
414- double zoom ;
415-
416418 g_object_get (imageui -> imagedisplay ,
417419 "zoom" , & zoom ,
418420 NULL );
419421
420422 /* Scale by the zoom factor (SVG etc. zoom) we picked on load.
421423 */
422424 zoom *= imageui -> zoom_load ;
423-
424425 g_value_set_double (value , zoom );
425-
426426 break ;
427427
428428 case PROP_X :
@@ -973,16 +973,18 @@ imageui_drag_begin(GtkEventControllerMotion *self,
973973{
974974 Imageui * imageui = IMAGEUI (user_data );
975975
976+ guint modifiers ;
977+ Regionview * regionview ;
978+
976979#ifdef DEBUG_VERBOSE
977980 printf ("imageui_drag_begin: start_x = %g, start_y = %g\n" ,
978981 start_x , start_y );
979982#endif /*DEBUG_VERBOSE*/
980983
981984 switch (imageui -> state ) {
982985 case IMAGEUI_WAIT :
983- guint modifiers = get_modifiers (GTK_EVENT_CONTROLLER (self ));
984- Regionview * regionview =
985- imageui_find_regionview (imageui , start_x , start_y );
986+ modifiers = get_modifiers (GTK_EVENT_CONTROLLER (self ));
987+ regionview = imageui_find_regionview (imageui , start_x , start_y );
986988
987989 if (regionview ) {
988990 imageui -> state = IMAGEUI_SELECT ;
0 commit comments