[gs-cvs] rev 8091 - trunk/gs/src
leonardo at ghostscript.com
leonardo at ghostscript.com
Fri Jun 29 23:57:44 PDT 2007
Author: leonardo
Date: 2007-06-29 23:57:44 -0700 (Fri, 29 Jun 2007)
New Revision: 8091
Modified:
trunk/gs/src/gxclimag.c
trunk/gs/src/gxclrect.c
Log:
Fix : Expanding gxcldev.h macros, part 7.
DETAILS :
This change is algorithmically equivalent.
The purpose is to eliminate gxcldev.h macros
to simplify the debugging of the clist writer methods.
This 7th step removes obsolete contours.
EXPECTED DIFFERENCES :
None.
Modified: trunk/gs/src/gxclimag.c
===================================================================
--- trunk/gs/src/gxclimag.c 2007-06-30 06:41:55 UTC (rev 8090)
+++ trunk/gs/src/gxclimag.c 2007-06-30 06:57:44 UTC (rev 8091)
@@ -114,7 +114,6 @@
do {
code = cmd_update_lop(cdev, re.pcls, lop);
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, 0); */
if (code < 0 && SET_BAND_CODE(code))
goto error_in_rect;
if (depth > 1 && !re.pcls->color_is_alpha) {
@@ -124,7 +123,6 @@
code =
set_cmd_put_op(dp, cdev, re.pcls, cmd_opv_set_copy_alpha, 1);
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, 0); */
if (code < 0 && SET_BAND_CODE(code))
goto error_in_rect;
re.pcls->color_is_alpha = 1;
@@ -134,7 +132,6 @@
if (code >= 0)
code = cmd_do_enable_clip(cdev, re.pcls, pcpath != NULL);
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, 0); */
if (code < 0 && SET_BAND_CODE(code))
goto error_in_rect;
do {
@@ -142,7 +139,6 @@
if (depth > 1 && code >= 0)
code = cmd_set_color1(cdev, re.pcls, pdcolor->colors.pure);
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, 0); */
if (code < 0 && SET_BAND_CODE(code))
goto error_in_rect;
re.pcls->colors_used.slow_rop |= slow_rop;
@@ -161,7 +157,6 @@
do {
code = clist_change_bits(cdev, re.pcls, &tile, depth);
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, (code != gs_error_VMerror || !cdev->error_is_retryable) ); */
if (code < 0 && !(code != gs_error_VMerror || !cdev->error_is_retryable) && SET_BAND_CODE(code))
goto error_in_rect;
if (code < 0) {
@@ -200,7 +195,6 @@
}
}
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, 0); */
if (code < 0 && SET_BAND_CODE(code))
goto error_in_rect;
re.pcls->rect = rect;
@@ -555,11 +549,11 @@
&((gx_device_clist *)dev)->writer;
++cdev->ignore_lo_mem_warnings;
- ++cdev->driver_call_nesting; /* NEST_RECT */
+ ++cdev->driver_call_nesting;
{
code = write_image_end_all(dev, pie);
}
- --cdev->driver_call_nesting; /* UNNEST_RECT */
+ --cdev->driver_call_nesting;
--cdev->ignore_lo_mem_warnings;
/* Update sub-rect */
if (!pie->image.Interpolate)
@@ -703,14 +697,12 @@
if (code >= 0)
code = cmd_update_lop(cdev, re.pcls, lop);
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, 0); */
if (code < 0 && SET_BAND_CODE(code))
goto error_in_rect;
if (pie->uses_color) {
do {
code = cmd_put_drawing_color(cdev, re.pcls, &pie->dcolor);
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, 0); */
if (code < 0 && SET_BAND_CODE(code))
goto error_in_rect;
}
@@ -728,7 +720,6 @@
code =
set_cmd_put_op(dp, cdev, re.pcls, image_op, 1 + len);
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, 0); */
if (code < 0 && SET_BAND_CODE(code))
goto error_in_rect;
memcpy(dp + 1, pie->begin_image_command, len);
@@ -786,7 +777,6 @@
bytes_per_plane, offsets,
xoff - xskip, nrows);
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, 0); */
if (code < 0 && SET_BAND_CODE(code))
goto error_in_rect;
for (i = 0; i < num_planes; ++i)
@@ -834,7 +824,7 @@
return_error(gs_error_Fatal);
}
#endif
- ++cdev->driver_call_nesting; /* NEST_RECT */
+ ++cdev->driver_call_nesting;
{
do {
code = write_image_end_all(dev, pie);
@@ -851,7 +841,7 @@
code = clist_VMerror_recover_flush(cdev, code);
}
}
- --cdev->driver_call_nesting; /* UNNEST_RECT */
+ --cdev->driver_call_nesting;
cdev->image_enum_id = gs_no_id;
gs_free_object(pie->memory, pie, "clist_image_end_image");
return code;
@@ -1496,7 +1486,6 @@
if_debug1('L', "[L]image_end for band %d\n", re.band);
code = set_cmd_put_op(dp, cdev, re.pcls, cmd_opv_image_data, 2);
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, 0); */
if (code < 0 && SET_BAND_CODE(code))
goto error_in_rect;
dp[1] = 0; /* EOD */
Modified: trunk/gs/src/gxclrect.c
===================================================================
--- trunk/gs/src/gxclrect.c 2007-06-30 06:41:55 UTC (rev 8090)
+++ trunk/gs/src/gxclrect.c 2007-06-30 06:57:44 UTC (rev 8091)
@@ -160,7 +160,6 @@
code = cmd_write_rect_cmd(cdev, re.pcls, cmd_op_fill_rect, rx, re.y,
rwidth, re.height);
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, 0); */
if (code < 0 && SET_BAND_CODE(code))
goto error_in_rect;
re.y += re.height;
@@ -208,7 +207,6 @@
do {
code = cmd_disable_lop(cdev, re.pcls);
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, 0); */
if (code < 0 && SET_BAND_CODE(code))
goto error_in_rect;
if (!cls_has_tile_id(cdev, re.pcls, tile->id, offset_temp)) {
@@ -217,7 +215,6 @@
do {
code = clist_change_tile(cdev, re.pcls, tile, depth);
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, (code != gs_error_VMerror || !cdev->error_is_retryable)); */
if (code < 0 && !(code != gs_error_VMerror || !cdev->error_is_retryable) && SET_BAND_CODE(code))
goto error_in_rect;
}
@@ -245,7 +242,6 @@
code = cmd_write_rect_cmd(cdev, re.pcls, cmd_op_tile_rect, rx, re.y,
rwidth, re.height);
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, 0); */
if (code < 0 && SET_BAND_CODE(code))
goto error_in_rect;
endr:;
@@ -301,7 +297,6 @@
if (color1 != re.pcls->colors[1] && code >= 0)
code = cmd_set_color1(cdev, re.pcls, color1);
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, 0); */
if (code < 0 && SET_BAND_CODE(code))
goto error_in_rect;
/* Don't bother to check for a possible cache hit: */
@@ -325,7 +320,6 @@
cmd_mask_compress_any),
&dp, &csize);
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, code == gs_error_limitcheck); */
if (code < 0 && !(code == gs_error_limitcheck) && SET_BAND_CODE(code))
goto error_in_rect;
compress = (uint)code;
@@ -342,7 +336,7 @@
/* Split a single (very long) row. */
int w2 = w1 >> 1;
- ++cdev->driver_call_nesting; /* NEST_RECT */
+ ++cdev->driver_call_nesting;
{
code = clist_copy_mono(dev, row, dx,
raster, gx_no_bitmap_id, rx, re.y,
@@ -353,7 +347,7 @@
rx + w2, re.y,
w1 - w2, 1, color0, color1);
}
- --cdev->driver_call_nesting; /* UNNEST_RECT */
+ --cdev->driver_call_nesting;
if (code < 0 && SET_BAND_CODE(code))
goto error_in_rect;
continue;
@@ -414,7 +408,6 @@
if (code >= 0)
code = cmd_disable_clip(cdev, re.pcls);
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, 0); */
if (code < 0 && SET_BAND_CODE(code))
goto error_in_rect;
if (re.pcls->color_is_alpha) {
@@ -424,7 +417,6 @@
code =
set_cmd_put_op(dp, cdev, re.pcls, cmd_opv_set_copy_color, 1);
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, 0); */
if (code < 0 && SET_BAND_CODE(code))
goto error_in_rect;
re.pcls->color_is_alpha = 0;
@@ -445,7 +437,6 @@
re.height, raster, rsize,
1 << cmd_compress_rle, &dp, &csize);
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, code == gs_error_limitcheck); */
if (code < 0 && !(code == gs_error_limitcheck) && SET_BAND_CODE(code))
goto error_in_rect;
compress = (uint)code;
@@ -461,7 +452,7 @@
/* Split a single (very long) row. */
int w2 = w1 >> 1;
- ++cdev->driver_call_nesting; /* NEST_RECT */
+ ++cdev->driver_call_nesting;
{
code = clist_copy_color(dev, row, dx,
raster, gx_no_bitmap_id,
@@ -471,7 +462,7 @@
raster, gx_no_bitmap_id,
rx + w2, re.y, w1 - w2, 1);
}
- --cdev->driver_call_nesting; /* UNNEST_RECT */
+ --cdev->driver_call_nesting;
if (code < 0 && SET_BAND_CODE(code))
goto error_in_rect;
continue;
@@ -536,7 +527,6 @@
if (code >= 0)
code = cmd_disable_clip(cdev, re.pcls);
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, 0); */
if (code < 0 && SET_BAND_CODE(code))
goto error_in_rect;
if (!re.pcls->color_is_alpha) {
@@ -546,7 +536,6 @@
code =
set_cmd_put_op(dp, cdev, re.pcls, cmd_opv_set_copy_alpha, 1);
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, 0); */
if (code < 0 && SET_BAND_CODE(code))
goto error_in_rect;
re.pcls->color_is_alpha = 1;
@@ -555,7 +544,6 @@
do {
code = cmd_set_color1(cdev, re.pcls, color);
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, 0); */
if (code < 0 && SET_BAND_CODE(code))
goto error_in_rect;
}
@@ -575,7 +563,6 @@
re.height, raster, rsize,
1 << cmd_compress_rle, &dp, &csize);
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, code == gs_error_limitcheck); */
if (code < 0 && !(code == gs_error_limitcheck) && SET_BAND_CODE(code))
goto error_in_rect;
compress = (uint)code;
@@ -591,7 +578,7 @@
/* Split a single (very long) row. */
int w2 = w1 >> 1;
- ++cdev->driver_call_nesting; /* NEST_RECT */
+ ++cdev->driver_call_nesting;
{
code = clist_copy_alpha(dev, row, dx,
raster, gx_no_bitmap_id, rx, re.y,
@@ -602,7 +589,7 @@
rx + w2, re.y, w1 - w2, 1,
color, depth);
}
- --cdev->driver_call_nesting; /* UNNEST_RECT */
+ --cdev->driver_call_nesting;
if (code < 0 && SET_BAND_CODE(code))
goto error_in_rect;
continue;
@@ -715,7 +702,6 @@
(tcolors != 0 ? 1 :
dev->color_info.depth));
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, code == gs_error_limitcheck); */
if (code < 0 && !(code == gs_error_limitcheck) && SET_BAND_CODE(code))
goto error_in_rect;
if (code < 0) {
@@ -755,7 +741,7 @@
* we may as well use the current tile phase
* so we don't have to write extra commands.
*/
- ++cdev->driver_call_nesting; /* NEST_RECT */
+ ++cdev->driver_call_nesting;
{
code = clist_strip_copy_rop(dev,
(sdata == 0 ? 0 : row + iy * sraster),
@@ -765,7 +751,7 @@
rx, re.y + iy, rwidth, 1,
phase_x, re.pcls->tile_phase.y, lop);
}
- --cdev->driver_call_nesting; /* UNNEST_RECT */
+ --cdev->driver_call_nesting;
if (code < 0 && SET_BAND_CODE(code))
goto error_in_rect;
}
@@ -778,7 +764,6 @@
code = cmd_set_tile_phase(cdev, re.pcls, phase_x,
phase_y);
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, 0); */
if (code < 0 && SET_BAND_CODE(code))
goto error_in_rect;
}
@@ -792,7 +777,6 @@
cmd_set_tile_colors(cdev, re.pcls, gx_no_color_index,
gx_no_color_index));
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, 0); */
if (code < 0 && SET_BAND_CODE(code))
goto error_in_rect;
}
@@ -803,13 +787,12 @@
if (code >= 0)
code = cmd_enable_lop(cdev, re.pcls);
} while (RECT_RECOVER(code));
- /* HANDLE_RECT_UNLESS(code, 0); */
if (code < 0 && SET_BAND_CODE(code))
goto error_in_rect;
/* Set lop_enabled to -1 so that fill_rectangle / copy_* */
/* won't attempt to set it to 0. */
re.pcls->lop_enabled = -1;
- ++cdev->driver_call_nesting; /* NEST_RECT */
+ ++cdev->driver_call_nesting;
{
if (scolors != 0) {
if (scolors[0] == scolors[1])
@@ -823,7 +806,7 @@
code = clist_copy_color(dev, row, sourcex, sraster, id,
rx, re.y, rwidth, re.height);
}
- --cdev->driver_call_nesting; /* UNNEST_RECT */
+ --cdev->driver_call_nesting;
re.pcls->lop_enabled = 1;
if (code < 0 && SET_BAND_CODE(code))
goto error_in_rect;
More information about the gs-cvs
mailing list