Changeset 8014 for trunk/ippTools/src/pxframes.c

Timestamp:

Jul 31, 2006, 2:13:17 PM (20 years ago)

Author:

jhoblitt

Message:

use psArrayLength() instead of psArray->n

File:

• trunk/ippTools/src/pxframes.c (modified) (6 diffs)

trunk/ippTools/src/pxframes.c

@@ -51 +51 @@
     psMetadata *output = psMetadataAlloc(); \
 \
-    for (int i = 0; i < frames->n; i++) { \
+    for (int i = 0; i < psArrayLength(frames); i++) { \
         frametype *frame = frames->data[i]; \
         PS_ASSERT_PTR_NON_NULL(frame, false); \
         PS_ASSERT_PTR_NON_NULL(frame->images, false); \
 \
-        for (int j = 0; j < frame->images->n; j++) { \
+        for (int j = 0; j < psArrayLength(frame->images); j++) { \
             imfiletype##Row *image = frame->images->data[j]; \
             psMetadata *md = imfiletype##MetadataFromObject(image); \
@@ -91 +91 @@
     } \
  \
-    psArray *allFrames = psArrayAlloc(exposures->n); \
-    allFrames->n = 0; \
+    psArray *allFrames = psArrayAlloc(psArrayLength(exposures)); \
  \
     for (int i = 0; i < psArrayLength(exposures); i++) { \
@@ -149 +148 @@
 
     psArray *newImages = newFrame->images;
-    psArray *rawImages = psArrayAlloc(newImages->n);
-    rawImages->n = 0;
-    for (long i = 0; i < newImages->n; i++) {
+    psArray *rawImages = psArrayAlloc(psArrayLength(newImages));
+    for (long i = 0; i < psArrayLength(newImages); i++) {
         newImfileRow *newImfile = newImages->data[i];
         psArrayAdd(rawImages, 0, rawImfileRowAlloc(
@@ -179 +177 @@
 
     psArray *images = frame->images;
-    for (long i = 0; i < images->n; i++) {
+    for (long i = 0; i < psArrayLength(images); i++) {
         if (!rawImfileInsertObject(dbh, images->data[i])) {
             psError(PS_ERR_UNKNOWN, false, "dbh access failed");
@@ -208 +206 @@
 
     psArray *newImages = newFrame->images;
-    psArray *rawImages = psArrayAlloc(newImages->n);
-    rawImages->n = 0;
-    for (long i = 0; i < newImages->n; i++) {
+    psArray *rawImages = psArrayAlloc(psArrayLength(newImages));
+    for (long i = 0; i < psArrayLength(newImages); i++) {
         newImfileRow *newImfile = newImages->data[i];
         psArrayAdd(rawImages, 0, rawImfileRowAlloc(
@@ -238 +235 @@
 
     psArray *images = frame->images;
-    for (long i = 0; i < images->n; i++) {
+    for (long i = 0; i < psArrayLength(images); i++) {
         if (!rawImfileInsertObject(dbh, images->data[i])) {
             psError(PS_ERR_UNKNOWN, false, "dbh access failed");