changeset 63:637853a7276a

*** empty log message ***
author david <david>
date Mon, 11 Jan 1993 11:31:24 +0000
parents 40f6b15f786e
children e2e67bb6251c
files volume_io/Testing/test_graphics.c volume_io/Testing/test_pixels.c
diffstat 2 files changed, 8 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/volume_io/Testing/test_graphics.c
+++ b/volume_io/Testing/test_graphics.c
@@ -25,7 +25,6 @@
     int               prev_rotation_mouse_x;
     Real              angle_in_degrees;
     int               i, j, pixels_x_size, pixels_y_size;
-    int               pixels_x_position, pixels_y_position;
     Real              x, y;
     Transform         modeling_transform, rotation_transform;
     static Point      origin = { 0.0, 0.0, 2.0 };
@@ -82,8 +81,10 @@
     pixels_x_size = 256;
     pixels_y_size = 256;
 
-    status = initialize_pixels( &pixels, pixels_x_size, pixels_y_size,
-                                RGB_PIXEL );
+    x_position = 10;
+    y_position = 10;
+    status = initialize_pixels( &pixels, x_position, y_position,
+                                pixels_x_size, pixels_y_size, RGB_PIXEL );
 
     for_less( i, 0, pixels_x_size )
     {
@@ -93,9 +94,6 @@
         }
     }
 
-    pixels_x_position = 10;
-    pixels_y_position = 10;
-
     /* ------------ define polygons to be drawn  ------------- */
 
     status = initialize_polygons( &polygons, make_Colour(0,255,255), &spr );
@@ -252,8 +250,7 @@
 
         if( update_required )
         {
-            G_draw_pixels( window, pixels_x_position, pixels_y_position,
-                           0, &pixels );
+            G_draw_pixels( window, &pixels );
 
             G_set_view_type( window, MODEL_VIEW );
             G_draw_polygons( window, &polygons );
--- a/volume_io/Testing/test_pixels.c
+++ b/volume_io/Testing/test_pixels.c
@@ -51,7 +51,7 @@
                                 i + COLOUR_MAP_INDEX_OFFSET,
                                 make_Colour(i,i,i) );
 
-    status = initialize_pixels( &pixels, pixels_x_size, pixels_y_size,
+    status = initialize_pixels( &pixels, 10, 10, pixels_x_size, pixels_y_size,
                                 pixel_type );
 
     start = current_realtime_seconds();
@@ -75,7 +75,7 @@
     print( "%g seconds\n", (end - start) / (Real) N_ITER );
 
 #else
-    status = initialize_pixels( &pixels, pixels_x_size, pixels_y_size,
+    status = initialize_pixels( &pixels, 10, 10, pixels_x_size, pixels_y_size,
                                 RGB_PIXEL );
 
     for_less( i, 0, 256 )
@@ -101,7 +101,7 @@
     start = current_realtime_seconds();
 
     for_less( iter, 0, N_ITER )
-        G_draw_pixels( window, 10, 10, 0, &pixels );
+        G_draw_pixels( window, &pixels );
 
     end = current_realtime_seconds();