git.asbjorn.biz
/
swftools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6118bea
)
fixed "avi2swf hangs" problem.
author
kramm
<kramm>
Tue, 28 Sep 2004 07:24:56 +0000
(07:24 +0000)
committer
kramm
<kramm>
Tue, 28 Sep 2004 07:24:56 +0000
(07:24 +0000)
avi2swf/videoreader_vfw.cc
patch
|
blob
|
history
diff --git
a/avi2swf/videoreader_vfw.cc
b/avi2swf/videoreader_vfw.cc
index
124284a
..
b40c378
100644
(file)
--- a/
avi2swf/videoreader_vfw.cc
+++ b/
avi2swf/videoreader_vfw.cc
@@
-89,14
+89,14
@@
static int bitmap_to_rgba(BITMAPINFOHEADER*bi, void*buffer, const int dest_width
int linex = ((bytesperpixel/8)+3)&~3;
memset(dest, 255, dest_width*dest_height*4);//pre-fill alpha channel
int linex = ((bytesperpixel/8)+3)&~3;
memset(dest, 255, dest_width*dest_height*4);//pre-fill alpha channel
- int starty = flip? 0 : dest_height-1;
- int endy = flip? dest_height-1 : 0;
- int yinc = flip? 1 : -1;
+ const int starty = flip? 0 : dest_height-1;
+ const int endy = flip? dest_height : -1;
+ const int yinc = flip? 1 : -1;
if(bi->biBitCount==1) {
UCHAR*img = data;
int y;
if(bi->biBitCount==1) {
UCHAR*img = data;
int y;
- for(y=starty;y<=endy;y+=yinc) {
+ for(y=starty;y!=endy;y+=yinc) {
UCHAR*line = &img[linex*y];
int x;
for(x=0;x<dest_width;x++) {
UCHAR*line = &img[linex*y];
int x;
for(x=0;x<dest_width;x++) {
@@
-107,7
+107,7
@@
static int bitmap_to_rgba(BITMAPINFOHEADER*bi, void*buffer, const int dest_width
UCHAR*img = &data[bi->biClrUsed*4];
UCHAR*pal = data;
int y;
UCHAR*img = &data[bi->biClrUsed*4];
UCHAR*pal = data;
int y;
- for(y=starty;y<=endy;y+=yinc) {
+ for(y=starty;y!=endy;y+=yinc) {
UCHAR*line = &img[linex*y];
int x;
for(x=0;x<dest_width/2;x++) {
UCHAR*line = &img[linex*y];
int x;
for(x=0;x<dest_width/2;x++) {
@@
-120,7
+120,7
@@
static int bitmap_to_rgba(BITMAPINFOHEADER*bi, void*buffer, const int dest_width
UCHAR*img = &data[bi->biClrUsed*4];
UCHAR*pal = data;
int y;
UCHAR*img = &data[bi->biClrUsed*4];
UCHAR*pal = data;
int y;
- for(y=starty;y<=endy;y+=yinc) {
+ for(y=starty;y!=endy;y+=yinc) {
UCHAR*line = &img[linex*y];
int x;
for(x=0;x<dest_width;x++) {
UCHAR*line = &img[linex*y];
int x;
for(x=0;x<dest_width;x++) {
@@
-131,7
+131,7
@@
static int bitmap_to_rgba(BITMAPINFOHEADER*bi, void*buffer, const int dest_width
} else if(bi->biBitCount==24) {
UCHAR*img = data;
int y;
} else if(bi->biBitCount==24) {
UCHAR*img = data;
int y;
- for(y=starty;y<=endy;y+=yinc) {
+ for(y=starty;y!=endy;y+=yinc) {
UCHAR*line = &img[linex*y];
int x;
for(x=0;x<dest_width;x++) {
UCHAR*line = &img[linex*y];
int x;
for(x=0;x<dest_width;x++) {
@@
-142,7
+142,7
@@
static int bitmap_to_rgba(BITMAPINFOHEADER*bi, void*buffer, const int dest_width
} else if(bi->biBitCount==32) {
UCHAR*img = data;
int y;
} else if(bi->biBitCount==32) {
UCHAR*img = data;
int y;
- for(y=starty;y<=endy;y+=yinc) {
+ for(y=starty;y!=endy;y+=yinc) {
UCHAR*line = &img[linex*y];
int x;
for(x=0;x<dest_width;x++) {
UCHAR*line = &img[linex*y];
int x;
for(x=0;x<dest_width;x++) {