From e8eaf5fc802e4c040a2c6f6d891d8ec65b2d911c Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 23 Apr 2018 14:43:16 -0400 Subject: [PATCH] quiten build error --- src/zm_remote_camera_nvsocket.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/zm_remote_camera_nvsocket.cpp b/src/zm_remote_camera_nvsocket.cpp index 990b4f89d..9045b962a 100644 --- a/src/zm_remote_camera_nvsocket.cpp +++ b/src/zm_remote_camera_nvsocket.cpp @@ -187,13 +187,14 @@ int RemoteCameraNVSocket::Capture( Image &image ) { Warning( "Unable to capture image, retrying" ); return 0; } - if ( Read( sd, buffer, imagesize ) < imagesize ) { - Warning( "Unable to capture image, retrying" ); + int bytes_read = Read(sd, buffer, imagesize); + if ( (bytes_read < 0) || ( (unsigned int)bytes_read < imagesize ) ) { + Warning("Unable to capture image, retrying"); return 0; } uint32_t end; if ( Read(sd, (char *) &end , sizeof(end)) < 0 ) { - Warning( "Unable to capture image, retrying" ); + Warning("Unable to capture image, retrying"); return 0; } if ( end != 0xFFFFFFFF) { @@ -201,7 +202,7 @@ int RemoteCameraNVSocket::Capture( Image &image ) { return 0; } - image.Assign( width, height, colours, subpixelorder, buffer, imagesize ); + image.Assign(width, height, colours, subpixelorder, buffer, imagesize); return 1; }