Changeset 34060 for branches/eam_branches/ipp-20120601/ppSub/src/ppSubMatchPSFs.c

Timestamp:

Jun 23, 2012, 7:37:40 AM (14 years ago)

Author:

eugene

Message:

more pedantic warning fixes

File:

• branches/eam_branches/ipp-20120601/ppSub/src/ppSubMatchPSFs.c (modified) (1 diff)

branches/eam_branches/ipp-20120601/ppSub/src/ppSubMatchPSFs.c

@@ -471 +471 @@
             psRegion *region = regItem->data.V; // Region of interest
             psMetadataItem *modeItem = psMetadataGetAndIncrement(modeIter); // Item with mode
-            psAssert(modeItem && modeItem->type == PS_TYPE_S32, "Expect subtraction mode");
+            psAssert(modeItem && modeItem->type == PS_DATA_S32, "Expect subtraction mode");
             pmSubtractionMode mode = modeItem->data.S32; // Subtraction mode
             psMetadataItem *normItem = psMetadataGetAndIncrement(normIter); // Item with normalisation
-            psAssert(normItem && normItem->type == PS_TYPE_F32 && isfinite(normItem->data.F32),
+            psAssert(normItem && normItem->type == PS_DATA_F32 && isfinite(normItem->data.F32),
                      "Expect normalisation");
             float norm = normItem->data.F32; // Normalisation