resolved all the merge conflicts

Apra-Labs · Jul 13, 2023 · 1a9ac43 · 1a9ac43
1 parent c19f16f
commit 1a9ac43
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 187 deletions.
diff --git a/base/include/CCNPPI.h b/base/include/CCNPPI.h
@@ -15,10 +15,10 @@ class CCNPPIProps : public ModuleProps
 		stream = _stream->getCudaStream();
 		imageType = _imageType;
 	}
-	
+
 	cudastream_sp stream_sp;
 	cudaStream_t stream;
-	ImageMetadata::ImageType imageType;	
+	ImageMetadata::ImageType imageType;
 };
 
 class CCNPPI : public Module
@@ -52,5 +52,5 @@ class CCNPPI : public Module
 	framemetadata_sp mOutputMetadata;
 	framemetadata_sp mIntermediateMetadata;
 	std::string mOutputPinId;
-	CCNPPIProps mProps;		
+	CCNPPIProps mProps;
 };