git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Big bugfixes from trying a Clone/fork bomb
[tpg/acess2.git]
/
Modules
/
Display
/
VESA
/
main.c
diff --git
a/Modules/Display/VESA/main.c
b/Modules/Display/VESA/main.c
index
479be30
..
1cd6a91
100644
(file)
--- a/
Modules/Display/VESA/main.c
+++ b/
Modules/Display/VESA/main.c
@@
-2,7
+2,7
@@
* AcessOS 1
\r
* Video BIOS Extensions (Vesa) Driver
\r
*/
\r
* AcessOS 1
\r
* Video BIOS Extensions (Vesa) Driver
\r
*/
\r
-#define DEBUG
1
\r
+#define DEBUG
0
\r
#define VERSION 0x100
\r
\r
#include <acess.h>
\r
#define VERSION 0x100
\r
\r
#include <acess.h>
\r
@@
-474,10
+474,19
@@
int Vesa_Int_FindMode(tVideo_IOCtl_Mode *data)
break;
\r
}
\r
\r
break;
\r
}
\r
\r
- tmp = gVesa_Modes[i].width * gVesa_Modes[i].height
* gVesa_Modes[i].bpp
;
\r
- tmp -= data->width * data->height
* data->bpp
;
\r
+ tmp = gVesa_Modes[i].width * gVesa_Modes[i].height;
\r
+ tmp -= data->width * data->height;
\r
tmp = tmp < 0 ? -tmp : tmp;
\r
tmp = tmp < 0 ? -tmp : tmp;
\r
- factor = tmp * 100 / (data->width * data->height * data->bpp);
\r
+ factor = tmp * 100 / (data->width * data->height);
\r
+
\r
+ if( (data->bpp == 32 || data->bpp == 24)
\r
+ && (gVesa_Modes[i].bpp == 32 || gVesa_Modes[i].bpp == 24) )
\r
+ {
\r
+
\r
+ }
\r
+ else {
\r
+ factor *= 10;
\r
+ }
\r
\r
LOG("factor = %i", factor);
\r
\r
\r
LOG("factor = %i", factor);
\r
\r
UCC
git Repository :: git.ucc.asn.au