Skip to content

GitLab

Commit f427a622 authored by Andrew Hodgkinson's avatar Andrew Hodgkinson
Browse files

Couple of bug fixes. 

Detail:
  Triangular line end caps in Draw files now drawn in line colour. Header
  and footer special fields much more reliable; date formats better
  handled; "!!" and "!%" should work properly in both.
Admin:
  Tested fairly heavily, works as expected. This release does not address
  the crash Steve R has seen with images on the BBC news site, since I've
  not yet been able to reproduce it.

Version 2.13. Tagged as 'Browse-2_13'
parent 080840ee
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 365 additions and 208 deletions
Resources/UK/Phoenix/Messages
View file @ f427a622
......@@ -3,7 +3,7 @@
_TaskName:Phoenix
_SpriName:!phoenix
Version:2.12 (13 Mar 2005)
Version:2.13 (14 Mar 2005)
FullName:Phoenix
DAGen:- General
DAJSc:- JavaScript
......
VersionNum
View file @ f427a622
/* (2.12)
/* (2.13)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.2.
*
*/
#define Module_MajorVersion_CMHG 2.12
#define Module_MajorVersion_CMHG 2.13
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 13 Mar 2006
#define Module_Date_CMHG 16 Mar 2006
#define Module_MajorVersion "2.12"
#define Module_Version 212
#define Module_MajorVersion "2.13"
#define Module_Version 213
#define Module_MinorVersion ""
#define Module_Date "13 Mar 2006"
#define Module_Date "16 Mar 2006"
#define Module_ApplicationDate "13-Mar-06"
#define Module_ApplicationDate "16-Mar-06"
#define Module_ComponentName "Browse"
#define Module_ComponentPath "RiscOS/Sources/Apps/Browse"
#define Module_FullVersion "2.12"
#define Module_HelpVersion "2.12 (13 Mar 2006)"
#define Module_LibraryVersionInfo "2:12"
#define Module_FullVersion "2.13"
#define Module_HelpVersion "2.13 (16 Mar 2006)"
#define Module_LibraryVersionInfo "2:13"
c/Printing
View file @ f427a622
This diff is collapsed.
c/SavePDF
View file @ f427a622
......@@ -374,6 +374,81 @@ static _kernel_oserror * savepdf_deflate
size_t outsize
);
static _kernel_oserror * savepdf_draw_to_pdf_bbox
(
const browser_data * restrict b,
FILE * pdf,
FILE * draw,
int x,
int y,
unsigned int width,
unsigned int height
);
static _kernel_oserror * savepdf_draw_to_pdf_fonts
(
const browser_data * restrict b,
FILE * pdf,
FILE * draw,
char * restrict fontmap,
long int end_at
);
static _kernel_oserror * savepdf_draw_to_pdf_text
(
const browser_data * restrict b,
FILE * pdf,
FILE * draw,
const char * restrict fontmap,
const BBox * ext_bounds,
const int * ext_matrix,
size_t size
);
static _kernel_oserror * savepdf_draw_to_pdf_text_transformed
(
const browser_data * restrict b,
FILE * pdf,
FILE * draw,
const char * restrict fontmap,
size_t size
);
static _kernel_oserror * savepdf_draw_to_pdf_cap_triangle
(
FILE * pdf,
int x1, int y1,
int x2, int y2,
int width, int length,
unsigned int colour
);
static _kernel_oserror * savepdf_draw_to_pdf_path
(
const browser_data * restrict b,
FILE * pdf,
FILE * draw,
long int end_at
);
static _kernel_oserror * savepdf_draw_to_pdf_sprite
(
const browser_data * restrict b,
FILE * pdf,
FILE * draw,
const BBox * ext_bounds,
const int * ext_matrix,
size_t size
);
static _kernel_oserror * savepdf_draw_to_pdf_sprite_transformed
(
const browser_data * restrict b,
FILE * pdf,
FILE * draw,
size_t size
);
static _kernel_oserror * savepdf_record_new_object_address (void);
static void savepdf_update_object_address (size_t objnum, long int address);
static long int savepdf_read_object_address (size_t objnum);
......@@ -1980,7 +2055,9 @@ static _kernel_oserror * savepdf_draw_to_pdf_text_transformed
/* */
/* Length in PDF user space units of the point of */
/* the triangle, as a distance from the end point */
/* of the line. */
/* of the line; */
/* */
/* Colour of cap in &BBGGRRAA format. */
/**************************************************************/
static _kernel_oserror * savepdf_draw_to_pdf_cap_triangle
......@@ -1988,7 +2065,8 @@ static _kernel_oserror * savepdf_draw_to_pdf_cap_triangle
FILE * pdf,
int x1, int y1,
int x2, int y2,
int width, int length
int width, int length,
unsigned int colour
)
{
/* We need to work out the angle of the line from its start to its */
......@@ -2047,7 +2125,12 @@ static _kernel_oserror * savepdf_draw_to_pdf_cap_triangle
/* the line end (this last phase implicit, by closing the path at */
/* the point it is filled). */
r = fprintf(pdf, " q 0 w %s %s m %s %s l %s %s l %s %s l f Q\n",
r = fprintf(pdf, " q 0 w ");
if (r < 0) RetLastE;
RetError(savepdf_write_colour(colour, 0));
r = fprintf(pdf, "%s %s m %s %s l %s %s l %s %s l f Q\n",
savepdf_itoa(x2), savepdf_itoa(y2),
savepdf_itoa((int) backx1), savepdf_itoa((int) backy1),
savepdf_itoa((int) tipx), savepdf_itoa((int) tipy),
......@@ -2348,7 +2431,8 @@ static _kernel_oserror * savepdf_draw_to_pdf_path
first_x2, first_y2,
first_x1, first_y1,
triangle_width,
triangle_length));
triangle_length,
line_colour));
}
if (
......@@ -2361,7 +2445,8 @@ static _kernel_oserror * savepdf_draw_to_pdf_path
last_x2, last_y2,
last_x1, last_y1,
triangle_width,
triangle_length));
triangle_length,
line_colour));
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment