X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl_still.c;h=433ba896d449b77df2c56074f42273a6f2dc40ab;hb=8820b2068dee09af6b9ddb5ed078abbeeca5fdf2;hp=6ee1e94bb400e5805caf8566146d951f41f0e730;hpb=eccf04749681f70957f34fdd6742224774e72d15;p=melted diff --git a/src/modules/sdl/consumer_sdl_still.c b/src/modules/sdl/consumer_sdl_still.c index 6ee1e94..433ba89 100644 --- a/src/modules/sdl/consumer_sdl_still.c +++ b/src/modules/sdl/consumer_sdl_still.c @@ -3,19 +3,19 @@ * Copyright (C) 2003-2004 Ushodaya Enterprises Limited * Author: Charles Yates * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "consumer_sdl.h" @@ -269,11 +269,11 @@ static inline void display_1( SDL_Surface *screen, SDL_Rect rect, uint8_t *image for ( y = 0; y < rect.h; y ++ ) { p = start; - row_index = ( scale_height * y ) >> 16; + row_index = ( 32768 + scale_height * y ) >> 16; row = image + stride * row_index; for ( x = 0; x < rect.w; x ++ ) { - q = row + ( ( ( scale_width * x ) >> 16 ) * 3 ); + q = row + ( ( ( 32768 + scale_width * x ) >> 16 ) * 3 ); *p ++ = SDL_MapRGB( screen->format, *q, *( q + 1 ), *( q + 2 ) ); } start += scanlength; @@ -298,11 +298,11 @@ static inline void display_2( SDL_Surface *screen, SDL_Rect rect, uint8_t *image for ( y = 0; y < rect.h; y ++ ) { p = start; - row_index = ( scale_height * y ) >> 16; + row_index = ( 32768 + scale_height * y ) >> 16; row = image + stride * row_index; for ( x = 0; x < rect.w; x ++ ) { - q = row + ( ( ( scale_width * x ) >> 16 ) * 3 ); + q = row + ( ( ( 32768 + scale_width * x ) >> 16 ) * 3 ); *p ++ = SDL_MapRGB( screen->format, *q, *( q + 1 ), *( q + 2 ) ); } start += scanlength; @@ -328,11 +328,11 @@ static inline void display_3( SDL_Surface *screen, SDL_Rect rect, uint8_t *image for ( y = 0; y < rect.h; y ++ ) { p = start; - row_index = ( scale_height * y ) >> 16; + row_index = ( 32768 + scale_height * y ) >> 16; row = image + stride * row_index; for ( x = 0; x < rect.w; x ++ ) { - q = row + ( ( ( scale_width * x ) >> 16 ) * 3 ); + q = row + ( ( ( 32768 + scale_width * x ) >> 16 ) * 3 ); pixel = SDL_MapRGB( screen->format, *q, *( q + 1 ), *( q + 2 ) ); *p ++ = (pixel & 0xFF0000) >> 16; *p ++ = (pixel & 0x00FF00) >> 8; @@ -360,11 +360,11 @@ static inline void display_4( SDL_Surface *screen, SDL_Rect rect, uint8_t *image for ( y = 0; y < rect.h; y ++ ) { p = start; - row_index = ( scale_height * y ) >> 16; + row_index = ( 32768 + scale_height * y ) >> 16; row = image + stride * row_index; for ( x = 0; x < rect.w; x ++ ) { - q = row + ( ( ( scale_width * x ) >> 16 ) * 3 ); + q = row + ( ( ( 32768 + scale_width * x ) >> 16 ) * 3 ); *p ++ = SDL_MapRGB( screen->format, *q, *( q + 1 ), *( q + 2 ) ); } start += scanlength;