Ticket #5304: programs_mythcommflag-uninit-defects.patch

programs/mythcommflag/BlankFrameDetector.cpp

@@ -368 +368 @@
 BlankFrameDetector::BlankFrameDetector(HistogramAnalyzer *ha, QString debugdir)
     : FrameAnalyzer()
     , histogramAnalyzer(ha)
+    , fps(0.0)
     , debugLevel(0)
 {
     skipcommblanks = gContext->GetNumSetting("CommSkipAllBlanks", 1) != 0;
@@ -387 +388 @@
             QString("BlankFrameDetector debugLevel %1").arg(debugLevel));
 }
 
-BlankFrameDetector::~BlankFrameDetector(void)
-{
-}
-
 enum FrameAnalyzer::analyzeFrameResult
 BlankFrameDetector::nuppelVideoPlayerInited(NuppelVideoPlayer *nvp,
         long long nframes)

programs/mythcommflag/BlankFrameDetector.h

@@ -18 +18 @@
 public:
     /* Ctor/dtor. */
     BlankFrameDetector(HistogramAnalyzer *ha, QString debugdir);
-    ~BlankFrameDetector(void);
 
     /* FrameAnalyzer interface. */
     const char *name(void) const { return "BlankFrameDetector"; }

programs/mythcommflag/BorderDetector.cpp

@@ -17 +17 @@
 BorderDetector::BorderDetector(void)
     : logoFinder(NULL)
     , logo(NULL)
+    , logorow(-1)
+    , logocol(-1)
+    , logowidth(-1)
+    , logoheight(-1)
     , frameno(-1)
+    , row(-1)
+    , col(-1)
+    , width(-1)
+    , height(-1)
     , ismonochromatic(false)
     , debugLevel(0)
     , time_reported(false)
 {
+    bzero(&analyze_time, sizeof(analyze_time));
     debugLevel = gContext->GetNumSetting("BorderDetectorDebugLevel", 0);
 
     if (debugLevel >= 1)
@@ -29 +38 @@
             QString("BorderDetector debugLevel %1").arg(debugLevel));
 }
 
