diff options
| author | Hiroki Sato <hrs@FreeBSD.org> | 2007-06-03 05:02:53 +0000 |
|---|---|---|
| committer | Hiroki Sato <hrs@FreeBSD.org> | 2007-06-03 05:02:53 +0000 |
| commit | 63ef77c8985497c11e9063ae6975f277dbef0e94 (patch) | |
| tree | 76e2fabecf1e6d56015d65f1a7de195484690386 /print/ghostscript-gpl/files/patch-epag__gdevepag.c | |
| parent | Add dmxproto as well as dmx since dmx doesn't pull in dmxproto. (diff) | |
Update to 8.57.
Submitted by: KATO Tsuguru
PR: ports/113009
Notes
Notes:
svn path=/head/; revision=192618
Diffstat (limited to 'print/ghostscript-gpl/files/patch-epag__gdevepag.c')
| -rw-r--r-- | print/ghostscript-gpl/files/patch-epag__gdevepag.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/print/ghostscript-gpl/files/patch-epag__gdevepag.c b/print/ghostscript-gpl/files/patch-epag__gdevepag.c index f3823f24998b..b65ef6921509 100644 --- a/print/ghostscript-gpl/files/patch-epag__gdevepag.c +++ b/print/ghostscript-gpl/files/patch-epag__gdevepag.c @@ -1,37 +1,35 @@ --- epag/gdevepag.c.orig Sat Jul 8 13:33:09 2000 -+++ epag/gdevepag.c Thu May 26 00:12:48 2005 ++++ epag/gdevepag.c Mon May 14 01:22:31 2007 @@ -417,15 +417,15 @@ cont->maxY = epag_cont.cRowBuf / cont->bh * cont->bh ; if(cont->maxY < cont->bh) cont->maxY = cont->bh; - cont->bp = gs_malloc(bpl , cont->maxY, "epag_skip_blank_init(bp)"); - cont->bp2 = gs_malloc(bpl*3/2+1 , cont->maxY, "epag_skip_blank_init(bp2)"); -+ cont->bp = gs_malloc(pdev->memory, bpl , cont->maxY, "epag_skip_blank_init(bp)"); -+ cont->bp2 = gs_malloc(pdev->memory, bpl*3/2+1 , cont->maxY, "epag_skip_blank_init(bp2)"); ++ cont->bp = (byte *)gs_malloc(gs_lib_ctx_get_non_gc_memory_t(), bpl , cont->maxY, "epag_skip_blank_init(bp)"); ++ cont->bp2 = (byte *)gs_malloc(gs_lib_ctx_get_non_gc_memory_t(), bpl*3/2+1 , cont->maxY, "epag_skip_blank_init(bp2)"); cont->h = cont->r = 0; - cont->bubbleTbl=gs_malloc(sizeof(EpagBubble *),cont->maxBx,"bubbleTbl"); -+ cont->bubbleTbl=gs_malloc(pdev->memory, sizeof(EpagBubble *),cont->maxBx,"bubbleTbl"); ++ cont->bubbleTbl = (byte *)gs_malloc(gs_lib_ctx_get_non_gc_memory_t(), sizeof(EpagBubble *),cont->maxBx,"bubbleTbl"); for(i=0;i<cont->maxBx;i++) cont->bubbleTbl[i] = NULL; - cont->bubbleBuffer=gs_malloc(sizeof(EpagBubble),cont->maxBx,"bubbleBuffer"); -+ cont->bubbleBuffer=gs_malloc(pdev->memory, sizeof(EpagBubble),cont->maxBx,"bubbleBuffer"); ++ cont->bubbleBuffer=gs_malloc(gs_lib_ctx_get_non_gc_memory_t(), sizeof(EpagBubble),cont->maxBx,"bubbleBuffer"); bbtbl = (EpagBubble *)cont->bubbleBuffer; for(i=0;i<cont->maxBx-1;i++) bbtbl[i].next = &bbtbl[i+1]; -@@ -436,9 +436,11 @@ +@@ -436,9 +436,9 @@ private void epag_page_close(EpagPageCont *cont) { - gs_free(cont->bp, bpl, cont->maxY, "epag_skip_blank_init(bp)"); - gs_free(cont->bp2, bpl*3/2+1, cont->maxY, "epag_skip_blank_init(bp2)"); - gs_free(cont->bubbleBuffer, sizeof(EpagBubble), cont->maxBx,"bubbleBuffer"); -+ gx_device* pdev; -+ -+ gs_free(pdev->memory, cont->bp, bpl, cont->maxY, "epag_skip_blank_init(bp)"); -+ gs_free(pdev->memory, cont->bp2, bpl*3/2+1, cont->maxY, "epag_skip_blank_init(bp2)"); -+ gs_free(pdev->memory, cont->bubbleBuffer, sizeof(EpagBubble), cont->maxBx,"bubbleBuffer"); ++ gs_free(gs_lib_ctx_get_non_gc_memory_t(), cont->bp, bpl, cont->maxY, "epag_skip_blank_init(bp)"); ++ gs_free(gs_lib_ctx_get_non_gc_memory_t(), cont->bp2, bpl*3/2+1, cont->maxY, "epag_skip_blank_init(bp2)"); ++ gs_free(gs_lib_ctx_get_non_gc_memory_t(), cont->bubbleBuffer, sizeof(EpagBubble), cont->maxBx,"bubbleBuffer"); } private int |