Revise for explicit conversions

Author: Mr-Dave

configure.ac

@@ -603,7 +603,7 @@ AC_ARG_WITH([developer-flags],
     [DEVELOPER_FLAGS=no])
 
 AS_IF([test "${DEVELOPER_FLAGS}" = "yes"], [
-    TEMP_CPPFLAGS="$TEMP_CPPFLAGS -W -Wall -Wextra -Wformat -Wshadow -Wpointer-arith -Wwrite-strings -Winline -Wredundant-decls -Wno-long-long -ggdb -g3"
+    TEMP_CPPFLAGS="$TEMP_CPPFLAGS -W -Wall -Wextra -Wconversion -Wformat -Wshadow -Wpointer-arith -Wwrite-strings -Winline -Wredundant-decls -Wno-long-long -ggdb -g3"
   ]
 )
 

src/alg.cpp

@@ -35,7 +35,7 @@
 #define SMARTMASK_SENSITIVITY_INCR 5
 
 typedef struct {
-    short y, xl, xr, dy;
+    int y, xl, xr, dy;
 } Segment;
 
 
@@ -519,7 +519,7 @@ static void alg_despeckle(ctx_dev *cam)
     width = cam->imgs.width;
     height = cam->imgs.height;
     done = 0;
-    len = cam->conf->despeckle_filter.length();
+    len = (int)cam->conf->despeckle_filter.length();
     common_buffer = cam->imgs.common_buffer;
     cam->current_image->total_labels = 0;
     cam->imgs.largest_label = 0;
@@ -573,7 +573,8 @@ static void alg_despeckle(ctx_dev *cam)
 
 void alg_tune_smartmask(ctx_dev *cam)
 {
-    int i, diff;
+    int i;
+    unsigned char diff;
     int motionsize = cam->imgs.motionsize;
     unsigned char *smartmask = cam->imgs.smartmask;
     unsigned char *smartmask_final = cam->imgs.smartmask_final;
@@ -592,7 +593,7 @@ void alg_tune_smartmask(ctx_dev *cam)
             smartmask[i]--;
         }
         /* Increase smart_mask sensitivity based on the buffered values. */
-        diff = smartmask_buffer[i] / sensitivity;
+        diff = (unsigned char)(smartmask_buffer[i] / sensitivity);
 
         if (diff) {
             if (smartmask[i] <= diff + 80) {
@@ -610,9 +611,9 @@ void alg_tune_smartmask(ctx_dev *cam)
         }
     }
     /* Further expansion (here:erode due to inverted logic!) of the mask. */
