Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/a423eb712dc387b879f62826fd36325110470ec8
...commit
http://git.netsurf-browser.org/netsurf.git/commit/a423eb712dc387b879f62826fd36325110470ec8
...tree
http://git.netsurf-browser.org/netsurf.git/tree/a423eb712dc387b879f62826fd36325110470ec8
The branch, chris/palette-mapped-plotters has been updated
via a423eb712dc387b879f62826fd36325110470ec8 (commit)
via 25f1acb504ee7de4690fb83ba4a39a75c8539273 (commit)
from 59af85e0b50f7343fe7c867cdb8cb868d7aac58f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/a423eb712dc387b879f62826fd36325110470ec8
commit a423eb712dc387b879f62826fd36325110470ec8
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
allow setting dithering quality 0-2
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 61d5603..8f12a46 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -486,6 +486,7 @@ struct BitMap *ami_bitmap_get_palettemapped(struct bitmap
*bitmap,
SetDTAttrs(bitmap->dto, NULL, NULL,
PDTA_Screen, scrn,
PDTA_ScaleQuality, nsoption_bool(scale_quality),
+ PDTA_DitherQuality,
nsoption_int(dither_quality),
TAG_DONE);
if((bitmap->width != width) || (bitmap->height != height)) {
diff --git a/amiga/options.h b/amiga/options.h
index 287b7ff..41bf104 100644
--- a/amiga/options.h
+++ b/amiga/options.h
@@ -49,6 +49,7 @@
int download_task_pri; \
bool faster_scroll; \
bool scale_quality; \
+ int dither_quality; \
bool ask_overwrite; \
int printer_unit; \
int print_scale; \
@@ -109,6 +110,7 @@
.download_task_pri = -1, \
.faster_scroll = true, \
.scale_quality = false, \
+ .dither_quality = 1, \
.ask_overwrite = true, \
.printer_unit = 0, \
.print_scale = 100, \
@@ -168,6 +170,7 @@
{ "download_task_pri", OPTION_INTEGER, &nsoptions.download_task_pri}, \
{ "faster_scroll", OPTION_BOOL, &nsoptions.faster_scroll}, \
{ "scale_quality", OPTION_BOOL, &nsoptions.scale_quality}, \
+{ "dither_quality", OPTION_INTEGER, &nsoptions.dither_quality}, \
{ "ask_overwrite", OPTION_BOOL, &nsoptions.ask_overwrite}, \
{ "printer_unit", OPTION_INTEGER, &nsoptions.printer_unit}, \
{ "print_scale", OPTION_INTEGER, &nsoptions.print_scale}, \
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/25f1acb504ee7de4690fb83ba4a39a75c8539273
commit 25f1acb504ee7de4690fb83ba4a39a75c8539273
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Don't re-layout if this has already been performed
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index d8f11b8..61d5603 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -480,25 +480,27 @@ struct BitMap *ami_bitmap_get_palettemapped(struct bitmap
*bitmap,
bitmap->dto = NULL;
}
- if(bitmap->dto == NULL)
+ if(bitmap->dto == NULL) {
bitmap->dto = ami_datatype_object_from_bitmap(bitmap);
- SetDTAttrs(bitmap->dto, NULL, NULL,
- PDTA_Screen, scrn,
- PDTA_ScaleQuality, nsoption_bool(scale_quality),
- TAG_DONE);
+ SetDTAttrs(bitmap->dto, NULL, NULL,
+ PDTA_Screen, scrn,
+ PDTA_ScaleQuality, nsoption_bool(scale_quality),
+ TAG_DONE);
- if((bitmap->width != width) || (bitmap->height != height)) {
- IDoMethod(bitmap->dto, PDTM_SCALE, width, height, 0);
+ if((bitmap->width != width) || (bitmap->height != height)) {
+ IDoMethod(bitmap->dto, PDTM_SCALE, width, height, 0);
+ }
+
+ if((DoDTMethod(bitmap->dto, 0, 0, DTM_PROCLAYOUT, 0, 1)) == 0)
+ return NULL;
}
- if(DoDTMethod(bitmap->dto, 0, 0, DTM_PROCLAYOUT, 0, 1)) {
- GetDTAttrs(bitmap->dto,
- PDTA_DestBitMap, &dtbm,
- PDTA_MaskPlane, &bitmap->native_mask,
- TAG_END);
- }
-
+ GetDTAttrs(bitmap->dto,
+ PDTA_DestBitMap, &dtbm,
+ PDTA_MaskPlane, &bitmap->native_mask,
+ TAG_END);
+
bitmap->nativebmwidth = width;
bitmap->nativebmheight = height;
-----------------------------------------------------------------------
Summary of changes:
amiga/bitmap.c | 33 ++++++++++++++++++---------------
amiga/options.h | 3 +++
2 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index d8f11b8..8f12a46 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -480,25 +480,28 @@ struct BitMap *ami_bitmap_get_palettemapped(struct bitmap
*bitmap,
bitmap->dto = NULL;
}
- if(bitmap->dto == NULL)
+ if(bitmap->dto == NULL) {
bitmap->dto = ami_datatype_object_from_bitmap(bitmap);
- SetDTAttrs(bitmap->dto, NULL, NULL,
- PDTA_Screen, scrn,
- PDTA_ScaleQuality, nsoption_bool(scale_quality),
- TAG_DONE);
-
- if((bitmap->width != width) || (bitmap->height != height)) {
- IDoMethod(bitmap->dto, PDTM_SCALE, width, height, 0);
+ SetDTAttrs(bitmap->dto, NULL, NULL,
+ PDTA_Screen, scrn,
+ PDTA_ScaleQuality, nsoption_bool(scale_quality),
+ PDTA_DitherQuality,
nsoption_int(dither_quality),
+ TAG_DONE);
+
+ if((bitmap->width != width) || (bitmap->height != height)) {
+ IDoMethod(bitmap->dto, PDTM_SCALE, width, height, 0);
+ }
+
+ if((DoDTMethod(bitmap->dto, 0, 0, DTM_PROCLAYOUT, 0, 1)) == 0)
+ return NULL;
}
- if(DoDTMethod(bitmap->dto, 0, 0, DTM_PROCLAYOUT, 0, 1)) {
- GetDTAttrs(bitmap->dto,
- PDTA_DestBitMap, &dtbm,
- PDTA_MaskPlane, &bitmap->native_mask,
- TAG_END);
- }
-
+ GetDTAttrs(bitmap->dto,
+ PDTA_DestBitMap, &dtbm,
+ PDTA_MaskPlane, &bitmap->native_mask,
+ TAG_END);
+
bitmap->nativebmwidth = width;
bitmap->nativebmheight = height;
diff --git a/amiga/options.h b/amiga/options.h
index 287b7ff..41bf104 100644
--- a/amiga/options.h
+++ b/amiga/options.h
@@ -49,6 +49,7 @@
int download_task_pri; \
bool faster_scroll; \
bool scale_quality; \
+ int dither_quality; \
bool ask_overwrite; \
int printer_unit; \
int print_scale; \
@@ -109,6 +110,7 @@
.download_task_pri = -1, \
.faster_scroll = true, \
.scale_quality = false, \
+ .dither_quality = 1, \
.ask_overwrite = true, \
.printer_unit = 0, \
.print_scale = 100, \
@@ -168,6 +170,7 @@
{ "download_task_pri", OPTION_INTEGER, &nsoptions.download_task_pri}, \
{ "faster_scroll", OPTION_BOOL, &nsoptions.faster_scroll}, \
{ "scale_quality", OPTION_BOOL, &nsoptions.scale_quality}, \
+{ "dither_quality", OPTION_INTEGER, &nsoptions.dither_quality}, \
{ "ask_overwrite", OPTION_BOOL, &nsoptions.ask_overwrite}, \
{ "printer_unit", OPTION_INTEGER, &nsoptions.printer_unit}, \
{ "print_scale", OPTION_INTEGER, &nsoptions.print_scale}, \
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
