Changeset 35236 for branches/eam_branches/ipp-20130207/ppStack/src/ppStackCombineAlternate.c

Timestamp:

Mar 5, 2013, 2:24:05 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130207

Files:

• . (modified) (1 prop)
• ppStack/src/ppStackCombineAlternate.c (modified) (1 diff)

branches/eam_branches/ipp-20130207/ppStack/src/ppStackCombineAlternate.c

@@ -88 +88 @@
   }
 
+  if (!ppStackLinearScale(inputs, config)) {
+    psFree(inputs);
+    return(false);
+  }
 
   // Do combination