diff options
| -rw-r--r-- | android/jni/mupdf.c | 6 | ||||
| -rw-r--r-- | apps/mupdfdraw.c | 8 | ||||
| -rw-r--r-- | apps/muxpsdraw.c | 8 | ||||
| -rw-r--r-- | apps/pdfapp.c | 6 | ||||
| -rw-r--r-- | draw/draw_device.c | 6 | ||||
| -rw-r--r-- | fitz/dev_list.c | 2 | ||||
| -rw-r--r-- | fitz/fitz.h | 6 | ||||
| -rw-r--r-- | fitz/res_pixmap.c | 4 | ||||
| -rw-r--r-- | ios/main.m | 4 |
9 files changed, 25 insertions, 25 deletions
diff --git a/android/jni/mupdf.c b/android/jni/mupdf.c index 757c02c0..8541dbfe 100644 --- a/android/jni/mupdf.c +++ b/android/jni/mupdf.c @@ -195,10 +195,10 @@ Java_com_artifex_mupdf_MuPDFCore_drawPage(JNIEnv *env, jobject thiz, jobject bit pix = fz_new_pixmap_with_rect_and_data(ctx, colorspace, rect, pixels); if (currentPageList == NULL) { - fz_clear_pixmap_with_color(pix, 0xd0); + fz_clear_pixmap_with_value(pix, 0xd0); break; } - fz_clear_pixmap_with_color(pix, 0xff); + fz_clear_pixmap_with_value(pix, 0xff); zoom = resolution / 72; ctm = fz_scale(zoom, zoom); @@ -219,7 +219,7 @@ Java_com_artifex_mupdf_MuPDFCore_drawPage(JNIEnv *env, jobject thiz, jobject bit time = clock(); for (i=0; i<100;i++) { #endif - fz_execute_display_list(currentPageList, dev, ctm, bbox, NULL); + fz_run_display_list(currentPageList, dev, ctm, bbox, NULL); #ifdef TIME_DISPLAY_LIST } time = clock() - time; diff --git a/apps/mupdfdraw.c b/apps/mupdfdraw.c index c4906237..6325c791 100644 --- a/apps/mupdfdraw.c +++ b/apps/mupdfdraw.c @@ -136,7 +136,7 @@ static void drawpage(pdf_document *doc, int pagenum) dev = fz_new_trace_device(ctx); printf("<page number=\"%d\">\n", pagenum); if (list) - fz_execute_display_list(list, dev, fz_identity, fz_infinite_bbox, NULL); + fz_run_display_list(list, dev, fz_identity, fz_infinite_bbox, NULL); else pdf_run_page(doc, page, dev, fz_identity, NULL); printf("</page>\n"); @@ -163,7 +163,7 @@ static void drawpage(pdf_document *doc, int pagenum) text = fz_new_text_span(ctx); dev = fz_new_text_device(ctx, text); if (list) - fz_execute_display_list(list, dev, fz_identity, fz_infinite_bbox, NULL); + fz_run_display_list(list, dev, fz_identity, fz_infinite_bbox, NULL); else pdf_run_page(doc, page, dev, fz_identity, NULL); fz_free_device(dev); @@ -214,11 +214,11 @@ static void drawpage(pdf_document *doc, int pagenum) if (savealpha) fz_clear_pixmap(ctx, pix); else - fz_clear_pixmap_with_color(ctx, pix, 255); + fz_clear_pixmap_with_value(ctx, pix, 255); dev = fz_new_draw_device(ctx, pix); if (list) - fz_execute_display_list(list, dev, ctm, bbox, NULL); + fz_run_display_list(list, dev, ctm, bbox, NULL); else pdf_run_page(doc, page, dev, ctm, NULL); fz_free_device(dev); diff --git a/apps/muxpsdraw.c b/apps/muxpsdraw.c index bb7c986c..2bf27d74 100644 --- a/apps/muxpsdraw.c +++ b/apps/muxpsdraw.c @@ -101,7 +101,7 @@ static void drawpage(xps_document *doc, int pagenum) dev = fz_new_trace_device(doc->ctx); printf("<page number=\"%d\">\n", pagenum); if (list) - fz_execute_display_list(list, dev, fz_identity, fz_infinite_bbox, NULL); + fz_run_display_list(list, dev, fz_identity, fz_infinite_bbox, NULL); else xps_run_page(doc, page, dev, fz_identity, NULL); printf("</page>\n"); @@ -113,7 +113,7 @@ static void drawpage(xps_document *doc, int pagenum) fz_text_span *text = fz_new_text_span(doc->ctx); dev = fz_new_text_device(doc->ctx, text); if (list) - fz_execute_display_list(list, dev, fz_identity, fz_infinite_bbox, NULL); + fz_run_display_list(list, dev, fz_identity, fz_infinite_bbox, NULL); else xps_run_page(doc, page, dev, fz_identity, NULL); fz_free_device(dev); @@ -149,11 +149,11 @@ static void drawpage(xps_document *doc, int pagenum) if (savealpha) fz_clear_pixmap(doc->ctx, pix); else - fz_clear_pixmap_with_color(doc->ctx, pix, 255); + fz_clear_pixmap_with_value(doc->ctx, pix, 255); dev = fz_new_draw_device(doc->ctx, pix); if (list) - fz_execute_display_list(list, dev, ctm, bbox, NULL); + fz_run_display_list(list, dev, ctm, bbox, NULL); else xps_run_page(doc, page, dev, ctm, NULL); fz_free_device(dev); diff --git a/apps/pdfapp.c b/apps/pdfapp.c index 72f297ee..15d99557 100644 --- a/apps/pdfapp.c +++ b/apps/pdfapp.c @@ -292,7 +292,7 @@ static void pdfapp_showpage(pdfapp_t *app, int loadpage, int drawpage, int repai /* Extract text */ app->page_text = fz_new_text_span(app->ctx); tdev = fz_new_text_device(app->ctx, app->page_text); - fz_execute_display_list(app->page_list, tdev, fz_identity, fz_infinite_bbox, NULL); + fz_run_display_list(app->page_list, tdev, fz_identity, fz_infinite_bbox, NULL); fz_free_device(tdev); } @@ -317,9 +317,9 @@ static void pdfapp_showpage(pdfapp_t *app, int loadpage, int drawpage, int repai colorspace = fz_device_rgb; #endif app->image = fz_new_pixmap_with_rect(app->ctx, colorspace, bbox); - fz_clear_pixmap_with_color(app->ctx, app->image, 255); + fz_clear_pixmap_with_value(app->ctx, app->image, 255); idev = fz_new_draw_device(app->ctx, app->image); - fz_execute_display_list(app->page_list, idev, ctm, bbox, NULL); + fz_run_display_list(app->page_list, idev, ctm, bbox, NULL); fz_free_device(idev); } diff --git a/draw/draw_device.c b/draw/draw_device.c index e3ddc09e..279ef64d 100644 --- a/draw/draw_device.c +++ b/draw/draw_device.c @@ -805,7 +805,7 @@ fz_draw_fill_shade(fz_device *devp, fz_shade *shade, fz_matrix ctm, float alpha) fz_paint_shade(dev->ctx, shade, ctm, dest, bbox); if (shape) - fz_clear_pixmap_rect_with_color(dev->ctx, shape, 255, bbox); + fz_clear_pixmap_rect_with_value(dev->ctx, shape, 255, bbox); if (alpha < 1) { @@ -1199,9 +1199,9 @@ fz_draw_begin_mask(fz_device *devp, fz_rect rect, int luminosity, fz_colorspace if (!colorspace) colorspace = fz_device_gray; fz_convert_color(dev->ctx, colorspace, colorfv, fz_device_gray, &bc); - fz_clear_pixmap_with_color(dev->ctx, dest, bc * 255); + fz_clear_pixmap_with_value(dev->ctx, dest, bc * 255); if (shape) - fz_clear_pixmap_with_color(dev->ctx, shape, 255); + fz_clear_pixmap_with_value(dev->ctx, shape, 255); } else { diff --git a/fitz/dev_list.c b/fitz/dev_list.c index 873d6d71..adc691d0 100644 --- a/fitz/dev_list.c +++ b/fitz/dev_list.c @@ -591,7 +591,7 @@ fz_free_display_list(fz_context *ctx, fz_display_list *list) } void -fz_execute_display_list(fz_display_list *list, fz_device *dev, fz_matrix top_ctm, fz_bbox scissor, fz_cookie *cookie) +fz_run_display_list(fz_display_list *list, fz_device *dev, fz_matrix top_ctm, fz_bbox scissor, fz_cookie *cookie) { fz_display_node *node; fz_matrix ctm; diff --git a/fitz/fitz.h b/fitz/fitz.h index 8aa97004..9ce721ea 100644 --- a/fitz/fitz.h +++ b/fitz/fitz.h @@ -946,8 +946,8 @@ fz_pixmap *fz_keep_pixmap(fz_context *ctx, fz_pixmap *pix); void fz_drop_pixmap(fz_context *ctx, fz_pixmap *pix); void fz_free_pixmap_imp(fz_context *ctx, fz_storable *pix); void fz_clear_pixmap(fz_context *ctx, fz_pixmap *pix); -void fz_clear_pixmap_with_color(fz_context *ctx, fz_pixmap *pix, int value); -void fz_clear_pixmap_rect_with_color(fz_context *ctx, fz_pixmap *pix, int value, fz_bbox r); +void fz_clear_pixmap_with_value(fz_context *ctx, fz_pixmap *pix, int value); +void fz_clear_pixmap_rect_with_value(fz_context *ctx, fz_pixmap *pix, int value, fz_bbox r); void fz_copy_pixmap_rect(fz_context *ctx, fz_pixmap *dest, fz_pixmap *src, fz_bbox r); void fz_premultiply_pixmap(fz_context *ctx, fz_pixmap *pix); void fz_unmultiply_pixmap(fz_context *ctx, fz_pixmap *pix); @@ -1446,7 +1446,7 @@ typedef struct fz_display_list_s fz_display_list; fz_display_list *fz_new_display_list(fz_context *ctx); void fz_free_display_list(fz_context *ctx, fz_display_list *list); fz_device *fz_new_list_device(fz_context *ctx, fz_display_list *list); -void fz_execute_display_list(fz_display_list *list, fz_device *dev, fz_matrix ctm, fz_bbox area, fz_cookie *cookie); +void fz_run_display_list(fz_display_list *list, fz_device *dev, fz_matrix ctm, fz_bbox area, fz_cookie *cookie); /* * Plotting functions. diff --git a/fitz/res_pixmap.c b/fitz/res_pixmap.c index 69ae18ea..dbed0842 100644 --- a/fitz/res_pixmap.c +++ b/fitz/res_pixmap.c @@ -118,7 +118,7 @@ fz_clear_pixmap(fz_context *ctx, fz_pixmap *pix) } void -fz_clear_pixmap_with_color(fz_context *ctx, fz_pixmap *pix, int value) +fz_clear_pixmap_with_value(fz_context *ctx, fz_pixmap *pix, int value) { if (value == 255) memset(pix->samples, 255, pix->w * pix->h * pix->n); @@ -167,7 +167,7 @@ fz_copy_pixmap_rect(fz_context *ctx, fz_pixmap *dest, fz_pixmap *src, fz_bbox r) } void -fz_clear_pixmap_rect_with_color(fz_context *ctx, fz_pixmap *dest, int value, fz_bbox r) +fz_clear_pixmap_rect_with_value(fz_context *ctx, fz_pixmap *dest, int value, fz_bbox r) { unsigned char *destp; int x, y, w, k, destspan; @@ -217,7 +217,7 @@ static UIImage *renderPage(struct document *doc, int number, CGSize screenSize) bbox = (fz_bbox){0, 0, pageSize.width * scale.width, pageSize.height * scale.height}; pix = fz_new_pixmap_with_rect(ctx, fz_device_rgb, bbox); - fz_clear_pixmap_with_color(pix, 255); + fz_clear_pixmap_with_value(pix, 255); dev = fz_new_draw_device(ctx, pix); draw_page(doc, number, dev, ctm, NULL); @@ -254,7 +254,7 @@ static UIImage *renderTile(struct document *doc, int number, CGSize screenSize, bbox = fz_round_rect(rect); pix = fz_new_pixmap_with_rect(ctx, fz_device_rgb, bbox); - fz_clear_pixmap_with_color(pix, 255); + fz_clear_pixmap_with_value(pix, 255); dev = fz_new_draw_device(ctx, pix); draw_page(doc, number, dev, ctm, NULL); |