mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-24 15:29:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.netsurf-browser.org/netsurf

Browse Source
This commit is contained in:
Michael Drake 2012-07-22 23:29:58 +01:00
commit 5433eecfea
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Docs/BUILDING-Windows
View File

@ -121,7 +121,7 @@ EOF
regex:
$ wget http://downloads.sourceforge.net/project/mingw/UserContributed/regex/mingw-regex-2.5.1/mingw-libgnurx-2.5.1-src.tar.gz
$ wget http://kent.dl.sourceforge.net/project/mingw/Other/UserContributed/regex/mingw-regex-2.5.1/mingw-libgnurx-2.5.1-src.tar.gz
$ tar -zxf mingw-libgnurx-2.5.1-src.tar.gz
$ cd mingw-libgnurx-2.5.1
$ ./configure --prefix=/usr/i586-mingw32msvc/ --host=i586-mingw32msvc
@ -147,27 +147,27 @@ EOF
libcurl:
$ wget -q http://curl.haxx.se/download/curl-7.21.1.tar.gz
$ tar -zxf curl-7.21.1.tar.gz
$ cd curl-7.21.1
$ wget http://curl.haxx.se/download/curl-7.26.0.tar.gz
$ tar -zxf curl-7.26.0.tar.gz
$ cd curl-7.26.0
$ LDFLAGS=-mwindows ./configure --prefix=/usr/i586-mingw32msvc/ --host=i586-mingw32msvc --disable-shared --disable-ldap --without-random
$ make
$ sudo make install
libpng:
$ wget http://download.sourceforge.net/libpng/libpng-1.4.4.tar.gz
$ tar -zxf libpng-1.4.4.tar.gz
$ cd libpng-1.4.4
$ wget http://kent.dl.sourceforge.net/project/libpng/libpng14/1.4.12/libpng-1.4.12.tar.gz
$ tar -zxf libpng-1.4.12.tar.gz
$ cd libpng-1.4.12
$ ./configure --prefix=/usr/i586-mingw32msvc/ --host=i586-mingw32msvc
$ make
$ sudo make install
libjpeg:
$ wget http://www.ijg.org/files/jpegsrc.v8b.tar.gz
$ tar -zxf jpegsrc.v8b.tar.gz
$ cd jpeg-8b
$ wget http://www.ijg.org/files/jpegsrc.v8d.tar.gz
$ tar -zxf jpegsrc.v8d.tar.gz
$ cd jpeg-8d
$ ./configure --prefix=/usr/i586-mingw32msvc/ --host=i586-mingw32msvc --disable-shared
$ make
$ sudo make install

16
atari/plot/plot.c
View File

@ -500,7 +500,7 @@ static struct s_vdi_sysinfo * read_vdi_sysinfo(short vdih, struct s_vdi_sysinfo
/*
Convert an RGB color to an VDI Color
*/
void rgb_to_vdi1000(unsigned char * in, unsigned short * out)
static void inline rgb_to_vdi1000(unsigned char * in, unsigned short * out)
{
double r = ((double)in[3]/255); /* prozentsatz red */
double g = ((double)in[2]/255); /* prozentsatz green */
@ -511,7 +511,7 @@ void rgb_to_vdi1000(unsigned char * in, unsigned short * out)
return;
}
void vdi1000_to_rgb(unsigned short * in, unsigned char * out)
static void inline vdi1000_to_rgb(unsigned short * in, unsigned char * out)
{
double r = ((double)in[0]/1000); /* prozentsatz red */
double g = ((double)in[1]/1000); /* prozentsatz green */
@ -603,7 +603,7 @@ static inline unsigned char get_stdpx(MFDB * dst, int wdplanesz, int x, int y)
/*
Convert an RGB color into an index into the 216 colors web pallette
*/
short rgb_to_666_index(unsigned char r, unsigned char g, unsigned char b)
static short inline rgb_to_666_index(unsigned char r, unsigned char g, unsigned char b)
{
short ret = 0;
short i;
@ -958,7 +958,7 @@ static inline uint32_t ablend(uint32_t pixel, uint32_t scrpixel)
Alpha blends an image, using one pixel as the background.
The bitmap receives the result.
*/
static bool ablend_pixel( struct bitmap * img, uint32_t bg, GRECT * clip )
static bool inline ablend_pixel( struct bitmap * img, uint32_t bg, GRECT * clip )
{
uint32_t * imgrow;
int img_x, img_y, img_stride;
@ -980,7 +980,7 @@ static bool ablend_pixel( struct bitmap * img, uint32_t bg, GRECT * clip )
background images (bg). The background receives the blended
image pixels.
*/
static bool ablend_bitmap( struct bitmap * img, struct bitmap * bg,
static bool inline ablend_bitmap( struct bitmap * img, struct bitmap * bg,
GRECT * img_clip, GRECT * bg_clip )
{
uint32_t * imgrow;
@ -1395,14 +1395,13 @@ static bool bitmap_convert_tc(struct bitmap * img, int x, int y,
}
static void convert_bitmap_done(void)
static void inline convert_bitmap_done(void)
{
if (size_buf_packed > CONV_KEEP_LIMIT) {
/* free the mem if it was an large allocation ... */
buf_packed = realloc(buf_packed, CONV_KEEP_LIMIT);
size_buf_packed = CONV_KEEP_LIMIT;
}
snapshot_suspend();
}
@ -1469,7 +1468,8 @@ bool plot_blit_bitmap(struct bitmap * bmp, int x, int y,
pxy[7] = screen_y + off.g_h-1;
vro_cpyfm(atari_plot_vdi_handle, S_ONLY, (short*)&pxy, &src_mf, &scrmf);
convert_bitmap_done();
convert_bitmap_done();
snapshot_suspend();
return(true);
}