From 68b6c0f455aa865795bb3b111fb5839aa05d4bbb Mon Sep 17 00:00:00 2001 From: filiprrs Date: Fri, 30 Jul 2021 00:39:21 +0200 Subject: [PATCH] libhwjpeg: resolve compilation errors Change-Id: I67cf8ea065145b006891bf631ab64e64f694dd90 --- libhwjpeg/AppMarkerWriter.cpp | 4 ++-- libhwjpeg/hwjpeg-v4l2.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libhwjpeg/AppMarkerWriter.cpp b/libhwjpeg/AppMarkerWriter.cpp index 7e18ab3..b32f336 100644 --- a/libhwjpeg/AppMarkerWriter.cpp +++ b/libhwjpeg/AppMarkerWriter.cpp @@ -238,7 +238,7 @@ void CAppMarkerWriter::PrepareAppWriter(char *base, exif_attribute_t *exif, debu len = debug->debugSize[appid]; if ((len == 0) || (len > (JPEG_MAX_SEGMENT_SIZE - JPEG_SEGMENT_LENFIELD_SIZE))) { - ALOGE("Invalid APP%d segment size, %zu bytes", appid, len); + ALOGE("Invalid APP%d segment size, %u bytes", appid, len); return; } @@ -260,7 +260,7 @@ void CAppMarkerWriter::PrepareAppWriter(char *base, exif_attribute_t *exif, debu // | | // SOI DHTofMain - ALOGD("APP1: %zu bytes(ThumbMax %zu)", m_szApp1, m_szMaxThumbSize); + ALOGD("APP1: %hu bytes(ThumbMax %zu)", m_szApp1, m_szMaxThumbSize); } #define APPMARKLEN (JPEG_MARKER_SIZE + JPEG_SEGMENT_LENFIELD_SIZE) diff --git a/libhwjpeg/hwjpeg-v4l2.cpp b/libhwjpeg/hwjpeg-v4l2.cpp index 01a8742..40422e2 100644 --- a/libhwjpeg/hwjpeg-v4l2.cpp +++ b/libhwjpeg/hwjpeg-v4l2.cpp @@ -755,7 +755,7 @@ CHWJpegV4L2Decompressor::~CHWJpegV4L2Decompressor() bool CHWJpegV4L2Decompressor::PrepareCapture() { if (m_v4l2DstBuffer.length < m_v4l2Format.fmt.pix.sizeimage) { - ALOGE("The size of the buffer %zu is smaller than required %u", + ALOGE("The size of the buffer %u is smaller than required %u", m_v4l2DstBuffer.length, m_v4l2Format.fmt.pix.sizeimage); return false; } -- 2.20.1