-    diff = alg_erode9(smartmask_final, cam->imgs.width, cam->imgs.height,
+    alg_erode9(smartmask_final, cam->imgs.width, cam->imgs.height,
                       cam->imgs.common_buffer, 255);
-    diff = alg_erode5(smartmask_final, cam->imgs.width, cam->imgs.height,
+    alg_erode5(smartmask_final, cam->imgs.width, cam->imgs.height,
                       cam->imgs.common_buffer, 255);
     cam->smartmask_count = cam->smartmask_ratio;
 }
@@ -944,7 +945,7 @@ void alg_update_reference_frame(ctx_dev *cam, int action)
                     (*ref_dyn)++; /* Motionpixel? Keep excluding from ref frame. */
                 } else {
                     *ref_dyn = 0; /* Nothing special - release pixel. */
-                    *ref = (*ref + *image_virgin) / 2;
+                    *ref = (unsigned char)((*ref + *image_virgin) / 2);
                 }
 
             } else {  /* No motion: copy to ref frame. */
@@ -1048,7 +1049,7 @@ static void alg_location_dist(ctx_dev *cam)
             if (*(out++)) {
                 variance_x += ((x - cent->x) * (x - cent->x));
                 variance_y += ((y - cent->y) * (y - cent->y));
-                distance_mean += sqrt(
+                distance_mean += (uint64_t)sqrt(
                         ((x - cent->x) * (x - cent->x)) +
                         ((y - cent->y) * (y - cent->y)));
 
@@ -1074,9 +1075,9 @@ static void alg_location_dist(ctx_dev *cam)
         cent->maxx = cent->x + xdist / centc * 3;
         cent->miny = cent->y - ydist / centc * 3;
         cent->maxy = cent->y + ydist / centc * 3;
-        cent->stddev_x = sqrt((variance_x / centc));
-        cent->stddev_y = sqrt((variance_y / centc));
-        distance_mean = (distance_mean / centc);
+        cent->stddev_x = (int)sqrt((variance_x / centc));
+        cent->stddev_y = (int)sqrt((variance_y / centc));
+        distance_mean = (uint64_t)(distance_mean / centc);
     } else {
         cent->stddev_y = 0;
         cent->stddev_x = 0;
@@ -1089,16 +1090,16 @@ static void alg_location_dist(ctx_dev *cam)
         for (x = 0; x < width; x++) {
             if (*(out++)) {
                 variance_xy += (
-                    (sqrt(((x - cent->x) * (x - cent->x)) +
+                    ((uint64_t)sqrt(((x - cent->x) * (x - cent->x)) +
                           ((y - cent->y) * (y - cent->y))) - distance_mean) *
-                    (sqrt(((x - cent->x) * (x - cent->x)) +
+                    ((uint64_t)sqrt(((x - cent->x) * (x - cent->x)) +
                           ((y - cent->y) * (y - cent->y))) - distance_mean));
             }
         }
     }
     /* Per statistics, divide by n-1 for calc of a standard deviation */
     if ((centc-1) > 0) {
-        cent->stddev_xy = sqrt((variance_xy / (centc-1)));
+        cent->stddev_xy = (int)sqrt((variance_xy / (centc-1)));
     }
 }
 

src/alg_sec.cpp

@@ -25,13 +25,16 @@
 
 #ifdef HAVE_OPENCV
 
-#include <opencv2/objdetect.hpp>
-#include <opencv2/dnn.hpp>
-#include <opencv2/highgui.hpp>
-#include <opencv2/imgproc.hpp>
-#include <opencv2/imgcodecs.hpp>
-#include <opencv2/videoio.hpp>
-#include <opencv2/video.hpp>
+#pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wconversion"
+    #include <opencv2/objdetect.hpp>
+    #include <opencv2/dnn.hpp>
+    #include <opencv2/highgui.hpp>
+    #include <opencv2/imgproc.hpp>
+    #include <opencv2/imgcodecs.hpp>
+    #include <opencv2/videoio.hpp>
+    #include <opencv2/video.hpp>
+#pragma GCC diagnostic pop
 
 using namespace cv;
 using namespace dnn;

src/alg_sec.hpp

@@ -23,10 +23,13 @@
 
 
 #ifdef HAVE_OPENCV
-    #include "opencv2/objdetect.hpp"
-    #include "opencv2/dnn.hpp"
-    #include "opencv2/highgui.hpp"
-    #include "opencv2/imgproc.hpp"
+    #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Wconversion"
+        #include "opencv2/objdetect.hpp"
+        #include "opencv2/dnn.hpp"
+        #include "opencv2/highgui.hpp"
+        #include "opencv2/imgproc.hpp"
+    #pragma GCC diagnostic pop
 #endif
 
 
@@ -42,10 +45,10 @@ struct ctx_algsec_model {
     std::string                 image_type;
     int                         rotate;
 
-    float                       scalefactor;
-    float                       threshold;          /* Threshold for motion to use on detection*/
+    double                      scalefactor;
+    double                      threshold;          /* Threshold for motion to use on detection*/
 
-    float                       hog_threshold_model;  /* Threshold fed into the opencv model*/
+    double                      hog_threshold_model;  /* Threshold fed into the opencv model*/
     int                         hog_winstride;
     int                         hog_padding;
 
@@ -63,7 +66,7 @@ struct ctx_algsec_model {
     std::vector<std::string>    dnn_classes;
     int                         dnn_width;
     int                         dnn_height;
-    float                       dnn_scale;
+    double                      dnn_scale;
 
     bool                        isdetected;         /* Bool reset for each image as to whether a detection occurred */
 

src/dbse.cpp

@@ -218,19 +218,19 @@ static void dbse_rec_assign(ctx_dbse_rec *rec, char *col_nm, char *col_val)
 
     } else if (mystrceq(col_nm,"movie_nm")) {
         free(rec->movie_nm);
-        flen = strlen(col_val);
+        flen = (int)strlen(col_val);
         rec->movie_nm = (char*)mymalloc(flen + 1);
         snprintf(rec->movie_nm, flen+1,"%s",col_val);
 
     } else if (mystrceq(col_nm,"movie_dir")) {
         free(rec->movie_dir);
-        flen = strlen(col_val);
+        flen = (int)strlen(col_val);
         rec->movie_dir = (char*)mymalloc(flen + 1);
         snprintf(rec->movie_dir, flen+1,"%s",col_val);
 
     } else if (mystrceq(col_nm,"full_nm")) {
         free(rec->full_nm);
-        flen = strlen(col_val);
+        flen = (int)strlen(col_val);
         rec->full_nm = (char*)mymalloc(flen + 1);
         snprintf(rec->full_nm, flen+1,"%s",col_val);
         if (stat(rec->full_nm, &statbuf) == 0) {
@@ -245,15 +245,15 @@ static void dbse_rec_assign(ctx_dbse_rec *rec, char *col_nm, char *col_val)
 
     } else if (mystrceq(col_nm,"movie_tmc")) {
         free(rec->movie_tmc);
-        flen = strlen(col_val);
+        flen = (int)strlen(col_val);
         rec->movie_tmc =
             (char*)mymalloc(flen + 1);
         snprintf(rec->movie_tmc
             ,flen+1,"%s",col_val);
 
     } else if (mystrceq(col_nm,"movie_tml")) {
         free(rec->movie_tml);
-        flen = strlen(col_val);
+        flen = (int)strlen(col_val);
         rec->movie_tml =
             (char*)mymalloc(flen + 1);
         snprintf(rec->movie_tml

src/draw.cpp

@@ -1152,14 +1152,14 @@ int draw_text(unsigned char *image, int width, int height, int startx, int start
     txtlen = 0;
     while ((end = strstr(end, NEWLINE))) {
         if ((end - begin)>txtlen) {
-            txtlen = (end - begin);
+            txtlen = (int)(end - begin);
         }
         num_nl++;
         end += sizeof(NEWLINE)-1;
         begin = end;
     }
     if (txtlen == 0) {
-        txtlen = strlen(text);
+        txtlen = (int)strlen(text);
     }
 
     /* Adjust the factor if it is out of bounds
@@ -1186,15 +1186,15 @@ int draw_text(unsigned char *image, int width, int height, int startx, int start
     begin = end = text;
 
     while ((end = strstr(end, NEWLINE))) {
-        int len = end-begin;
+        int len = (int)(end-begin);
 
         draw_textn(image, startx, starty, width, begin, len, factor);
         end += sizeof(NEWLINE)-1;
         begin = end;
         starty += line_space;
     }
 
-    draw_textn(image, startx, starty, width, begin, strlen(begin), factor);
+    draw_textn(image, startx, starty, width, begin, (int)strlen(begin), factor);
 
     return 0;
 }

src/event.cpp

@@ -81,19 +81,19 @@ static void event_newfile(ctx_dev *cam, motion_event evnt
 static void on_picture_save_command(ctx_dev *cam, motion_event evnt
         ,ctx_image_data *img_data, char *fname, void *ftype, struct timespec *ts1)
 {
-
-    int filetype = (unsigned long)ftype;
+    /*Fix me*/
+    long filetype = (long)ftype;
 
     (void)evnt;
     (void)img_data;
     (void)ts1;
 
     if ((filetype & FTYPE_IMAGE_ANY) != 0 && (cam->conf->on_picture_save != "")) {
-        util_exec_command(cam, cam->conf->on_picture_save.c_str(), fname, filetype);
+        util_exec_command(cam, cam->conf->on_picture_save.c_str(), fname, (int)filetype);
     }
 
     if ((filetype & FTYPE_MOVIE_ANY) != 0 && (cam->conf->on_movie_start != "")) {
-        util_exec_command(cam, cam->conf->on_movie_start.c_str(), fname, filetype);
+        util_exec_command(cam, cam->conf->on_movie_start.c_str(), fname, (int)filetype);
     }
 }
 
@@ -280,7 +280,7 @@ static void event_image_snapshot(ctx_dev *cam, motion_event evnt
     (void)fname;
     (void)ftype;
 
-    offset = cam->conf->snapshot_filename.length() - 8;
+    offset = (int)cam->conf->snapshot_filename.length() - 8;
     if (offset < 0) {
         offset = 1;
     }
@@ -422,14 +422,14 @@ static void on_movie_end_command(ctx_dev *cam, motion_event evnt
         ,ctx_image_data *img_data, char *fname, void *ftype, struct timespec *ts1)
 {
 
-    int filetype = (unsigned long) ftype;
+    long filetype = (long) ftype;
 
     (void)evnt;
     (void)img_data;
     (void)ts1;
 
     if ((filetype & FTYPE_MOVIE_ANY) && (cam->conf->on_movie_end != "")) {
-        util_exec_command(cam, cam->conf->on_movie_end.c_str(), fname, filetype);
+        util_exec_command(cam, cam->conf->on_movie_end.c_str(), fname, (int)filetype);
     }
 }
 

src/exif.cpp

@@ -87,22 +87,22 @@ static unsigned const char exif_tzoffset_tag[12] = {
 
 static void put_uint16(JOCTET *buf, unsigned value)
 {
-    buf[0] = ( value & 0xFF00 ) >> 8;
-    buf[1] = ( value & 0x00FF );
+    buf[0] = (unsigned char)(( value & 0xFF00 ) >> 8);
+    buf[1] = (unsigned char)(( value & 0x00FF ));
 }
 
 static void put_sint16(JOCTET *buf, int value)
 {
-    buf[0] = ( value & 0xFF00 ) >> 8;
-    buf[1] = ( value & 0x00FF );
+    buf[0] = (unsigned char)(( value & 0xFF00 ) >> 8);
+    buf[1] = (unsigned char)(( value & 0x00FF ));
 }
 
 static void put_uint32(JOCTET *buf, unsigned value)
 {
-    buf[0] = ( value & 0xFF000000 ) >> 24;
-    buf[1] = ( value & 0x00FF0000 ) >> 16;
-    buf[2] = ( value & 0x0000FF00 ) >> 8;
-    buf[3] = ( value & 0x000000FF );
+    buf[0] = (unsigned char)(( value & 0xFF000000 ) >> 24);
+    buf[1] = (unsigned char)(( value & 0x00FF0000 ) >> 16);
+    buf[2] = (unsigned char)(( value & 0x0000FF00 ) >> 8);
+    buf[3] = (unsigned char)(( value & 0x000000FF ));
 }
 
 struct tiff_writing {
@@ -134,7 +134,7 @@ static void put_direntry(struct tiff_writing *into, const char *data, unsigned l
 
 static void put_stringentry(struct tiff_writing *into, unsigned tag, const char *str, int with_nul)
 {
-    unsigned stringlength = strlen(str) + (with_nul?1:0);
+    unsigned stringlength = (int)strlen(str) + (with_nul?1:0);
 
     put_uint16(into->buf, tag);
     put_uint16(into->buf + 2, TIFF_TYPE_ASCII);
@@ -221,7 +221,7 @@ unsigned exif_prepare(unsigned char **exif, ctx_dev *cam,
 
     if (description) {
         ifd0_tagcount ++;
-        datasize += 5 + strlen(description); /* Add 5 for NUL and alignment */
+        datasize += 5 + (int)strlen(description); /* Add 5 for NUL and alignment */
     }
 
     if (datetime) {
@@ -236,12 +236,12 @@ unsigned exif_prepare(unsigned char **exif, ctx_dev *cam,
         ifd0_tagcount++;
         /* It would be nice to use the same offset for both tags' values,
         * but I don't want to write the bookkeeping for that right now */
-        datasize += 2 * (5 + strlen(datetime));
+        datasize += 2 * (5 + (int)strlen(datetime));
     }
 
     if (subtime) {
         ifd1_tagcount++;
-        datasize += 5 + strlen(subtime);
+        datasize += 5 + (int)strlen(subtime);
     }
 
     if (box) {
@@ -305,7 +305,7 @@ unsigned exif_prepare(unsigned char **exif, ctx_dev *cam,
 
     if (datetime) {
         memcpy(writing.buf, exif_tzoffset_tag, 12);
-        put_sint16(writing.buf+8, timestamp_tm.tm_gmtoff / 3600);
+        put_sint16(writing.buf+8, int(timestamp_tm.tm_gmtoff / 3600));
         writing.buf += 12;
     }
 

src/jpegutils.cpp

@@ -386,7 +386,7 @@ static GLOBAL(void) _jpeg_mem_dest(j_compress_ptr cinfo, JOCTET* buf, size_t buf
 static GLOBAL(int) _jpeg_mem_size(j_compress_ptr cinfo)
 {
     mem_dest_ptr dest = (mem_dest_ptr) cinfo->dest;
-    return dest->jpegsize;
+    return (int)dest->jpegsize;
 }
 
 /*