Changeset 2975 for trunk/src

Timestamp:

07/14/14 18:48:30 (10 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-5545, CAS-6597

Ready for Test: Yes

Interface Changes: Yes/No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Fix for a bug in row flag handling.

File:

• trunk/src/MSWriter.cpp (modified) (3 diffs)

trunk/src/MSWriter.cpp

@@ -290 +290 @@
   {
     uInt idx = 0;
-    while( !isFilled[idx] && idx < 4 ) ++idx;
+    while( idx < 4 && !isFilled[idx] ) ++idx;
     return idx;
   }
@@ -350 +350 @@
   {
     // CAS-5545 FLAG must all be set True if FLAG_ROW is True
-    for (uInt ipol = 0; ipol < npol; ++ipol) {
-      if (flagRow[ipol]) {
+    for (uInt ipol = 0; ipol < 4; ++ipol) {
+      if (isFilled[ipol] and flagRow[ipol]) {
         flag(IPosition(2, ipol, 0), IPosition(2, ipol, nchan-1)) = True;
       }
@@ -396 +396 @@
   {
     // CAS-5545 FLAG must all be set True if FLAG_ROW is True
-    for (uInt ipol = 0; ipol < npol; ++ipol) {
-      if (flagRow[ipol]) {
+    for (uInt ipol = 0; ipol < 4; ++ipol) {
+      if (isFilled[ipol] and flagRow[ipol]) {
         flag(IPosition(2, ipol, 0), IPosition(2, ipol, nchan-1)) = True;
       }