diff options
author | Michael Drake <tlsa@netsurf-browser.org> | 2012-07-22 23:29:58 +0100 |
---|---|---|
committer | Michael Drake <tlsa@netsurf-browser.org> | 2012-07-22 23:29:58 +0100 |
commit | 5433eecfeaf0517a3ed91b2a2beb9f78eaf4cef6 (patch) | |
tree | 52ea677e8daee65e972e4b103a5d3d7b48f57c7f | |
parent | f6f2bcbcde72b1d074ffb690e928cb2e9fe6307b (diff) | |
parent | 72a9071cb287867b81f3ed5791cc9c8ed3a0730a (diff) | |
download | netsurf-5433eecfeaf0517a3ed91b2a2beb9f78eaf4cef6.tar.gz netsurf-5433eecfeaf0517a3ed91b2a2beb9f78eaf4cef6.tar.bz2 |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
-rw-r--r-- | Docs/BUILDING-Windows | 20 | ||||
-rwxr-xr-x | atari/plot/plot.c | 16 |
2 files changed, 18 insertions, 18 deletions
diff --git a/Docs/BUILDING-Windows b/Docs/BUILDING-Windows index 10454b9b2..49b3ad344 100644 --- a/Docs/BUILDING-Windows +++ b/Docs/BUILDING-Windows @@ -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 diff --git a/atari/plot/plot.c b/atari/plot/plot.c index 458e3dd8a..9fe29cecb 100755 --- a/atari/plot/plot.c +++ b/atari/plot/plot.c @@ -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);
}
|