From 6bad435b5b109a8c5ad1de8b52d173506e8dcaf7 Mon Sep 17 00:00:00 2001 From: ice0 Date: Aug 28 2018 18:11:26 +0000 Subject: Fixed CLang warnings --- diff --git a/synfig-core/src/modules/lyr_std/bevel.cpp b/synfig-core/src/modules/lyr_std/bevel.cpp index 7dc5262..15507aa 100644 --- a/synfig-core/src/modules/lyr_std/bevel.cpp +++ b/synfig-core/src/modules/lyr_std/bevel.cpp @@ -576,10 +576,10 @@ Layer_Bevel::accelerated_cairorender(Context context, cairo_t *cr,int quality, c Blur(size,type,&stagetwo)(blurred,workdesc.get_br()-workdesc.get_tl(),blurred); // Add the bevel effect - int u = halfsizex+abs(offset_u), v = halfsizey+abs(offset_v); + int v = halfsizey+abs(offset_v); for(y=0;yset_wh(renddesc.get_w(),renddesc.get_h()); - int u = halfsizex-(origin_u<0?origin_u:0), v = halfsizey-(origin_v<0?origin_v:0); + int v = halfsizey-(origin_v<0?origin_v:0); for(y=0;ya) + (*b)*(mtx->c) + (mtx->e); - auxb= (*a)*(mtx->b) + (*b)*(mtx->d) + (mtx->f); + float auxa= (*a)*(mtx->a) + (*b)*(mtx->c) + (mtx->e); + float auxb= (*a)*(mtx->b) + (*b)*(mtx->d) + (mtx->f); *a=auxa; *b=auxb; return; diff --git a/synfig-core/src/synfig/curveset.cpp b/synfig-core/src/synfig/curveset.cpp index 67ae174..0da9519 100644 --- a/synfig-core/src/synfig/curveset.cpp +++ b/synfig-core/src/synfig/curveset.cpp @@ -147,25 +147,22 @@ struct ipoint { ipoint *search = this; - if(*i < *this) + if (*i < *this) { //we go forward - search = this; do { search = search->next; - }while(*i < *search && search != this); //ending conditions... + } while (*i < *search && search != this); //ending conditions... //now we insert previously... search->insert_before(i); - }else if(*i > *this) - { + } else if (*i > *this) { //we go backwards... - search = this; do { search = search->prev; - }while(*i > *search && search != this); //ending conditions... + } while (*i > *search && search != this); //ending conditions... //now we insert previously... search->insert_after(i); diff --git a/synfig-core/src/synfig/filesystemtemporary.cpp b/synfig-core/src/synfig/filesystemtemporary.cpp index db30911..ef84f67 100644 --- a/synfig-core/src/synfig/filesystemtemporary.cpp +++ b/synfig-core/src/synfig/filesystemtemporary.cpp @@ -377,7 +377,7 @@ FileSystemTemporary::save_changes( { if (!remove_files) file_system->file_remove(i->second.tmp_filename); - processed = true; + files.erase(i++); } else i++; diff --git a/synfig-core/src/synfig/layers/layer_shape.cpp b/synfig-core/src/synfig/layers/layer_shape.cpp index 7fbf631..5b7675b 100644 --- a/synfig-core/src/synfig/layers/layer_shape.cpp +++ b/synfig-core/src/synfig/layers/layer_shape.cpp @@ -1237,10 +1237,10 @@ Layer_Shape::accelerated_render(Context context,Surface *surface,int quality, co Blur(feather,feather,blurtype,&stagethree)(shapesurface,workdesc.get_br()-workdesc.get_tl(),shapesurface); //blend with stuff below it... - unsigned int u = halfsizex, v = halfsizey, x = 0, y = 0; + unsigned int v = halfsizey, x = 0, y = 0; for(y = 0; y < h; y++,v++) { - u = halfsizex; + unsigned int u = halfsizex; for(x = 0; x < w; x++,u++) { Color::value_type a = shapesurface[v][u].get_a(); diff --git a/synfig-studio/src/gui/canvasview.cpp b/synfig-studio/src/gui/canvasview.cpp index b2fa455..88ef10f 100644 --- a/synfig-studio/src/gui/canvasview.cpp +++ b/synfig-studio/src/gui/canvasview.cpp @@ -1229,6 +1229,8 @@ CanvasView::create_time_bar() #endif // fix thickness of statusbar + assert(statusbar); + Gtk::Widget *widget = statusbar; while(Gtk::Container *container = dynamic_cast(widget)) { widget->set_margin_top(0); diff --git a/synfig-studio/src/gui/trees/layergrouptree.cpp b/synfig-studio/src/gui/trees/layergrouptree.cpp index 7a0254d..bc01050 100644 --- a/synfig-studio/src/gui/trees/layergrouptree.cpp +++ b/synfig-studio/src/gui/trees/layergrouptree.cpp @@ -127,8 +127,10 @@ LayerGroupTree::set_model(Glib::RefPtr layer_group_tree_sto Gtk::TreeView::Column* column = get_column(2); if (column) + { column->set_sort_column(layer_group_tree_store_->model.label); - column->clicked(); + column->clicked(); + } } void diff --git a/synfig-studio/src/gui/widgets/widget_timeslider.cpp b/synfig-studio/src/gui/widgets/widget_timeslider.cpp index 6f69b34..61224fe 100644 --- a/synfig-studio/src/gui/widgets/widget_timeslider.cpp +++ b/synfig-studio/src/gui/widgets/widget_timeslider.cpp @@ -209,10 +209,10 @@ bool Widget_Timeslider::on_draw(const Cairo::RefPtr &cr) std::vector ranges; - unsigned int pos = 0; + //unsigned int pos = 0; // build a list of all the factors of the frame rate - for (int i = 1; i*i <= ifps; i++) + for (int i = 1, pos = 0; i*i <= ifps; i++) if ((ifps%i) == 0) { ranges.insert(ranges.begin()+pos, i/fps); @@ -223,8 +223,8 @@ bool Widget_Timeslider::on_draw(const Cairo::RefPtr &cr) // fill in any gaps where one factor is more than 2 times the previous std::vector::iterator iter, next; - pos = 0; - for (pos = 0; pos < ranges.size()-1; pos++) + + for (unsigned int pos = 0; pos < ranges.size()-1; pos++) { iter = ranges.begin()+pos; next = iter+1; diff --git a/synfig-studio/src/synfigapp/instance.cpp b/synfig-studio/src/synfigapp/instance.cpp index 44f16e1..ff50dc4 100644 --- a/synfig-studio/src/synfigapp/instance.cpp +++ b/synfig-studio/src/synfigapp/instance.cpp @@ -579,22 +579,20 @@ Instance::backup() { if (!get_action_count()) return true; - bool success = true; FileSystemTemporary::Handle temporary_filesystem = FileSystemTemporary::Handle::cast_dynamic(get_canvas()->get_file_system()); - if (success && !temporary_filesystem) + + if (!temporary_filesystem) { warning("Cannot backup, canvas was not attached to temporary file system: %s", get_file_name().c_str()); - success = false; return false; } // don't save images while backup //if (success) // save_all_layers(); - if (success) - success = save_canvas(get_canvas()->get_identifier(), get_canvas(), false); - if (success) - success = temporary_filesystem->save_temporary(); - return success; + if (!save_canvas(get_canvas()->get_identifier(), get_canvas(), false)) + return false; + + return temporary_filesystem->save_temporary(); } bool