qi-hardware/openwrt-packages
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-packages.git synced 2024-11-22 11:52:48 +02:00
Code

plplot: fix/reimplement color setting in linuxvga driver

Browse Source
This commit is contained in:
David Kühling 2011-01-08 16:47:10 +01:00
parent e188763f7c
commit 9f875524dd
1 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
plplot/patches/050-linuxvga-320x240x16M.patch
View File

@ -1,7 +1,7 @@
Index: plplot-5.9.7/drivers/linuxvga.c Index: plplot-5.9.7/drivers/linuxvga.c
=================================================================== ===================================================================
--- plplot-5.9.7.orig/drivers/linuxvga.c 2011-01-08 12:20:09.000000000 +0100 --- plplot-5.9.7.orig/drivers/linuxvga.c 2011-01-08 12:20:09.000000000 +0100
+++ plplot-5.9.7/drivers/linuxvga.c 2011-01-08 12:27:34.000000000 +0100 +++ plplot-5.9.7/drivers/linuxvga.c 2011-01-08 15:37:11.000000000 +0100
@@ -39,8 +39,8 @@ @@ -39,8 +39,8 @@
/* INDENT ON */ /* INDENT ON */
@ -22,7 +22,7 @@ Index: plplot-5.9.7/drivers/linuxvga.c
if ( vga_hasmode( mode ) ) if ( vga_hasmode( mode ) )
vga_setmode( mode ); vga_setmode( mode );
else else
@@ -202,6 +202,13 @@ @@ -202,24 +202,40 @@
void void
plD_state_vga( PLStream *pls, PLINT op ) plD_state_vga( PLStream *pls, PLINT op )
{ {
@ -32,22 +32,43 @@ Index: plplot-5.9.7/drivers/linuxvga.c
+ 0x808080, 0x0000ff, 0x00ff00, 0x00ffff, + 0x808080, 0x0000ff, 0x00ff00, 0x00ffff,
+ 0xff0000, 0xff00ff, 0xffff00, 0xffffff + 0xff0000, 0xff00ff, 0xffff00, 0xffffff
+ }; + };
+ int r, g, b;
+ +
switch ( op ) switch ( op )
{ {
case PLSTATE_WIDTH: case PLSTATE_WIDTH:
@@ -210,11 +217,9 @@ break;
case PLSTATE_COLOR0: case PLSTATE_COLOR0:
if ( pls->color ) - if ( pls->color )
+ if ( !pls->color )
{ {
- /* Maybe it would be wiser to use a set of 16 relevant colors only - /* Maybe it would be wiser to use a set of 16 relevant colors only
- * and just fix it to black if col is exceeded 16. */ - * and just fix it to black if col is exceeded 16. */
- -
- col = ( pls->icol0 ) % totcol; /* Color modulo # of colors - col = ( pls->icol0 ) % totcol; /* Color modulo # of colors
- * avail */ - * avail */
+ /* fix to make it work with true-color mode */ - vga_setcolor( col );
+ if (col < 16) + r = g = b = pls->icol0 ? 0xff : 0;
+ col = vga_palette[col];
vga_setcolor( col );
} }
- break;
-
+ else
+ {
+ r = pls->curcolor.r, g = pls->curcolor.g, b = pls->curcolor.b;
+ }
+ vga_setrgbcolor (r, g, b);
+ break;
case PLSTATE_COLOR1:
+ if ( !pls->color )
+ {
+ r = g = b = pls->curcolor.r;
+ }
+ else
+ {
+ r = pls->curcolor.r, g = pls->curcolor.g, b = pls->curcolor.b;
+ }
+ vga_setrgbcolor( r, g, b );
break; break;
}
}