[gs-cvs] rev 8059 - in trunk/gs: contrib src

[ray at ghostscript.com]

Author: ray
Date: 2007-06-18 10:05:33 -0700 (Mon, 18 Jun 2007)
New Revision: 8059

Modified:
   trunk/gs/contrib/gomni.c
   trunk/gs/src/gdevbmpa.c
Log:
Fix bmpa and gomni devices to account for changes to mem_*_size
function calling sequences (rev 8056). These were missed since they
were not part of the 'standard' build on most platforms and will
be the 'async' method of gdevprna etc. will be deprecated.



Modified: trunk/gs/contrib/gomni.c
===================================================================
--- trunk/gs/contrib/gomni.c	2007-06-18 16:37:50 UTC (rev 8058)
+++ trunk/gs/contrib/gomni.c	2007-06-18 17:05:33 UTC (rev 8059)
@@ -1990,8 +1990,8 @@
    /* This will give us a very "ungenerous" buffer. */
    /* Here, my arbitrary rule for min image row is: twice the dest width */
    /* in full RGB. */
-   int       render_space;
-   int       writer_space;
+   ulong       render_space = 0;
+   ulong       writer_space;
    const int tile_cache_space = 50 * 1024;
    const int min_image_rows   = 2;
    int       min_row_space    = min_image_rows * (3 * (pgx_prt_dev->width + sizeof (int) - 1));
@@ -2000,9 +2000,8 @@
    space_params->band.BandWidth  = pgx_prt_dev->width;
    space_params->band.BandHeight = (pgx_prt_dev->height + min_band_count - 1) / min_band_count;
 
-   render_space = gdev_mem_data_size ((const gx_device_memory *)pgx_prt_dev,
-                                      space_params->band.BandWidth,
-                                      space_params->band.BandHeight);
+   gdev_mem_data_size ((const gx_device_memory *)pgx_prt_dev, space_params->band.BandWidth,
+			space_params->band.BandHeight, &render_space);
 
    /* need to include minimal writer requirements to satisfy rasterizer init */
    writer_space = 5000 /* add 5K slop for good measure */

Modified: trunk/gs/src/gdevbmpa.c
===================================================================
--- trunk/gs/src/gdevbmpa.c	2007-06-18 16:37:50 UTC (rev 8058)
+++ trunk/gs/src/gdevbmpa.c	2007-06-18 17:05:33 UTC (rev 8059)
@@ -453,7 +453,7 @@
 	    /* Set up the buffer device. */
 	    code = gdev_create_buf_device(crdev->buf_procs.create_buf_device,
 					  &bdev, crdev->target, &render_plane,
-					  dev->memory, true);
+					  dev->memory, NULL);
 	    if (code < 0)
 		goto done;
 
@@ -636,8 +636,8 @@
     /* This will give us a very "ungenerous" buffer. */
     /* Here, my arbitrary rule for min image row is: twice the dest width */
     /* in full CMYK. */
-    int render_space;
-    int writer_space;
+    ulong render_space = 0;
+    ulong writer_space;
     const int tile_cache_space = 50 * 1024;
     const int min_image_rows = 2;
     int min_row_space =
@@ -647,9 +647,8 @@
     space_params->band.BandWidth = pdev->width;
     space_params->band.BandHeight = min_band_height;
 
-    render_space = gdev_mem_data_size( (const gx_device_memory *)pdev,
-				       space_params->band.BandWidth,
-				       space_params->band.BandHeight );
+    gdev_mem_data_size( (const gx_device_memory *)pdev, space_params->band.BandWidth,
+			space_params->band.BandHeight, &render_space );
     /* need to include minimal writer requirements to satisfy rasterizer init */
     writer_space = 	/* add 5K slop for good measure */
 	5000 + (72 + 8) * ( (pdev->height / space_params->band.BandHeight) + 1 );