[project @ 2004-08-14 00:32:31 by rjw]

Changes for Tinct printing support

svn path=/import/netsurf/; revision=1225

5 files changed, 12 insertions, 5 deletions

diff --git a/riscos/gifread.c b/riscos/gifread.c
index 5ba180a0e..0e6a97f3c 100644
--- a/riscos/gifread.c
+++ b/riscos/gifread.c
@@ -203,6 +203,7 @@ int gif_initialise(struct gif_animation *gif) {
 		header = (osspriteop_header*)((char*)gif->frame_image +
 						gif->frame_image->first);
 		header->size = sizeof(osspriteop_header);
+		memset(header->name, 0x00, 12);
 		strcpy(header->name, "gif");
 		header->left_bit = 0;
 		header->right_bit = 31;
diff --git a/riscos/jpeg.c b/riscos/jpeg.c
index f3ac50e8a..9a4ff0927 100644
--- a/riscos/jpeg.c
+++ b/riscos/jpeg.c
@@ -129,6 +129,7 @@ bool nsjpeg_convert(struct content *c, int w, int h)
 	/* sprite control block */
 	sprite = (osspriteop_header *) (sprite_area + 1);
 	sprite->size = area_size - 16;
+	memset(sprite->name, 0x00, 12);
 	strncpy(sprite->name, "jpeg", 12);
 	sprite->width = width - 1;
 	sprite->height = height - 1;
diff --git a/riscos/mng.c b/riscos/mng.c
index ce9ac1c07..53c87cbe4 100644
--- a/riscos/mng.c
+++ b/riscos/mng.c
@@ -192,6 +192,7 @@ mng_bool nsmng_processheader(mng_handle mng, mng_uint32 width, mng_uint32 height
 	*/
 	sprite_header = (osspriteop_header *)(sprite_area + 1);
 	sprite_header->size = sprite_size - sizeof(osspriteop_area);
+	memset(sprite_header->name, 0x00, 12);
 	strcpy(sprite_header->name, "mng");
 	sprite_header->width = width - 1;
 	sprite_header->height = height - 1;
diff --git a/riscos/png.c b/riscos/png.c
index 64a5d7e13..2578e5990 100644
--- a/riscos/png.c
+++ b/riscos/png.c
@@ -134,6 +134,7 @@ void info_callback(png_structp png, png_infop info)
 	*/
 	sprite = (osspriteop_header *) (sprite_area + 1);
 	sprite->size = sprite_size - sizeof(*sprite_area);
+	memset(sprite->name, 0x00, 12);
 	strcpy(sprite->name, "png");
 	sprite->width = width - 1;
 	sprite->height = height - 1;
diff --git a/riscos/tinct.h b/riscos/tinct.h
index de06e2f69..83567bbde 100644
--- a/riscos/tinct.h
+++ b/riscos/tinct.h
@@ -3,6 +3,8 @@
  * Licensed under the GNU General Public License,
  *                http://www.opensource.org/licenses/gpl-license
  * Copyright 2004 Richard Wilson <not_ginger_matt@hotmail.com>
+ *
+ * Complete details on using Tinct are available from http://www.tinct.net.
  */
 
 /** \file
@@ -13,27 +15,27 @@
 #define _NETSURF_RISCOS_TINCT_H_
 
 /*	Tinct_PlotAlpha plots the RGBA sprite pointed to by R2 at the OS screen location (R3,R4). Flags are
-	supplied in R7 - see the Tinct documentation for further details.
+	supplied in R7.
 */
 #define Tinct_PlotAlpha 0x57240
 
 /*	Tinct_PlotScaledAlpha plots the RGBA sprite pointed to by R2 at the OS screen location (R3,R4)
-	scaled to (R5,R6) OS units. Flags are supplied in R7 - see the Tinct documentation for further details.
+	scaled to (R5,R6) OS units. Flags are supplied in R7.
 */
 #define Tinct_PlotScaledAlpha 0x57241
 
 /*	Tinct_PlotAlpha plots the RGB0 sprite pointed to by R2 at the OS screen location (R3,R4). Flags are
-	supplied in R7 - see the Tinct documentation for further details.
+	supplied in R7.
 */
 #define Tinct_Plot 0x57242
 
 /*	Tinct_PlotScaledAlpha plots the RGB0 sprite pointed to by R2 at the OS screen location (R3,R4)
-	scaled to (R5,R6) OS units. Flags are supplied in R7 - see the Tinct documentation for further details.
+	scaled to (R5,R6) OS units. Flags are supplied in R7.
 */
 #define Tinct_PlotScaled 0x57243
 
 /*	Tinct_ConvertSprite creates a 32bpp sprite (pointer to memory supplied in R3) from a paletted sprite
-	provided in R2 - see the Tinct documentation for further details.
+	provided in R2.
 */
 #define Tinct_ConvertSprite 0x57244
 
@@ -50,5 +52,6 @@
 #define tinct_FILL_HORIZONTALLY   0x10
 #define tinct_FILL_VERTICALLY     0x20
 #define tinct_FORCE_PALETTE_READ  0x40
+#define tinct_USE_OS_SPRITE_OP    0x80
 
 #endif