2003-06-30 16:44:03 +04:00
|
|
|
/*
|
2004-03-24 01:17:08 +03:00
|
|
|
* Copyright 2004 James Bursa <bursa@users.sourceforge.net>
|
2004-01-25 23:13:51 +03:00
|
|
|
* Copyright 2004 John M Bell <jmb202@ecs.soton.ac.uk>
|
2007-08-08 20:16:03 +04:00
|
|
|
*
|
|
|
|
* This file is part of NetSurf, http://www.netsurf-browser.org/
|
|
|
|
*
|
|
|
|
* NetSurf 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; version 2 of the License.
|
|
|
|
*
|
|
|
|
* NetSurf 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.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
2003-02-26 00:00:27 +03:00
|
|
|
*/
|
|
|
|
|
2004-03-24 01:17:08 +03:00
|
|
|
/** \file
|
|
|
|
* Content for image/jpeg (implementation).
|
|
|
|
*
|
|
|
|
* This implementation uses the IJG JPEG library.
|
|
|
|
*/
|
|
|
|
|
2008-07-27 03:42:24 +04:00
|
|
|
#include "utils/config.h"
|
|
|
|
#ifdef WITH_JPEG
|
|
|
|
|
2008-09-16 00:23:02 +04:00
|
|
|
/* This must come first due to libpng issues */
|
|
|
|
#include "content/content.h"
|
|
|
|
|
2003-02-26 00:00:27 +03:00
|
|
|
#include <assert.h>
|
2004-09-04 02:44:48 +04:00
|
|
|
#include <setjmp.h>
|
2003-02-26 00:00:27 +03:00
|
|
|
#include <string.h>
|
2004-01-25 23:13:51 +03:00
|
|
|
#include <stdio.h>
|
2003-02-26 00:00:27 +03:00
|
|
|
#include <stdlib.h>
|
2004-03-24 01:17:08 +03:00
|
|
|
#define JPEG_INTERNAL_OPTIONS
|
2005-07-05 03:21:29 +04:00
|
|
|
#include "jpeglib.h"
|
2007-05-31 02:39:54 +04:00
|
|
|
#include "desktop/plotters.h"
|
|
|
|
#include "image/bitmap.h"
|
|
|
|
#include "image/jpeg.h"
|
|
|
|
#include "utils/log.h"
|
|
|
|
#include "utils/messages.h"
|
|
|
|
#include "utils/utils.h"
|
2004-01-25 23:13:51 +03:00
|
|
|
|
2008-03-10 17:29:43 +03:00
|
|
|
#ifdef riscos
|
2004-09-04 02:44:48 +04:00
|
|
|
/* We prefer the library to be configured with these options to save
|
2004-03-24 01:17:08 +03:00
|
|
|
* copying data during decoding. */
|
|
|
|
#if RGB_RED != 0 || RGB_GREEN != 1 || RGB_BLUE != 2 || RGB_PIXELSIZE != 4
|
2004-09-04 02:44:48 +04:00
|
|
|
#warning JPEG library not optimally configured. Decoding will be slower.
|
2004-03-24 01:17:08 +03:00
|
|
|
#endif
|
2008-03-10 17:29:43 +03:00
|
|
|
/* but we don't care if we're not on RISC OS */
|
|
|
|
#endif
|
2004-03-24 01:17:08 +03:00
|
|
|
|
2004-06-11 00:41:26 +04:00
|
|
|
static char nsjpeg_error_buffer[JMSG_LENGTH_MAX];
|
|
|
|
|
|
|
|
|
2004-03-24 01:17:08 +03:00
|
|
|
struct nsjpeg_error_mgr {
|
|
|
|
struct jpeg_error_mgr pub;
|
|
|
|
jmp_buf setjmp_buffer;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
static void nsjpeg_error_exit(j_common_ptr cinfo);
|
|
|
|
static void nsjpeg_init_source(j_decompress_ptr cinfo);
|
|
|
|
static boolean nsjpeg_fill_input_buffer(j_decompress_ptr cinfo);
|
|
|
|
static void nsjpeg_skip_input_data(j_decompress_ptr cinfo, long num_bytes);
|
|
|
|
static void nsjpeg_term_source(j_decompress_ptr cinfo);
|
|
|
|
|
|
|
|
|
2004-01-25 23:13:51 +03:00
|
|
|
/**
|
2004-03-24 01:17:08 +03:00
|
|
|
* Convert a CONTENT_JPEG for display.
|
2004-01-25 23:13:51 +03:00
|
|
|
*/
|
|
|
|
|
2004-06-11 00:41:26 +04:00
|
|
|
bool nsjpeg_convert(struct content *c, int w, int h)
|
2004-03-24 01:17:08 +03:00
|
|
|
{
|
|
|
|
struct jpeg_decompress_struct cinfo;
|
|
|
|
struct nsjpeg_error_mgr jerr;
|
|
|
|
struct jpeg_source_mgr source_mgr = { 0, 0,
|
|
|
|
nsjpeg_init_source, nsjpeg_fill_input_buffer,
|
|
|
|
nsjpeg_skip_input_data, jpeg_resync_to_restart,
|
|
|
|
nsjpeg_term_source };
|
|
|
|
unsigned int height;
|
|
|
|
unsigned int width;
|
2008-09-16 03:20:07 +04:00
|
|
|
struct bitmap * volatile bitmap = NULL;
|
|
|
|
uint8_t * volatile pixels = NULL;
|
2004-09-04 02:44:48 +04:00
|
|
|
size_t rowstride;
|
2004-06-11 00:41:26 +04:00
|
|
|
union content_msg_data msg_data;
|
2004-03-24 01:17:08 +03:00
|
|
|
|
|
|
|
cinfo.err = jpeg_std_error(&jerr.pub);
|
|
|
|
jerr.pub.error_exit = nsjpeg_error_exit;
|
|
|
|
if (setjmp(jerr.setjmp_buffer)) {
|
|
|
|
jpeg_destroy_decompress(&cinfo);
|
2004-09-04 02:44:48 +04:00
|
|
|
if (bitmap)
|
|
|
|
bitmap_destroy(bitmap);
|
2004-06-11 00:41:26 +04:00
|
|
|
|
|
|
|
msg_data.error = nsjpeg_error_buffer;
|
|
|
|
content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
|
|
|
|
return false;
|
2004-03-24 01:17:08 +03:00
|
|
|
}
|
|
|
|
jpeg_create_decompress(&cinfo);
|
2008-02-25 20:58:00 +03:00
|
|
|
source_mgr.next_input_byte = (unsigned char *) c->source_data;
|
2004-03-24 01:17:08 +03:00
|
|
|
source_mgr.bytes_in_buffer = c->source_size;
|
|
|
|
cinfo.src = &source_mgr;
|
|
|
|
jpeg_read_header(&cinfo, TRUE);
|
|
|
|
cinfo.out_color_space = JCS_RGB;
|
|
|
|
cinfo.dct_method = JDCT_ISLOW;
|
|
|
|
jpeg_start_decompress(&cinfo);
|
|
|
|
|
|
|
|
width = cinfo.output_width;
|
|
|
|
height = cinfo.output_height;
|
|
|
|
|
2006-02-22 04:58:19 +03:00
|
|
|
bitmap = bitmap_create(width, height, BITMAP_NEW | BITMAP_OPAQUE);
|
2006-01-25 02:05:56 +03:00
|
|
|
if (bitmap)
|
|
|
|
pixels = bitmap_get_buffer(bitmap);
|
|
|
|
if ((!bitmap) || (!pixels)) {
|
2004-06-11 00:41:26 +04:00
|
|
|
jpeg_destroy_decompress(&cinfo);
|
2006-01-25 02:05:56 +03:00
|
|
|
if (bitmap)
|
|
|
|
bitmap_destroy(bitmap);
|
2004-06-11 00:41:26 +04:00
|
|
|
|
|
|
|
msg_data.error = messages_get("NoMemory");
|
|
|
|
content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
|
|
|
|
return false;
|
2004-03-24 01:17:08 +03:00
|
|
|
}
|
|
|
|
|
2004-09-04 02:44:48 +04:00
|
|
|
rowstride = bitmap_get_rowstride(bitmap);
|
2004-03-24 01:17:08 +03:00
|
|
|
do {
|
2008-07-29 13:25:54 +04:00
|
|
|
int i;
|
2004-03-24 01:17:08 +03:00
|
|
|
JSAMPROW scanlines[1];
|
2004-09-04 02:44:48 +04:00
|
|
|
scanlines[0] = (JSAMPROW) (pixels +
|
|
|
|
rowstride * cinfo.output_scanline);
|
2004-03-24 01:17:08 +03:00
|
|
|
jpeg_read_scanlines(&cinfo, scanlines, 1);
|
2004-09-04 02:44:48 +04:00
|
|
|
|
|
|
|
#if RGB_RED != 0 || RGB_GREEN != 1 || RGB_BLUE != 2 || RGB_PIXELSIZE != 4
|
|
|
|
/* expand to RGBA */
|
2008-07-29 13:25:54 +04:00
|
|
|
for (i = width - 1; 0 <= i; i--) {
|
2004-09-04 02:44:48 +04:00
|
|
|
int r = scanlines[0][i * RGB_PIXELSIZE + RGB_RED];
|
|
|
|
int g = scanlines[0][i * RGB_PIXELSIZE + RGB_GREEN];
|
|
|
|
int b = scanlines[0][i * RGB_PIXELSIZE + RGB_BLUE];
|
|
|
|
scanlines[0][i * 4 + 0] = r;
|
|
|
|
scanlines[0][i * 4 + 1] = g;
|
|
|
|
scanlines[0][i * 4 + 2] = b;
|
2004-10-05 18:36:44 +04:00
|
|
|
scanlines[0][i * 4 + 3] = 0xff;
|
2004-09-04 20:41:28 +04:00
|
|
|
}
|
2004-09-04 02:44:48 +04:00
|
|
|
#endif
|
2004-03-24 01:17:08 +03:00
|
|
|
} while (cinfo.output_scanline != cinfo.output_height);
|
2005-06-23 21:22:28 +04:00
|
|
|
bitmap_modified(bitmap);
|
2004-03-24 01:17:08 +03:00
|
|
|
|
|
|
|
jpeg_finish_decompress(&cinfo);
|
|
|
|
jpeg_destroy_decompress(&cinfo);
|
|
|
|
|
|
|
|
c->width = width;
|
|
|
|
c->height = height;
|
2004-09-04 02:44:48 +04:00
|
|
|
c->bitmap = bitmap;
|
2004-03-24 01:17:08 +03:00
|
|
|
c->title = malloc(100);
|
|
|
|
if (c->title)
|
2004-06-11 00:41:26 +04:00
|
|
|
snprintf(c->title, 100, messages_get("JPEGTitle"),
|
2004-03-24 01:17:08 +03:00
|
|
|
width, height, c->source_size);
|
2004-09-04 02:44:48 +04:00
|
|
|
c->size += height * rowstride + 100;
|
2004-03-24 01:17:08 +03:00
|
|
|
c->status = CONTENT_STATUS_DONE;
|
2008-03-10 15:41:41 +03:00
|
|
|
/* Done: update status bar */
|
|
|
|
content_set_status(c, "");
|
2004-06-11 00:41:26 +04:00
|
|
|
return true;
|
2004-01-25 23:13:51 +03:00
|
|
|
}
|
|
|
|
|
2004-03-24 01:17:08 +03:00
|
|
|
|
2004-01-25 23:13:51 +03:00
|
|
|
/**
|
2004-03-24 01:17:08 +03:00
|
|
|
* Fatal error handler for JPEG library.
|
|
|
|
*
|
|
|
|
* This prevents jpeglib calling exit() on a fatal error.
|
2004-01-25 23:13:51 +03:00
|
|
|
*/
|
2004-03-24 01:17:08 +03:00
|
|
|
|
|
|
|
void nsjpeg_error_exit(j_common_ptr cinfo)
|
|
|
|
{
|
|
|
|
struct nsjpeg_error_mgr *err = (struct nsjpeg_error_mgr *) cinfo->err;
|
2004-06-11 00:41:26 +04:00
|
|
|
err->pub.format_message(cinfo, nsjpeg_error_buffer);
|
2004-03-24 01:17:08 +03:00
|
|
|
longjmp(err->setjmp_buffer, 1);
|
2004-01-25 23:13:51 +03:00
|
|
|
}
|
|
|
|
|
2004-03-24 01:17:08 +03:00
|
|
|
|
2004-01-25 23:13:51 +03:00
|
|
|
/**
|
2004-03-24 01:17:08 +03:00
|
|
|
* JPEG data source manager: initialize source.
|
2004-01-25 23:13:51 +03:00
|
|
|
*/
|
2004-01-25 23:39:35 +03:00
|
|
|
|
2004-03-24 01:17:08 +03:00
|
|
|
void nsjpeg_init_source(j_decompress_ptr cinfo)
|
|
|
|
{
|
|
|
|
}
|
2004-01-25 23:39:35 +03:00
|
|
|
|
|
|
|
|
2008-02-25 20:58:00 +03:00
|
|
|
static unsigned char nsjpeg_eoi[] = { 0xff, JPEG_EOI };
|
2004-01-25 23:39:35 +03:00
|
|
|
|
2004-03-24 01:17:08 +03:00
|
|
|
/**
|
|
|
|
* JPEG data source manager: fill the input buffer.
|
|
|
|
*
|
|
|
|
* This can only occur if the JPEG data was truncated or corrupted. Insert a
|
|
|
|
* fake EOI marker to allow the decompressor to output as much as possible.
|
|
|
|
*/
|
2004-01-25 23:39:35 +03:00
|
|
|
|
2004-03-24 01:17:08 +03:00
|
|
|
boolean nsjpeg_fill_input_buffer(j_decompress_ptr cinfo)
|
|
|
|
{
|
|
|
|
cinfo->src->next_input_byte = nsjpeg_eoi;
|
|
|
|
cinfo->src->bytes_in_buffer = 2;
|
|
|
|
return TRUE;
|
2004-01-25 23:39:35 +03:00
|
|
|
}
|
|
|
|
|
2004-01-25 23:13:51 +03:00
|
|
|
|
|
|
|
/**
|
2004-03-24 01:17:08 +03:00
|
|
|
* JPEG data source manager: skip num_bytes worth of data.
|
2004-01-25 23:13:51 +03:00
|
|
|
*/
|
|
|
|
|
2004-03-24 01:17:08 +03:00
|
|
|
void nsjpeg_skip_input_data(j_decompress_ptr cinfo, long num_bytes)
|
2003-02-26 00:00:27 +03:00
|
|
|
{
|
2004-03-24 01:17:08 +03:00
|
|
|
if ((long) cinfo->src->bytes_in_buffer < num_bytes) {
|
|
|
|
cinfo->src->next_input_byte = 0;
|
|
|
|
cinfo->src->bytes_in_buffer = 0;
|
|
|
|
} else {
|
|
|
|
cinfo->src->next_input_byte += num_bytes;
|
|
|
|
cinfo->src->bytes_in_buffer -= num_bytes;
|
|
|
|
}
|
2003-02-26 00:00:27 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-03-24 01:17:08 +03:00
|
|
|
/**
|
|
|
|
* JPEG data source manager: terminate source.
|
|
|
|
*/
|
|
|
|
|
|
|
|
void nsjpeg_term_source(j_decompress_ptr cinfo)
|
2003-02-26 00:00:27 +03:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-10-18 01:12:32 +04:00
|
|
|
/**
|
|
|
|
* Redraw a CONTENT_JPEG.
|
|
|
|
*/
|
|
|
|
|
|
|
|
bool nsjpeg_redraw(struct content *c, int x, int y,
|
|
|
|
int width, int height,
|
|
|
|
int clip_x0, int clip_y0, int clip_x1, int clip_y1,
|
2008-09-29 02:37:13 +04:00
|
|
|
float scale, colour background_colour)
|
2004-10-18 01:12:32 +04:00
|
|
|
{
|
|
|
|
return plot.bitmap(x, y, width, height,
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
c->bitmap, background_colour, c);
|
2004-10-18 01:12:32 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-02-21 23:49:12 +03:00
|
|
|
/**
|
|
|
|
* Redraw a CONTENT_JPEG with appropriate tiling.
|
|
|
|
*/
|
|
|
|
|
|
|
|
bool nsjpeg_redraw_tiled(struct content *c, int x, int y,
|
|
|
|
int width, int height,
|
|
|
|
int clip_x0, int clip_y0, int clip_x1, int clip_y1,
|
2008-09-29 02:37:13 +04:00
|
|
|
float scale, colour background_colour,
|
2006-02-21 23:49:12 +03:00
|
|
|
bool repeat_x, bool repeat_y)
|
|
|
|
{
|
|
|
|
return plot.bitmap_tile(x, y, width, height,
|
|
|
|
c->bitmap, background_colour,
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
repeat_x, repeat_y, c);
|
2006-02-21 23:49:12 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-03-24 01:17:08 +03:00
|
|
|
/**
|
|
|
|
* Destroy a CONTENT_JPEG and free all resources it owns.
|
|
|
|
*/
|
|
|
|
|
2004-01-25 23:13:51 +03:00
|
|
|
void nsjpeg_destroy(struct content *c)
|
2003-02-26 00:00:27 +03:00
|
|
|
{
|
2004-09-04 02:44:48 +04:00
|
|
|
if (c->bitmap)
|
|
|
|
bitmap_destroy(c->bitmap);
|
2004-03-24 01:17:08 +03:00
|
|
|
free(c->title);
|
2003-02-26 00:00:27 +03:00
|
|
|
}
|
2007-07-18 18:47:41 +04:00
|
|
|
|
|
|
|
#endif /* WITH_JPEG */
|