Changeset 42820 for branches/eam_branches/ipp-20230313/ppMerge/src/ppMerge.h

Timestamp:

May 8, 2025, 4:10:23 PM (15 months ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20230313

Files:

• . (modified) (1 prop)
• ppMerge/src/ppMerge.h (modified) (1 diff)

branches/eam_branches/ipp-20230313/ppMerge/src/ppMerge.h

@@ -117 +117 @@
     );
 
+bool ppMergeFileFreeInput(pmConfig *config, const pmFPAview *view, int num);
+
 /**
  * Set the data level for files specified by name; return an array of the files
  */
 psArray *ppMergeFileDataLevel(const pmConfig *config, ///< Configuration
-                              const char *name, ///< Name of files
-                              pmFPALevel level ///< Level for file data level
+                              const char *name ///< Name of files
     );