[neurun] Change check condition for addOperation & addOperationEx (#2551)
author오형석/동작제어Lab(SR)/Staff Engineer/삼성전자 <hseok82.oh@samsung.com>
Mon, 3 Sep 2018 10:34:13 +0000 (19:34 +0900)
committerGitHub Enterprise <noreply-CODE@samsung.com>
Mon, 3 Sep 2018 10:34:13 +0000 (19:34 +0900)
Change check condition for addOperation & addOperationEx to same with pacl

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>
runtimes/neurun/src/frontend/model.cc

index 04237dd..82ed2fa 100644 (file)
@@ -179,8 +179,7 @@ int ANeuralNetworksModel_addOperation(ANeuralNetworksModel *model,
                                       const uint32_t *inputs, uint32_t outputCount,
                                       const uint32_t *outputs)
 {
-  if ((model == nullptr) || ((inputs == nullptr) && (inputCount != 0)) ||
-      ((outputs == nullptr) && (outputCount != 0)))
+  if ((model == nullptr) || (inputs == nullptr) || (outputs == nullptr))
   {
     return ANEURALNETWORKS_UNEXPECTED_NULL;
   }
@@ -324,8 +323,7 @@ int ANeuralNetworksModel_addOperationEx(ANeuralNetworksModel *model,
                                         const uint32_t *inputs, uint32_t outputCount,
                                         const uint32_t *outputs)
 {
-  if ((model == nullptr) || ((inputs == nullptr) && (inputCount != 0)) ||
-      ((outputs == nullptr) && (outputCount != 0)))
+  if ((model == nullptr) || (inputs == nullptr) || (outputs == nullptr))
   {
     return ANEURALNETWORKS_UNEXPECTED_NULL;
   }
@@ -355,6 +353,12 @@ int ANeuralNetworksModel_addOperationEx(ANeuralNetworksModel *model,
     }
   }
 
+  // Workaround: to avoid compile error by unused-parameter, use inputCount
+  if (inputCount == 0)
+  {
+    return ANEURALNETWORKS_BAD_DATA;
+  }
+
   switch (type)
   {
     default: