diff options
| author | N.N. <sevyves@users.sourceforge.net> | 2003-12-08 22:45:55 +0000 |
|---|---|---|
| committer | N.N. <sevyves@users.sourceforge.net> | 2003-12-08 22:45:55 +0000 |
| commit | 9f97696fb6f76f031f15d9313cf5c5e11381449c (patch) | |
| tree | 1411e9e03bdb80dd110f6e4e4798c996c3569edb /system | |
| parent | db4edc0406452c0c777e1214919557f4e6c2ae11 (diff) | |
PiDiP 0.12.11
svn path=/trunk/externals/pidip/; revision=1207
Diffstat (limited to 'system')
| -rw-r--r-- | system/Makefile | 1 | ||||
| -rw-r--r-- | system/pidip.c | 6 | ||||
| -rw-r--r-- | system/yuv.c | 8 |
3 files changed, 8 insertions, 7 deletions
diff --git a/system/Makefile b/system/Makefile index 228cada..fc2c9ac 100644 --- a/system/Makefile +++ b/system/Makefile @@ -1,4 +1,3 @@ -# Generated automatically from Makefile.in by configure. current: all_modules include ../Makefile diff --git a/system/pidip.c b/system/pidip.c index b93af9c..710dc51 100644 --- a/system/pidip.c +++ b/system/pidip.c @@ -44,7 +44,7 @@ extern "C" void pdp_form_setup(void); void pdp_compose_setup(void); void pdp_cmap_setup(void); - void pdp_aa_setup(void); + // void pdp_aa_setup(void); void pdp_ascii_setup(void); void pdp_ffmpeg_tilde_setup(void); void pdp_live_tilde_setup(void); @@ -60,6 +60,7 @@ extern "C" void pdp_cache_setup(void); void pdp_canvas_setup(void); // void pdp_xcanvas_setup(void); + void pdp_ocanvas_setup(void); void pdp_pen_setup(void); void pdp_shape_setup(void); @@ -105,7 +106,7 @@ void pidip_setup(void){ pdp_form_setup(); pdp_compose_setup(); pdp_cmap_setup(); - pdp_aa_setup(); + // pdp_aa_setup(); pdp_ascii_setup(); pdp_ffmpeg_tilde_setup(); pdp_live_tilde_setup(); @@ -121,6 +122,7 @@ void pidip_setup(void){ pdp_cache_setup(); pdp_canvas_setup(); // pdp_xcanvas_setup(); + pdp_ocanvas_setup(); pdp_pen_setup(); pdp_shape_setup(); diff --git a/system/yuv.c b/system/yuv.c index 4e6cd69..71f4a09 100644 --- a/system/yuv.c +++ b/system/yuv.c @@ -152,10 +152,10 @@ void yuv_Y122RGB( short int* packet, unsigned int *rgb, int width, int height ) // post( "yuv_Y122RGB : X=%d Y=%d", X, Y ); if ( (Y*width+X) < maxoffset ) y=(packet[Y*width+X]>>7); - if( (uoffset+((Y>>1)*width+(X>>1))) < maxoffset ) - u=(packet[uoffset+((Y>>1)*width+(X>>1))]>>8)+128; - if( (voffset+((Y>>1)*width+(X>>1))) < maxoffset ) - v=(packet[voffset+((Y>>1)*width+(X>>1))]>>8)+128; + if( (uoffset+((Y>>1)*(width>>1)+(X>>1))) < maxoffset ) + u=(packet[uoffset+((Y>>1)*(width>>1)+(X>>1))]>>8)+128; + if( (voffset+((Y>>1)*(width>>1)+(X>>1))) < maxoffset ) + v=(packet[voffset+((Y>>1)*(width>>1)+(X>>1))]>>8)+128; rgb[Y*width+X] = yuv_YUVtoRGB( y, u, v ); } |