Changeset 19539 for trunk/psLib/test/types

Timestamp:

Sep 12, 2008, 12:36:29 PM (18 years ago)

Author:

Paul Price

Message:

Optimising psPixelsConcatenate: use of qsort took ages. Split into two functions: psPixelsConcatenate (joing two pixel lists) and psPixelsDuplicates (remove duplicates in a list; works nicely in-place), and using PSSORT instead of qsort. Much faster!

File:

• trunk/psLib/test/types/tap_psPixels_all.c (modified) (4 diffs)

trunk/psLib/test/types/tap_psPixels_all.c

@@ -51 +51 @@
     }
     //Make sure psMemCheckPixels works correctly - return false
-    // XXX EAM : disabled -- failing test causes segfault  
+    // XXX EAM : disabled -- failing test causes segfault
     if (0) {
         int j = 2;
@@ -349 +349 @@
     {
         psMemId id = psMemGetId();
-        psPixels *outPixels = psPixelsAlloc(5);
+        psPixels *outPixels = psPixelsAlloc(6);
         in.x = 1.0;
         in.y = 1.0;
@@ -360 +360 @@
         in.x = 2.0;
         psPixelsSet(outPixels, 4, in);  //2, 1
-        psPixels *testPixels = psPixelsAlloc(6);
+        in.y = 2.0;
+        psPixelsSet(outPixels, 5, in);  //2, 2
+        psPixels *testPixels = psPixelsAlloc(7);
         in.x = 1.0;
         in.y = 1.0;
@@ -370 +372 @@
         in.x = 2.0;
         psPixelsSet(testPixels, 3, in);  //2, 1
+        in.y = 2.0;
+        psPixelsSet(testPixels, 4, in);  //2, 2
         in.x = 1.0;
-        psPixelsSet(testPixels, 4, in);  //1, 1
+        psPixelsSet(testPixels, 5, in);  //1, 2
         in.x = 5.0;
         in.y = 3.0;
-        psPixelsSet(testPixels, 5, in);  //5, 3
+        psPixelsSet(testPixels, 6, in);  //5, 3
         outPixels = psPixelsConcatenate(outPixels, testPixels);
-        ok(outPixels->n == 6, "psPixelsConcatenate:  return properly concatenate pixel list for valid inputs.");
+        outPixels = psPixelsDuplicates(outPixels, outPixels);
+        // Should be 5 entries: (1,1) (2,1) (1,2) (2,2) (5,3)
+        ok(outPixels->n == 5, "psPixelsConcatenate:  return properly concatenate pixel list for valid inputs.");
         psFree(testPixels);
         psFree(outPixels);