Replace use of deprecated C Standard library headers in C++ code.
Change-Id: I9fa6630c7e4bdb2897df34d417635d8c7d8253bc
Signed-off-by: Tyler Chatow <tchatow@gmail.com>
diff --git a/aos/vision/image/image_types.h b/aos/vision/image/image_types.h
index fba6a10..5214a6f 100644
--- a/aos/vision/image/image_types.h
+++ b/aos/vision/image/image_types.h
@@ -1,11 +1,10 @@
#ifndef _AOS_VISION_IMAGE_IMAGE_TYPES_H_
#define _AOS_VISION_IMAGE_IMAGE_TYPES_H_
-#include <stdint.h>
-#include <string.h>
+#include <cstdint>
+#include <cstring>
#include <memory>
#include <sstream>
-
#include <string_view>
namespace aos {
diff --git a/aos/vision/image/jpeg_routines.cc b/aos/vision/image/jpeg_routines.cc
index 507fb3b..d641627 100644
--- a/aos/vision/image/jpeg_routines.cc
+++ b/aos/vision/image/jpeg_routines.cc
@@ -1,13 +1,13 @@
#include "aos/vision/image/jpeg_routines.h"
-#include <errno.h>
-#include <setjmp.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <sys/mman.h>
#include <unistd.h>
+
+#include <cerrno>
+#include <csetjmp>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
#include <cstring>
#include "aos/logging/logging.h"
@@ -154,9 +154,10 @@
cinfo.out_color_space = JCS_RGB;
jpeg_create_decompress(&cinfo);
- jpeg_mem_src(&cinfo, reinterpret_cast<unsigned char *>(
- const_cast<char *>(data.data())),
- data.size());
+ jpeg_mem_src(
+ &cinfo,
+ reinterpret_cast<unsigned char *>(const_cast<char *>(data.data())),
+ data.size());
jpeg_read_header(&cinfo, TRUE);
fmt.w = cinfo.image_width;
@@ -204,9 +205,10 @@
cinfo.out_color_space = JCS_RGB;
jpeg_create_decompress(&cinfo);
- jpeg_mem_src(&cinfo, reinterpret_cast<unsigned char *>(
- const_cast<char *>(data.data())),
- data.size());
+ jpeg_mem_src(
+ &cinfo,
+ reinterpret_cast<unsigned char *>(const_cast<char *>(data.data())),
+ data.size());
jpeg_read_header(&cinfo, TRUE);
standard_huff_tables(&cinfo);
diff --git a/aos/vision/image/jpeg_routines.h b/aos/vision/image/jpeg_routines.h
index 7c8fd67..59ad296 100644
--- a/aos/vision/image/jpeg_routines.h
+++ b/aos/vision/image/jpeg_routines.h
@@ -1,9 +1,11 @@
#ifndef _AOS_VISION_IMAGE_JPEGROUTINES_H_
#define _AOS_VISION_IMAGE_JPEGROUTINES_H_
-#include <stdio.h>
-#include <stdlib.h>
#include <unistd.h>
+
+#include <cstdio>
+#include <cstdlib>
+
#include "aos/vision/image/image_types.h"
namespace aos {
diff --git a/aos/vision/image/reader.cc b/aos/vision/image/reader.cc
index 7584369..3fbcd1d 100644
--- a/aos/vision/image/reader.cc
+++ b/aos/vision/image/reader.cc
@@ -1,17 +1,18 @@
#include "aos/vision/image/reader.h"
-#include <errno.h>
#include <fcntl.h>
#include <malloc.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/types.h>
#include <unistd.h>
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+
#include "aos/logging/logging.h"
#include "aos/time/time.h"
diff --git a/aos/vision/image/reader.h b/aos/vision/image/reader.h
index 4283224..8f7b6b7 100644
--- a/aos/vision/image/reader.h
+++ b/aos/vision/image/reader.h
@@ -1,7 +1,7 @@
#ifndef AOS_VISION_IMAGE_READER_H_
#define AOS_VISION_IMAGE_READER_H_
-#include <inttypes.h>
+#include <cinttypes>
#include <functional>
#include <string>