Author: kitone Date: Sun Oct 16 15:39:32 2016 New Revision: 984 URL: http://svn.gna.org/viewcvs/subtitleeditor?rev=984&view=rev Log: Build with the flags -Werror=reorder -Werror=float-conversion.
Modified: trunk/ChangeLog trunk/configure.ac trunk/plugins/actions/scalesubtitles/scalesubtitles.cc trunk/plugins/actions/splitsubtitle/splitsubtitle.cc trunk/plugins/actions/typewriter/typewriter.cc trunk/plugins/subtitleformats/adobeencoredvd/adobeencoredvd.h trunk/plugins/subtitleformats/avidds/avidds.cc trunk/plugins/subtitleformats/bitc/bitc.cc trunk/plugins/subtitleformats/mpsub/mpsub.cc trunk/plugins/subtitleformats/sprucestl/sprucestl.cc trunk/src/gui/automaticspellchecker.cc trunk/src/subtitletime.cc trunk/src/subtitletime.h trunk/src/timeutility.cc trunk/src/we/waveformeditor.cc trunk/src/we/waveformrenderer.cc trunk/src/we/waveformrenderercairo.cc Modified: trunk/ChangeLog URL: http://svn.gna.org/viewcvs/subtitleeditor/trunk/ChangeLog?rev=984&r1=983&r2=984&view=diff ============================================================================== --- trunk/ChangeLog (original) +++ trunk/ChangeLog Sun Oct 16 15:39:32 2016 @@ -1,3 +1,23 @@ +2016-10-16 kitone <kitone<gna.org> + + * configure.ac: + * plugins/actions/scalesubtitles/scalesubtitles.cc: + * plugins/actions/splitsubtitle/splitsubtitle.cc: + * plugins/actions/typewriter/typewriter.cc: + * plugins/subtitleformats/adobeencoredvd/adobeencoredvd.h: + * plugins/subtitleformats/avidds/avidds.cc: + * plugins/subtitleformats/bitc/bitc.cc: + * plugins/subtitleformats/mpsub/mpsub.cc: + * plugins/subtitleformats/sprucestl/sprucestl.cc: + * src/gui/automaticspellchecker.cc: + * src/subtitletime.cc: + * src/subtitletime.h: + * src/timeutility.cc: + * src/we/waveformeditor.cc: + * src/we/waveformrenderer.cc: + * src/we/waveformrenderercairo.cc: + Build with the flags -Werror=reorder -Werror=float-conversion. + 2016-10-16 kitone <kitone<gna.org> * plugins/actions/keyframesmanagement/keyframesgeneratorusingframe.cc: Modified: trunk/configure.ac URL: http://svn.gna.org/viewcvs/subtitleeditor/trunk/configure.ac?rev=984&r1=983&r2=984&view=diff ============================================================================== --- trunk/configure.ac (original) +++ trunk/configure.ac Sun Oct 16 15:39:32 2016 @@ -272,7 +272,7 @@ # ========================================================================= # gcc flags -CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wconversion" #-Werror +CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wconversion -Wreorder -Werror=reorder -Werror=float-conversion" #-Werror # ========================================================================= # make use of ccache Modified: trunk/plugins/actions/scalesubtitles/scalesubtitles.cc URL: http://svn.gna.org/viewcvs/subtitleeditor/trunk/plugins/actions/scalesubtitles/scalesubtitles.cc?rev=984&r1=983&r2=984&view=diff ============================================================================== --- trunk/plugins/actions/scalesubtitles/scalesubtitles.cc (original) +++ trunk/plugins/actions/scalesubtitles/scalesubtitles.cc Sun Oct 16 15:39:32 2016 @@ -272,14 +272,24 @@ const long &source, double scale, const long &sourcedisp, const long &destdisp) { - return (source + (((source - sourcedisp) * scale) + (destdisp - sourcedisp))); + double src = static_cast<double>(source); + double src_disp = static_cast<double>(sourcedisp); + double dest_disp = static_cast<double>(destdisp); + + return static_cast<long>(src + (((src - src_disp) * scale) + (dest_disp - src_disp))); + //return (source + (((source - sourcedisp) * scale) + (destdisp - sourcedisp))); } /* */ double calcul_scale(long source1, long dest1, long source2, long dest2) { - return (double)(((dest2 - source2) - (dest1 - source1)) / (double)(source2 - source1)); + double src_1 = static_cast<double>(source1); + double src_2 = static_cast<double>(source2); + double dst_1 = static_cast<double>(dest1); + double dst_2 = static_cast<double>(dest2); + return ((dst_2 - src_2) - (dst_1 - src_1)) / (src_2 - src_1); + //return (double)(((dest2 - source2) - (dest1 - source1)) / (double)(source2 - source1)); } /* Modified: trunk/plugins/actions/splitsubtitle/splitsubtitle.cc URL: http://svn.gna.org/viewcvs/subtitleeditor/trunk/plugins/actions/splitsubtitle/splitsubtitle.cc?rev=984&r1=983&r2=984&view=diff ============================================================================== --- trunk/plugins/actions/splitsubtitle/splitsubtitle.cc (original) +++ trunk/plugins/actions/splitsubtitle/splitsubtitle.cc Sun Oct 16 15:39:32 2016 @@ -178,7 +178,7 @@ if(total_chars > 0) dur = oduration * ((double)lines[i].size() / (double)total_chars); else - dur = oduration / newsubs.size(); + dur = oduration / static_cast<long>(newsubs.size()); newsubs[i].set_start_and_end(start, start + dur); Modified: trunk/plugins/actions/typewriter/typewriter.cc URL: http://svn.gna.org/viewcvs/subtitleeditor/trunk/plugins/actions/typewriter/typewriter.cc?rev=984&r1=983&r2=984&view=diff ============================================================================== --- trunk/plugins/actions/typewriter/typewriter.cc (original) +++ trunk/plugins/actions/typewriter/typewriter.cc Sun Oct 16 15:39:32 2016 @@ -272,7 +272,7 @@ { // We update the time of each subtitles (linear) SubtitleTime s = start; - SubtitleTime d = duration / subs.size(); + SubtitleTime d = duration / static_cast<long>(subs.size()); for(guint i=0; i < subs.size(); ++i) { Modified: trunk/plugins/subtitleformats/adobeencoredvd/adobeencoredvd.h URL: http://svn.gna.org/viewcvs/subtitleeditor/trunk/plugins/subtitleformats/adobeencoredvd/adobeencoredvd.h?rev=984&r1=983&r2=984&view=diff ============================================================================== --- trunk/plugins/subtitleformats/adobeencoredvd/adobeencoredvd.h (original) +++ trunk/plugins/subtitleformats/adobeencoredvd/adobeencoredvd.h Sun Oct 16 15:39:32 2016 @@ -83,8 +83,8 @@ text = group[9]; // last 00 are frame, not time! - start[3] = start[3] * 1000 / m_framerate_value; - end[3] = end[3] * 1000 / m_framerate_value; + start[3] = static_cast<int>(start[3] * 1000 / m_framerate_value); + end[3] = static_cast<int>(end[3] * 1000 / m_framerate_value); // Append a subtitle sub = subtitles.append(); Modified: trunk/plugins/subtitleformats/avidds/avidds.cc URL: http://svn.gna.org/viewcvs/subtitleeditor/trunk/plugins/subtitleformats/avidds/avidds.cc?rev=984&r1=983&r2=984&view=diff ============================================================================== --- trunk/plugins/subtitleformats/avidds/avidds.cc (original) +++ trunk/plugins/subtitleformats/avidds/avidds.cc Sun Oct 16 15:39:32 2016 @@ -106,8 +106,8 @@ } // last 00 are frame, not time! - start[3] = start[3] * 1000 / m_framerate_value; - end[3] = end[3] * 1000 / m_framerate_value; + start[3] = static_cast<int>(start[3] * 1000 / m_framerate_value); + end[3] = static_cast<int>(end[3] * 1000 / m_framerate_value); // Append a subtitle sub = subtitles.append(); Modified: trunk/plugins/subtitleformats/bitc/bitc.cc URL: http://svn.gna.org/viewcvs/subtitleeditor/trunk/plugins/subtitleformats/bitc/bitc.cc?rev=984&r1=983&r2=984&view=diff ============================================================================== --- trunk/plugins/subtitleformats/bitc/bitc.cc (original) +++ trunk/plugins/subtitleformats/bitc/bitc.cc Sun Oct 16 15:39:32 2016 @@ -95,8 +95,8 @@ utility::replace(text, "|", "\n"); // last 00 are frame, not time! - start[3] = start[3] * 1000 / m_framerate_value; - end[3] = end[3] * 1000 / m_framerate_value; + start[3] = static_cast<int>(start[3] * 1000 / m_framerate_value); + end[3] = static_cast<int>(end[3] * 1000 / m_framerate_value); // Append a subtitle sub = subtitles.append(); Modified: trunk/plugins/subtitleformats/mpsub/mpsub.cc URL: http://svn.gna.org/viewcvs/subtitleeditor/trunk/plugins/subtitleformats/mpsub/mpsub.cc?rev=984&r1=983&r2=984&view=diff ============================================================================== --- trunk/plugins/subtitleformats/mpsub/mpsub.cc (original) +++ trunk/plugins/subtitleformats/mpsub/mpsub.cc Sun Oct 16 15:39:32 2016 @@ -84,8 +84,8 @@ sub.set_text(text); if(mode == TIME) { - sub.set_start(SubtitleTime(start_value * 1000)); - sub.set_end(SubtitleTime(end_value * 1000)); + sub.set_start(static_cast<long>(start_value * 1000)); + sub.set_end(static_cast<long>(end_value * 1000.0)); } else //FRAME { Modified: trunk/plugins/subtitleformats/sprucestl/sprucestl.cc URL: http://svn.gna.org/viewcvs/subtitleeditor/trunk/plugins/subtitleformats/sprucestl/sprucestl.cc?rev=984&r1=983&r2=984&view=diff ============================================================================== --- trunk/plugins/subtitleformats/sprucestl/sprucestl.cc (original) +++ trunk/plugins/subtitleformats/sprucestl/sprucestl.cc Sun Oct 16 15:39:32 2016 @@ -75,8 +75,8 @@ end[3] = utility::string_to_int(group[8]); // last value are frame, not time - start[3] = start[3] * 1000 / m_framerate_value; - end[3] = end[3] * 1000 / m_framerate_value; + start[3] = static_cast<int>(start[3] * 1000 / m_framerate_value); + end[3] = static_cast<int>(end[3] * 1000 / m_framerate_value); text = group[9]; utility::replace(text, "|", "\n"); Modified: trunk/src/gui/automaticspellchecker.cc URL: http://svn.gna.org/viewcvs/subtitleeditor/trunk/src/gui/automaticspellchecker.cc?rev=984&r1=983&r2=984&view=diff ============================================================================== --- trunk/src/gui/automaticspellchecker.cc (original) +++ trunk/src/gui/automaticspellchecker.cc Sun Oct 16 15:39:32 2016 @@ -441,7 +441,12 @@ if(m_deferred_check) check_deferred_range(true); - m_textview->window_to_buffer_coords(Gtk::TEXT_WINDOW_TEXT, ev->x, ev->y, x, y); + m_textview->window_to_buffer_coords( + Gtk::TEXT_WINDOW_TEXT, + static_cast<int>(ev->x), + static_cast<int>(ev->y), + x, + y); m_textview->get_iter_at_location(iter, x, y); m_buffer->move_mark(m_mark_click, iter); Modified: trunk/src/subtitletime.cc URL: http://svn.gna.org/viewcvs/subtitleeditor/trunk/src/subtitletime.cc?rev=984&r1=983&r2=984&view=diff ============================================================================== --- trunk/src/subtitletime.cc (original) +++ trunk/src/subtitletime.cc Sun Oct 16 15:39:32 2016 @@ -189,6 +189,22 @@ /* */ +SubtitleTime SubtitleTime::operator/(const double &div) const +{ + double total = static_cast<double>(totalmsecs) / div; + return SubtitleTime(static_cast<long>(total)); +} + +/* + */ +SubtitleTime SubtitleTime::operator/(const long &div) const +{ + double total = static_cast<double>(totalmsecs) / static_cast<double>(div); + return SubtitleTime(static_cast<long>(total)); +} + +/* + */ SubtitleTime SubtitleTime::operator*(const double &mult) const { double total = (double)(totalmsecs * mult); Modified: trunk/src/subtitletime.h URL: http://svn.gna.org/viewcvs/subtitleeditor/trunk/src/subtitletime.h?rev=984&r1=983&r2=984&view=diff ============================================================================== --- trunk/src/subtitletime.h (original) +++ trunk/src/subtitletime.h Sun Oct 16 15:39:32 2016 @@ -91,6 +91,8 @@ SubtitleTime operator+(const SubtitleTime &b) const; SubtitleTime operator*(const double &mult) const; double operator/(const SubtitleTime &b) const; + SubtitleTime operator/(const double &div) const; + SubtitleTime operator/(const long &div) const; bool operator==(const SubtitleTime &time) const; bool operator!=(const SubtitleTime &time) const; Modified: trunk/src/timeutility.cc URL: http://svn.gna.org/viewcvs/subtitleeditor/trunk/src/timeutility.cc?rev=984&r1=983&r2=984&view=diff ============================================================================== --- trunk/src/timeutility.cc (original) +++ trunk/src/timeutility.cc Sun Oct 16 15:39:32 2016 @@ -65,22 +65,22 @@ switch(framerate) { case FRAMERATE_23_976: - ret = 23.976; // 24 / 1.001 + ret = 23.976f; // 24 / 1.001 break; case FRAMERATE_24: - ret = 24; + ret = 24.0f; break; case FRAMERATE_25: - ret = 25; + ret = 25.0f; break; case FRAMERATE_29_97: - ret = 29.97; // 30 / 1.001 + ret = 29.97f; // 30 / 1.001 break; case FRAMERATE_30: - ret = 30; + ret = 30.0f; break; default: - ret = 0; + ret = 0.0f; break; } Modified: trunk/src/we/waveformeditor.cc URL: http://svn.gna.org/viewcvs/subtitleeditor/trunk/src/we/waveformeditor.cc?rev=984&r1=983&r2=984&view=diff ============================================================================== --- trunk/src/we/waveformeditor.cc (original) +++ trunk/src/we/waveformeditor.cc Sun Oct 16 15:39:32 2016 @@ -476,9 +476,9 @@ */ void WaveformEditor::on_scale_changed() { - double value = m_sliderScale->get_value(); - - se_debug_message(SE_DEBUG_WAVEFORM, "scale=%f", value); + int value = static_cast<int>(m_sliderScale->get_value()); + + se_debug_message(SE_DEBUG_WAVEFORM, "scale=%d", value); if(Config::getInstance().get_value_int("waveform", "scale") != value) Config::getInstance().set_value_int("waveform", "scale", value); Modified: trunk/src/we/waveformrenderer.cc URL: http://svn.gna.org/viewcvs/subtitleeditor/trunk/src/we/waveformrenderer.cc?rev=984&r1=983&r2=984&view=diff ============================================================================== --- trunk/src/we/waveformrenderer.cc (original) +++ trunk/src/we/waveformrenderer.cc Sun Oct 16 15:39:32 2016 @@ -50,15 +50,15 @@ { #define SET_COLOR(x, r,g,b,a) x[0]=r; x[1]=g; x[2]=b; x[3]=a; - SET_COLOR(m_color_player_position, 1, 1, 1, 1); - SET_COLOR(m_color_background, 0.3, 0.3, 0.3, 1); - SET_COLOR(m_color_wave, 0.6, 0.8, 0.3, 1); - SET_COLOR(m_color_wave_fill, 1, 1, 1, 1); - SET_COLOR(m_color_subtitle, .6, 0.3, 0.1, 0.6); - SET_COLOR(m_color_subtitle_selected, 0.9, 0.5, 0.3, 0.6); - SET_COLOR(m_color_subtitle_invalid, 1, 1, 0.0, 0.8); // invalid time start > end - SET_COLOR(m_color_text, 1, 1, 1, 1); - SET_COLOR(m_color_keyframe, 0.3, 0.6, 1.0, 1.0); + SET_COLOR(m_color_player_position, 1.0f, 1.0f, 1.0f, 1.0f); + SET_COLOR(m_color_background, 0.3f, 0.3f, 0.3f, 1.0f); + SET_COLOR(m_color_wave, 0.6f, 0.8f, 0.3f, 1.0f); + SET_COLOR(m_color_wave_fill, 1.0f, 1.0f, 1.0f, 1.0f); + SET_COLOR(m_color_subtitle, 0.6f, 0.3f, 0.1f, 0.6f); + SET_COLOR(m_color_subtitle_selected, 0.9f, 0.5f, 0.3f, 0.6f); + SET_COLOR(m_color_subtitle_invalid, 1.0f, 1.0f, 0.0f, 0.8f); // invalid time start > end + SET_COLOR(m_color_text, 1.0f, 1.0f, 1.0f, 1.0f); + SET_COLOR(m_color_keyframe, 0.3f, 0.6f, 1.0f, 1.0f); #undef SET_COLOR Modified: trunk/src/we/waveformrenderercairo.cc URL: http://svn.gna.org/viewcvs/subtitleeditor/trunk/src/we/waveformrenderercairo.cc?rev=984&r1=983&r2=984&view=diff ============================================================================== --- trunk/src/we/waveformrenderercairo.cc (original) +++ trunk/src/we/waveformrenderercairo.cc Sun Oct 16 15:39:32 2016 @@ -381,7 +381,7 @@ Cairo::TextExtents extents; cr->get_text_extents("0:00:00", extents); - float margin = extents.width + extents.width * 0.5; + float margin = static_cast<float>(extents.width + extents.width * 0.5); while(get_pos_by_time(sec_1) < margin) { // for a sufficiently long duration sec_* will overflow before @@ -510,7 +510,7 @@ se_debug_message(SE_DEBUG_WAVEFORM, "init drawing values"); - double skip = 4; + int skip = 4; int z = zoom(); double begin = peaks.size() * ((double)get_start_area() / (width * z)); @@ -673,8 +673,8 @@ int start = get_pos_by_time(selected.get_start().totalmsecs); int end = get_pos_by_time(selected.get_end().totalmsecs); - float m_color_marker_left[]={1,0,0,1}; - float m_color_marker_right[]={1,.6,0,1}; + float m_color_marker_left[] ={1.0f, 0.0f, 0.0f, 1.0f}; + float m_color_marker_right[]={1.0f, 0.6f, 0.0f, 1.0f}; // left set_color(cr, m_color_marker_left); _______________________________________________ Subtitleeditor-commits mailing list Subtitleeditor-commits@gna.org https://mail.gna.org/listinfo/subtitleeditor-commits