-BorderDetector::~BorderDetector(void)
-{
-}
-
 int
 BorderDetector::nuppelVideoPlayerInited(const NuppelVideoPlayer *nvp)
 {

programs/mythcommflag/BorderDetector.h

@@ -20 +20 @@
 {
 public:
     /* Ctor/dtor. */
-    BorderDetector(void);
-    ~BorderDetector(void);
+    BorderDetector();
 
     int nuppelVideoPlayerInited(const NuppelVideoPlayer *nvp);
     void setLogoState(TemplateFinder *finder);
@@ -30 +29 @@
     int getDimensions(const AVPicture *pgm, int pgmheight, long long frameno,
             int *prow, int *pcol, int *pwidth, int *pheight);
 
-    int reportTime(void);
+    int reportTime();
 
 private:
     TemplateFinder          *logoFinder;

programs/mythcommflag/HistogramAnalyzer.cpp

@@ -109 +109 @@
         return false;
     for (frameno = 0; frameno < nframes; frameno++)
     {
-        (void)fprintf(fp, "%3u %10.6f %3u %10.6f %5u %5u %5u %5u",
-                      monochromatic[frameno],
-                      mean[frameno], median[frameno], stddev[frameno],
-                      fwidth[frameno], fheight[frameno],
-                      fcol[frameno], frow[frameno]);
+        fprintf(fp, "%3u %10.6f %3u %10.6f %5u %5u %5u %5u",
+                monochromatic[frameno], mean[frameno], median[frameno],
+                stddev[frameno], fwidth[frameno], fheight[frameno],
+                fcol[frameno], frow[frameno]);
         for (unsigned int ii = 0; ii < UCHAR_MAX + 1; ii++)
-            (void)fprintf(fp, " %02x", histogram[frameno][ii]);
-        (void)fprintf(fp, "\n");
+            fprintf(fp, " %02x", histogram[frameno][ii]);
+
+        fprintf(fp, "\n");
     }
     if (fclose(fp))
         VERBOSE(VB_COMMFLAG, QString("Error closing %1: %2")
@@ -132 +132 @@
     , borderDetector(bd)
     , logoFinder(NULL)
     , logo(NULL)
+    , logowidth(-1)
+    , logoheight(-1)
+    , logorr1(-1)
+    , logocc1(-1)
+    , logorr2(-1)
+    , logocc2(-1)
     , mean(NULL)
     , median(NULL)
     , stddev(NULL)
@@ -152 +158 @@
     , debug_histval(false)
     , histval_done(false)
 {
+    memset(histval, 0, sizeof(int) * (UCHAR_MAX + 1));
     memset(&analyze_time, 0, sizeof(analyze_time));
 
     /*
@@ -169 +176 @@
     }
 }
 
-HistogramAnalyzer::~HistogramAnalyzer(void)
+HistogramAnalyzer::~HistogramAnalyzer()
 {
     if (monochromatic)
         delete []monochromatic;
@@ -266 +273 @@
     return FrameAnalyzer::ANALYZE_OK;
 }
 
-void
-HistogramAnalyzer::setLogoState(TemplateFinder *finder)
-{
-    logoFinder = finder;
-}
-
 enum FrameAnalyzer::analyzeFrameResult
 HistogramAnalyzer::analyzeFrame(const VideoFrame *frame, long long frameno)
 {
@@ -312 +313 @@
     ismonochromatic = borderDetector->getDimensions(pgm, pgmheight, frameno,
             &croprow, &cropcol, &cropwidth, &cropheight) != 0;
 
-    (void)gettimeofday(&start, NULL);
+    gettimeofday(&start, NULL);
 
     frow[frameno] = croprow;
     fcol[frameno] = cropcol;
@@ -392 +393 @@
         sqrt((sumsquares - (float)sumval * sumval / npixels) / (npixels - 1)) :
             0;
 
-    (void)gettimeofday(&end, NULL);
+    gettimeofday(&end, NULL);
     timersub(&end, &start, &elapsed);
     timeradd(&analyze_time, &elapsed, &analyze_time);
 
@@ -426 +427 @@
 }
 
 int
-HistogramAnalyzer::reportTime(void) const
+HistogramAnalyzer::reportTime() const
 {
     if (pgmConverter->reportTime())
         return -1;

programs/mythcommflag/HistogramAnalyzer.h

@@ -20 +20 @@
     /* Ctor/dtor. */
     HistogramAnalyzer(PGMConverter *pgmc, BorderDetector *bd,
             QString debugdir);
-    ~HistogramAnalyzer(void);
+    ~HistogramAnalyzer();
 
     enum FrameAnalyzer::analyzeFrameResult nuppelVideoPlayerInited(
             NuppelVideoPlayer *nvp, long long nframes);
-    void setLogoState(TemplateFinder *finder);
+    void setLogoState(TemplateFinder *finder) { logoFinder = finder; }
     static const long long UNCACHED = -1;
     enum FrameAnalyzer::analyzeFrameResult analyzeFrame(const VideoFrame *frame,
             long long frameno);
     int finished(long long nframes, bool final);
-    int reportTime(void) const;
+    int reportTime() const;
 
     /* Each color 0-255 gets a scaled frequency counter 0-255. */
     typedef unsigned char   Histogram[UCHAR_MAX + 1];
 
-    const float *getMeans(void) const { return mean; }
-    const unsigned char *getMedians(void) const { return median; }
-    const float *getStdDevs(void) const { return stddev; }
-    const Histogram *getHistograms(void) const { return histogram; }
-    const unsigned char *getMonochromatics(void) const { return monochromatic; }
+    const float *getMeans() const { return mean; }
+    const unsigned char *getMedians() const { return median; }
+    const float *getStdDevs() const { return stddev; }
+    const Histogram *getHistograms() const { return histogram; }
+    const unsigned char *getMonochromatics() const { return monochromatic; }
 
 private:
     PGMConverter            *pgmConverter;

programs/mythcommflag/PGMConverter.cpp

@@ -16 +16 @@
 #endif /* PGM_CONVERT_GREYSCALE */
 {
     memset(&pgm, 0, sizeof(pgm));
+    memset(&convert_time, 0, sizeof(convert_time));
 }
 
 PGMConverter::~PGMConverter(void)

programs/mythcommflag/SceneChangeDetector.cpp

@@ -97 +97 @@
         QString debugdir)
     : FrameAnalyzer()
     , histogramAnalyzer(ha)
+    , fps(0.0)
     , scdata(NULL)
     , scdiff(NULL)
     , debugLevel(0)

programs/mythcommflag/TemplateFinder.h

@@ -56 +56 @@
     EdgeDetector    *edgeDetector;
 
     unsigned int    sampleTime;         /* amount of time to analyze */
-    unsigned int    sampleSpacing;      /* seconds between frames */
     int             frameInterval;      /* analyze every <Interval> frames */
     long long       endFrame;           /* end of logo detection */
     long long       nextFrame;          /* next desired frame */

programs/mythcommflag/TemplateMatcher.cpp

@@ -321 +321 @@
     , pgmConverter(pgmc)
     , edgeDetector(ed)
     , templateFinder(tf)
+    , tmplrow(-1)
+    , tmplcol(-1)
+    , tmplwidth(-1)
+    , tmplheight(-1)
     , matches(NULL)
     , match(NULL)
+    , fps(0.0)
     , debugLevel(0)
     , debugdir(debugdir)
 #ifdef PGM_CONVERT_GREYSCALE