Selaa lähdekoodia

Set warnings to full, fix some of them

Martijn Braam 3 vuotta sitten
vanhempi
commit
331b764280
6 muutettua tiedostoa jossa 7 lisäystä ja 7 poistoa
  1. 2 0
      CMakeLists.txt
  2. 1 3
      main.c
  3. 1 1
      stacker.cpp
  4. 1 1
      stacker.h
  5. 1 1
      stackercpp.cpp
  6. 1 1
      stackercpp.h

+ 2 - 0
CMakeLists.txt

@@ -12,6 +12,8 @@ pkg_check_modules(JPEG REQUIRED libjpeg)
 pkg_check_modules(EXIF REQUIRED libexif)
 pkg_check_modules(CV REQUIRED opencv4)
 
+add_compile_options(-Wall -Wextra -pedantic)
+
 add_executable(postprocessd main.c postprocess.c postprocess.h util.c util.h stacker.cpp stacker.h stackercpp.cpp stackercpp.h)
 target_link_libraries(postprocessd ${RAW_LIBRARIES} ${TIFF_LIBRARIES} ${JPEG_LIBRARIES} ${EXIF_LIBRARIES} ${CV_LIBRARIES})
 target_include_directories(postprocessd PUBLIC ${RAW_INCLUDE_DIRS} ${TIFF_INCLUDE_DIRS} ${JPEG_INCUDE_DIRS} ${EXIF_INCUDE_DIRS} ${CV_INCLUDE_DIRS})

+ 1 - 3
main.c

@@ -39,7 +39,6 @@ int
 listen_on_socket()
 {
     int sock;
-    int ret;
     struct sockaddr_un addr;
 
     // Clean existing socket
@@ -114,7 +113,6 @@ make_socket_path()
 int
 main(int argc, char *argv[])
 {
-    int sock;
     struct Job job;
 
     if (argc != 4) {
@@ -139,7 +137,7 @@ main(int argc, char *argv[])
     // Check if an existing instance is running, if not start a listener
     if (is_alive() == 0) {
         printf("first instance, listening\n");
-        sock = listen_on_socket();
+        listen_on_socket();
     } else {
         // A processing job is already running, queue this job on the existing process and block
         printf("second instance, running\n");

+ 1 - 1
stacker.cpp

@@ -15,7 +15,7 @@ stacker_create()
 }
 
 void
-stacker_add_image(stacker_t *st, char *data, int width, int height)
+stacker_add_image(stacker_t *st, unsigned char *data, int width, int height)
 {
     Stacker *obj;
     if (st == NULL) {

+ 1 - 1
stacker.h

@@ -14,7 +14,7 @@ stacker_t *
 stacker_create();
 
 void
-stacker_add_image(stacker_t *st, char *data, int width, int height);
+stacker_add_image(stacker_t *st, unsigned char *data, int width, int height);
 
 char *
 stacker_get_result(stacker_t *st);

+ 1 - 1
stackercpp.cpp

@@ -6,7 +6,7 @@ Stacker::Stacker()
 }
 
 void
-Stacker::add_frame(char *data, int width, int height)
+Stacker::add_frame(unsigned char *data, int width, int height)
 {
     Mat warp_matrix = Mat::eye(3, 3, CV_32F);
     Mat mat = Mat(height, width, CV_8UC3, data);

+ 1 - 1
stackercpp.h

@@ -14,7 +14,7 @@ public:
         Stacker();
 
         void
-        add_frame(char *data, int width, int height);
+        add_frame(unsigned char *data, int width, int height);
 
         char *
         get_result();