Merge branch 'hotfix/fix-prediction-size'

RidgeRun · Feb 6, 2020 · 7d64646 · 7d64646
2 parents 4a11323 + d851d30
commit 7d64646
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/configure.ac b/configure.ac
@@ -5,7 +5,7 @@ dnl please read gstreamer/docs/random/autotools before changing this file
 dnl initialize autoconf
 dnl releases only do -Wall, git and prerelease does -Werror too
 dnl use a three digit version number for releases, and four for git/pre
-AC_INIT([GStreamer Inference],[0.6.0.1],[https://github.com/RidgeRun/gst-inference/issues],[gst-inference])
+AC_INIT([GStreamer Inference],[0.6.1.1],[https://github.com/RidgeRun/gst-inference/issues],[gst-inference])
 
 AG_GST_INIT
 

diff --git a/gst-libs/gst/r2inference/gstbackend.cc b/gst-libs/gst/r2inference/gstbackend.cc
@@ -432,8 +432,8 @@ gst_backend_process_frame (GstBackend *self, GstVideoFrame *input_frame,
   *prediction_size = prediction->GetResultSize ();
 
   /*could we avoid memory copy ?*/
-  *prediction_data = g_malloc(*prediction_size);
-  memcpy(*prediction_data, prediction->GetResultData(), *prediction_size);
+  *prediction_data = g_malloc(*prediction_size * sizeof(gfloat));
+  memcpy(*prediction_data, prediction->GetResultData(), *prediction_size * sizeof(gfloat));
 
   GST_LOG_OBJECT (self, "Size of prediction %p is %lu",
                   *prediction_data, *prediction_size);

diff --git a/gst-libs/gst/r2inference/gstinferencepostprocess.c b/gst-libs/gst/r2inference/gstinferencepostprocess.c
@@ -48,7 +48,7 @@ gst_fill_classification_meta (GstClassificationMeta * class_meta,
   g_return_val_if_fail (class_meta != NULL, FALSE);
   g_return_val_if_fail (prediction != NULL, FALSE);
 
-  class_meta->num_labels = predsize / sizeof (gfloat);
+  class_meta->num_labels = predsize;
   class_meta->label_probs =
       g_malloc (class_meta->num_labels * sizeof (gdouble));
   for (gint i = 0; i < class_meta->num_labels; ++i) {