Changeset 37828 for branches/eam_branches/ipp-pv3-20140717-merge/psModules/src/objects/pmSource.c

Timestamp:

Jan 12, 2015, 12:36:24 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-pv3-20140717-merge/psModules/src/objects

Files:

• . (modified) (1 prop)
• pmSource.c (modified) (1 diff)

branches/eam_branches/ipp-pv3-20140717-merge/psModules/src/objects

@@ -16 +16 @@
 pmSourceIO_CMF_PS1_SV2.c
 pmSourceIO_CMF_PS1_SV3.c
+pmSourceIO_CMF_PS1_SV4.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
 pmSourceIO_CMF_PS1_DV3.c
 pmSourceIO_CMF_PS1_DV4.c
+

@@ -16 +16 @@
 pmSourceIO_CMF_PS1_SV2.c
 pmSourceIO_CMF_PS1_SV3.c
+pmSourceIO_CMF_PS1_SV4.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
 pmSourceIO_CMF_PS1_DV3.c
 pmSourceIO_CMF_PS1_DV4.c
+

branches/eam_branches/ipp-pv3-20140717-merge/psModules/src/objects/pmSource.c

@@ -176 +176 @@
     source->parent = NULL;
     source->tmpPtr = NULL;
+    source->chipNum = -1;
+    source->chipX = -1000;
+    source->chipY = -1000;
     source->imageID = -1;
     source->nFrames = 0;

@@ -16 +16 @@
 pmSourceIO_CMF_PS1_SV2.c
 pmSourceIO_CMF_PS1_SV3.c
+pmSourceIO_CMF_PS1_SV4.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
 pmSourceIO_CMF_PS1_DV3.c
 pmSourceIO_CMF_PS1_DV4.c
+